")
+ return 2
+ print "Storing the result in '%s'" % backend.resultdir
+ profile_name = os.path.split(os.path.normpath(profile))[1]
+ # setup output
+ outfile = os.path.join(backend.resultdir, "bootstrap.log")
+ fd = os.open(outfile, os.O_WRONLY|os.O_CREAT|os.O_TRUNC, 0644)
+ out = OutputThread(outfile)
+ out.daemon = True
+ if not quiet:
+ out.start()
+ old_stdout = os.dup(1)
+ old_stderr = os.dup(2)
+ os.dup2(fd, 1)
+ os.dup2(fd, 2)
+ time_started = datetime.datetime.now()
+ print "%s log started" % time_started
+ result = 0
+ try:
+ # write what we working on
+ html_output.write("
%s
" % profile_name)
+ # init
+ if not backend.bootstrap():
+ print "FAILED: bootstrap for '%s'" % profile
+ html_output.write("
Failed to bootstrap
")
+ raise FailedToBootstrapError("Failed to bootstrap '%s'" % profile)
+ if add_pkgs:
+ if not backend.installPackages(add_pkgs):
+ print "FAILED: installPacakges '%s'" % add_pkgs
+ html_output.write("
Failed to add pkgs '%s'
" % ",".join(add_pkgs))
+ raise Exception, "Failed to install packages '%s'" % add_pkgs
+ if not backend.upgrade():
+ print "FAILED: upgrade for '%s'" % profile
+ html_output.write("
Failed to upgrade
")
+ raise FailedToUpgradeError("Failed to upgrade %s" % profile)
+ if not backend.test():
+ print "FAILED: test for '%s'" % profile
+ html_output.write("
Upgraded, but post upgrade test failed
")
+ raise FailedPostUpgradeTestError("Failed in post upgrade test %s" % profile)
+ print "profile: %s worked" % profile
+ html_output.write("
ok
")
+ except (FailedToBootstrapError, FailedToUpgradeError, FailedPostUpgradeTestError) as e:
+ print e
+ result = e.exitcode
+ except Exception, e:
+ import traceback
+ traceback.print_exc()
+ print "Caught exception in testUpgrade for '%s' (%s)" % (profile, e)
+ html_output.write("
Unknown failure (should not happen)
")
+ result = 2
+ finally:
+ # print out result details
+ print "Logs can be found here:"
+ for n in ["bootstrap.log", "main.log", "apt.log"]:
+ print " %s/%s" % (backend.resultdir, n)
+
+ time_ended = datetime.datetime.now()
+ print "%s log ended." % time_ended
+ print "Duration: %s" % (time_ended - time_started)
+
+ # give the output time to settle and kill the daemon
+ time.sleep(2)
+ if out.is_alive():
+ out.terminate()
+ out.join()
+ # write result line
+ s="
-
-
-
-
-
- Performing Updates
-
- Updating Your Computer
- When you open Software Updater, the main
- window displays the list of packages that need to be installed to update
- your computer. If the software on your computer is up to date, the main window contains
- only the message "The software on this computer is up to date."
-
-
-
-
-
-
- Available Updates
-
-
-
- By default, all packages are marked for installation. In most
- cases you will install all of the packages right away. However, if there
- are a large number of updates you may want to do only a few at a time.
- To un-mark a package for installation, clear the check box
- for the package.
- To see additional information about a package, click on
- Details.
- (see )
- When you are ready to install the selected packages,
- click on Install.
- If Software Updater detects one or more
- packages without a digital signature, the
- Summary dialog is displayed.
- The Summary dialog lists three groups of update
- categories:
-
-
-
- NOT AUTHENTICATED
-
-
- Packages without a digital signature.
-
-
-
-
- To be upgraded
-
-
- Packages that will be upgraded.
-
-
-
-
- Unchanged
-
-
- Packages that will not be upgraded due to dependency issues.
- The packages will be upgraded in a future Update
- Manager session, once the developers have
- resolved the package dependencies.
-
-
-
- If you do not want to install non-authenticated packages, click
- Cancel. The Summary
- dialog will close, and you can
- deselect the packages in the Software Updater
- main window.
-
- If a deselected package is required as a dependency for a selected
- package, Software Updater will install the
- deselected package to satisfy the dependency.
-
-
- Software Updater downloads all of the
- selected packages before installing them. The entire process might take a
- long time depending on the amount of data that needs to be downloaded, the
- speed of your network connection, and the number of packages that need to
- be installed. While downloading packages,
- Software Updater displays a dialog box that
- monitors the download progress. (See ).
-
-
- Expanded Update Information
- To see additional information about a package:
-
-
- Click on the package in the main window.
-
-
- Click on Details.A tabbed section
- opens within the main window.
-
-
- The tabs are as follows:
-
-
-
- Changes
-
-
- A list of the changes incorporated in the package. The list
- is the contents of the ChangeLog file for the
- package.
-
-
-
-
- Description
-
-
- A short description of each program in the package.
-
-
-
-
-
- Monitoring Download Progress
- Software Updater displays the
- Installing updates window while the
- packages are downloading. The progress bar in the
- Installing updates window shows the progress
- of the entire update.
- To display the download progress of each package, click on
- Show progress of individual files.
- To cancel the download, click Cancel.
-
- All files must be downloaded before
- Software Updater can proceed to the installation stage. If
- the network connections fails or if you cancel the download, the update
- will not be installed.
-
- To resume a canceled or failed download, click on Install in the
- main window. Software Updater will resume the
- download from the last successfully downloaded file.
-
-
-
- Monitoring Installation Progress
- Software Updater displays the
- Installation updates window while the updates are
- being installed. The progress bar inside the Installation
- updates window shows the progress of the entire installation.
-
- To display the installation progress of each package, click on
- Terminal. The terminal view opens within the
- window. The terminal view displays the unfiltered output of the Advanced
- Packaging Tool (APT). APT is the tool that Software Updater uses to
- perform the update.
-
- Do not terminate the installation process. This may lead to
- corruption of installed programs and general system
- instability.
-
-
-
-
- Setting Preferences
- The Software Updater
- Preferences button displays the Software
- Preferences dialog. From this dialog you can perform the
- following tasks:
-
-
- Manage software sources (see ).
-
-
- Manage authentication keys (see ).
-
-
- Manage settings (see ).
-
-
-
- Managing Software Sources
- During installation of a distro, software repositories are
- automatically added to the list of 'software sources.'
- Typical sources added by the distro installation include the
- installation source, update, and security repositories. Sources can be
- added to and removed from the list and existing sources can be edited.
-
- The operations described here modify /etc/apt/sources.list using the Update
- Manager graphical user interface. Software sources can
- also be managed by making direct modifications in /etc/apt/sources.list. This is only
- advised for advanced users.
-
-
- Adding Software Sources
- Software may be installed using various access methods:
-
-
-
- CD-ROM - Compact Disk Read Only Memory,
- normally directly connected to the computer system and mounted
- locally by the operating system.
-
-
-
-
-
-
- FTP - File Transfer Protocol, a secure and
- reliable protocol designed specifically for the purpose of
- transferring large files across the Internet.
-
-
-
- HTTP - HyperText Transfer Protocol, commonly
- used to request and receive Web pages, but can also be used for
- file transfer.
-
-
-
- SMB - Server Management Block is used to
- access shared resources on computers running Microsoft
- Windows or Samba
- Server.
-
-
-
- NFS - Network File System is used to access
- shared resources on Linux/UNIX computers.
-
-
-
- Before software sources residing on SMB or NFS shares can be
- defined, the share must be mounted by the local system. Access can
- then be made via the local filesystem. For more information see
- .
-
- A new software source can be defined by clicking
- the Add button located on the
- Software Preferences dialog. This will
- display the Edit Repository dialog.
-
-
-
-
-
-
- Adding Software Sources
-
-
-
- Complete the Edit Repository dialog to add
- a new Software source.
-
-
-
- Repository
-
-
- A drop-list containing known software sources.
-
-
-
-
- Components
-
-
- The Ubuntu software repository contains thousands of
- software packages organized into four
- 'components,' on the basis of the level of
- support we can offer them, and whether or not they comply with
- Free Software Philosophy. The components are called
- 'main,' 'restricted,'
- 'universe,' and
- 'multiverse.'
- Check the components you wish to include in the update list.
-
-
-
- Officially supported (main)
- - The main distribution component contains applications that
- are free software, can freely be redistributed and are fully
- supported by the Ubuntu team. This includes the most popular
- and most reliable open source applications available, much
- of which is installed by default when you install Ubuntu.
- Software in main includes a hand-selected list of
- applications that the Ubuntu developers, community, and
- users feel are important and that the Ubuntu security and
- distribution team are willing to support. When you install
- software from the main component you are assured that the
- software will come with security updates and technical
- support. We believe that the software in main includes
- everything most people will need for a fully functional
- desktop or Internet server running only open source
- software. The licenses for software applications in main
- must be free, but main may also may contain binary firmware
- and selected fonts that cannot be modified without
- permission from their authors. In all cases redistribution
- is unencumbered.
-
-
-
- Restricted Copyright - The
- restricted component is reserved for software that is very
- commonly used, and which is supported by the Ubuntu team
- even though it is not available under a completely free
- license. Please note that it may not be possible to provide
- complete support for this software since we are unable to
- fix the software ourselves, but can only forward problem
- reports to the actual authors. Some software from restricted
- will be installed on Ubuntu CDs but is clearly separated to
- ensure that it is easy to remove. We include this software
- because it is essential in order for Ubuntu to run on
- certain machines - typical examples are the binary drivers
- that some video card vendors publish, which are the only way
- for Ubuntu to run on those machines. By default, we will
- only use open source software unless there is simply no
- other way to install Ubuntu. The Ubuntu team works with such
- vendors to accelerate the open-sourcing of their software to
- ensure that as much software as possible is available under
- a Free license.
-
-
-
- Community maintained
- (Universe) - The universe component is a snapshot
- of the free, open source, and Linux world. In universe you
- can find almost every piece of open source software, and
- software available under a variety of less open licenses,
- all built automatically from a variety of public sources.
- All of this software is compiled against the libraries and
- using the tools that form part of main, so it should install
- and work well with the software in main, but it comes with
- no guarantee of security fixes and support. The universe
- component includes thousands of pieces of software. Through
- universe, users are able to have the diversity and
- flexibility offered by the vast open source world on top of
- a stable Ubuntu core.
-
-
-
- Non Free (Multiverse) - The
- 'multiverse' component contains software
- that is not free, which means the
- licensing requirements of this software do not meet the
- Ubuntu 'main' Component license Policy.
- The onus is on you to verify your rights to use this
- software and comply with the licensing terms of the
- copyright holder. This software is not supported and usually
- cannot be fixed or updated. Use it at your own risk.
-
-
-
-
-
-
-
- Creating Custom Software Sources
- It is also possible to define custom software sources.
- To define a custom software source click the
- Custom button located on the Edit
- Repository dialog. This will display a dialog in which
- the custom repository can be defined using
- apt command syntax.
- Apt is an Advanced Packaging Tool and
- front-end to dpkg the Debian Package
- Management System. Once the apt line is entered
- click the Add repository
- button.
-
-
-
-
-
-
- Creating Custom Software Sources
-
-
-
- The apt command syntax defines the
- 'type,' 'location,' and
- 'content' of the repository. Example of the command
- syntax could look like this.
-
-deb ftp://archive.ubuntu.com/ubuntu/ hoary main restricted universe multiverse
-
- This example would define the software sources as a Debian source
- at ubuntu.com containing the hoary release and using all components.
- For definition of the components, see .
-
-
- Removing Software Sources
- Software sources can be removed from the sources list by selecting
- the software source then clicking the
- Remove button located on the
- Software Preferences dialog.
- Removal of a software source requires that the
- apt file (/etc/apt/sources.list) that contains the a list of
- software sources is updated. Before modifying this file
- Software Updater prompts to confirm the
- operation. If the operation is confirmed a backup copy is create in
- /etc/apt/sources.list.save.
-
-
- Editing Software Sources
- To change the values defining a software source, select the source
- record then click the edit button. This will display
- the Edit Repository dialog.
-
-
-
-
-
-
- Editing Software Sources
-
-
-
-
-
-
- Type
-
-
- Software sources may contain software in
- 'Binary' or 'Source Code'
- format. Select the option correlating to the repository
- format.
-
-
-
-
- URI
-
-
- Enter a valid Uniform Resource Indicator
- (URI). Following is a list of examples for
- each of the possible access methods:
-
-
-
-
- CD-ROM -
- cdrom:[description_of_cd]/
-
-
-
-
-
-
-
- FTP -
- ftp://ftp.domain.ext/path/to/repository
-
-
-
-
- HTTP -
- http://www.domain.ext/path/to/repository
-
-
-
-
- SMB - Works only when the computer is
- already connected to an SMB share. To connect to SMB share
- use the following command syntax from the shell
- smbclient //hostname/sharename -U
- username.
- The SMB share is accessed from the local file system
- once the local system is connected.
- file://path/to/sharefile
-
-
-
-
- NFS - Works only when the computer is
- already connected to a NFS share. To connect the NFS share
- must be mounted. NFS shares are mounted on the client side
- using the mount command. The format of the command is as
- follows: mount -o [options] [host]:[/remote/export]
- [/local/directory]
-
- Once mounted Software Updater
- can access the share using the following command
- file://path/to/local/directory
-
-
-
-
- If accessing a SMB or NFS shares by manually issuing the
- mount commands, the file system must be
- remounted manually after the system is rebooted. Failing to
- remount will result in Update
- Manager not being able to access the
- resource.
-
-
-
-
-
- Distribution
-
-
- The name of the distribution or name of the distribution
- version.
-
-
-
-
- Sections
-
-
- The section of the distribution repository to access.
-
-
-
-
- Comment
-
-
- Add a comment to describe the repository.
-
-
-
-
- Repositories defined using Synaptic,
- another package management tool, are automatically displayed in the
- Software Updater Software Sources
- list.
-
-
-
-
- Managing Authentication Keys
- Authentication keys make it possible to verify the integrity of
- update software. From the Authentication Keys
- dialog it is possible to view and manage the list authentication keys.
- Each key corresponds to a Software Source defined in the
- Software Preference dialog (see ). Keys can be added and removed. In the
- event of an error it is also possible to restore the default
- authentication keys provided by the defined update repositories.
-
-
-
-
-
-
-
- Managing Authentication Keys
-
-
-
-
- Adding Authentication Keys
- Authentication keys are usually obtained from the software vendor
- running the repository. Often the vendor will place a copy of the
- authentication key on a key server, for example www.keyserver.net. The key
- can then be retrieved using the command gpg
- -recv-key. When the key resides on a key server the option
- must be used to give the name of this
- key server.
-
-gpg -recv-key --keyserver www.keyserver.net
-
-
- If the key is fetched over a untrusted medium, like the
- Internet, additional steps should be taken to verify the key. For
- example, getting the fingerprint with a secure method such as by
- phone, letter, or business card. Alternately you can check if the
- key is signed with a known-good key.
-
- Once the key is downloaded, select it using the Choose
- a key-file dialog that is displayed when the
- Add button.
-
-
-
-
-
-
- Adding Authentication Keys
-
-
-
-
-
- Removing Authentication Keys
- Authentication keys can be removed by selecting a record item then
- clicking the Remove
- button.
-
-
- Restoring Default Keys
- During installation the default Ubuntu Authentication keys are
- added to the Ubuntu GPG Keyring package. In
- the even of a key being accidentally deleted it can be restored by
- clicking the Restore default keys
- button.
-
-
-
- Managing Settings
- The Settings button, located on the
- Software Preferences dialog, displays the
- Settings dialog. From this interface you can
- manage the behavior of the application and pre-update process.
-
-
-
-
-
-
- Managing Settings
-
-
-
- The following options are available:
-
- User Interface
-
-
- Show disabled software sources: - When checked
- software sources that are not checked in the Software
- Preferences dialog are displayed. When unchecked,
- these items are not displayed in the list.
-
-
-
- Updates
-
-
-
-
-
- Automatically check for software updates:
- - When checked the Update interval in
- days option is enabled. Update
- Manager will poll all enabled software sources
- for updates according to the value specified in the
- scroll-box.
-
-
-
- Download upgradable packages: - When
- checked Software Updater will
- automatically download any available software update packages.
- It will not install them until the user has defined the
- installation list (see ).
-
-
-
-
-
-
- Temporary files
-
-
- Automatically clean temporary packages files: -
- When checked the Clean interval in days option
- is enabled. Software Updater automatically
- removes any temporary files created by the upgrade process according
- to the value specified in the scroll-box.
-
-
- Set maximum size of the package cache: When checked the size of
- the package cache is limited to the value specified in the Maximum size in
- MB spin-box.
-
-
- Delete old packages in the package cache: When checked cached
- packaged with a date older than the value specified in the Maximum age in
- days spin-box will be automatically purged from the cache.
-
-
-
-
- Install Progress for Terminal View Only
- It is also possible to configure the installation progress to use
- only a terminal view. That is to say, no progress bar is displayed, only
- a terminal view.
-
-
-
-
-
-
- Monitoring Installation Progress
-
-
-
-
- Do not terminate the installation process. This may lead to
- corruption of installed programs and general system
- instability.
-
- Changing between 'Progress Bar' and
- 'Terminal View,' modes is managed via
- Synaptic. To change modes proceed as
- follows:
-
-
- Start Synaptic by selecting
- System
- Administration
- Synaptic Package Manager
- from the Desktop menu system.
-
-
- When prompted, enter your password.
-
-
- From the main menu, select
- Settings
- Preferences
- . The Preferences dialog is
- displayed.
-
-
- From the General tab, Apply
- Changes group, check or
- uncheck the Apply changes in terminal
- window checkbox.
-
-
-
-
-
-
- Synaptic Preferences - General Tab
-
-
-
-
-
-
- Click
- OK and exit
- Synaptic.
-
-
-
-
-
- About Software Updater
- The Software Updater was written by Michiel
- Sikkes michiel@eyeopened.nl and Michael Vogt
- michael.vogt@ubuntu.com as an
- apt Software Updater for the GNOME Desktop of the
- Ubuntu distribution. The user manual was written by Sean Wheller
- sean@inwords.co.za.
- To report a bug or make a suggestion regarding this package or this
- manual, send mail to ubuntu-users@lists.ubuntu.com.
- &GFDL;
diff -Nru update-manager-17.10.11/help/C/Makefile.am update-manager-0.156.14.15/help/C/Makefile.am
--- update-manager-17.10.11/help/C/Makefile.am 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/help/C/Makefile.am 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,7 @@
+figdir = figures
+docname = update-manager
+lang = C
+omffile = update-manager-C.omf
+entities = fdl-appendix.xml legal.xml
+include $(top_srcdir)/xmldocs.make
+dist-hook: app-dist-hook
diff -Nru update-manager-17.10.11/help/C/update-manager-C.omf update-manager-0.156.14.15/help/C/update-manager-C.omf
--- update-manager-17.10.11/help/C/update-manager-C.omf 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/help/C/update-manager-C.omf 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,18 @@
+
+
+
+ sean@inwords.co.za (Sean Wheller)
+ Update Manager Manual
+ 2005-03-04
+
+
+ This document explains how to use the Update Manager.
+ manual
+
+
+
+
+
+
+
diff -Nru update-manager-17.10.11/help/C/update-manager.xml update-manager-0.156.14.15/help/C/update-manager.xml
--- update-manager-17.10.11/help/C/update-manager.xml 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/help/C/update-manager.xml 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,1023 @@
+
+
+
+]>
+
+
+
+
+
+
+
+ Update Manager Manual
+
+ 2006
+ In Words
+
+
+
+
+
+
+ In Words Techdoc Solutions
+
+ &legal;
+
+
+
+ Sean
+ Wheller
+
+ In Words
+
+ sean@inwords.co.za
+
+
+
+
+ Jeff
+ Schering
+ Editor
+
+
+ Jerome
+ Gotangco
+ Maintainer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ V0.0.1
+ 06/03/2005
+
+ First version of the manual created in accordance
+ with Update Manager V0.37.1+svn20050301. Documentation Writer
+ sean@inwords.co.za
+
+
+ InWords Techdoc
+ Solutions
+
+
+
+
+ V0.0.2
+ 26/03/2005
+
+ Edit of V0.0.1 to make some nodes shorter.
+ Editor jeffschering@gmail.com
+
+
+ InWords Techdoc
+ Solutions
+
+
+
+
+ V0.0.3
+ 26/03/2005
+
+ Added Help, Add CD, Settings options.
+ sean@inwords.co.za
+
+
+ InWords Techdoc
+ Solutions
+
+
+
+
+ This manual explains how to use Update Manager, an apt update
+ management application for the GNOME desktop created by the Ubuntu
+ project.
+
+ Feedback
+
+ To report a bug or make a suggestion regarding this package or this
+ manual, send mail to ubuntu-users@lists.ubuntu.com.
+
+
+
+
+
+
+ Introduction
+
+ Update Manager is a graphical interface to the
+ software update features of Advanced Packaging
+ Tool (APT). APT is a
+ command line tool for installing, updating, and removing software.
+
+ Update Manager makes the task of checking for
+ and installing software updates as effortless as possible.
+ Update Manager keeps your system up to date
+ by checking Ubuntu's software repositories for new versions of installed
+ software. The new versions usually contain bug fixes and new features, but
+ may also contain security updates. Use Update Manager on a regular basis
+ to ensure that your system is as up to date and secure as possible.
+
+ Update Manager decides which software needs to
+ be updated by comparing the version numbers of individual software files
+ on your computer with the software in one or more software repositories.
+ The software repositories are usually on remote network servers, but may
+ also be on a CD-ROM. Whenever Update Manager
+ notifies you that an update is available, you may choose to install the
+ update immediately, or to ignore the update.
+
+ Update Manager has settings and preferences
+ which allow you to: set how often it checks for updates, add and remove
+ software repositories, and manage repository authentication keys.
+
+
+ Getting Started
+
+ Installation
+
+ Update Manager is installed as part of the
+ Ubuntu standard installation, and should already be on your system. The
+ application is known as Ubuntu Update
+ Manager. If you need to install Update
+ Manager, you can use Synaptic Package
+ Manager. Choose
+ System
+ Administration
+ Synaptic Package Manager
+ to start Synaptic. The package
+ you need to install is update-manager.
+ You may also install Update Manager from the command line using
+ apt-get. To install Update
+ Manager from the command line:
+
+sudo apt-get install update-manager
+
+
+ Update Manager is dependent on the following
+ packages: 'python,' 'python-gnome2,'
+ 'python-apt,' 'synaptic,' and
+ 'lsb-release.'
+
+
+ Starting Update Manager
+ Choose
+ System
+ Administration
+ Ubuntu Update Manager
+ to start the application. Enter your password when
+ prompted.
+ You may also start Update Manager from
+ the command line:
+
+update-manager
+
+
+
+ Main Window
+ The Update Manager main window is used for
+ managing the update process and setting preferences.
+ When you open Update Manager, the main
+ window displays the list of packages that need to be installed to update
+ your computer. If the software on your computer is up to date, the main window contains
+ only the message "The software on this computer is up to date."
+
+
+
+
+
+
+ Available Updates
+
+
+
+
+
+
+ Performing Updates
+
+ Updating Your Computer
+ When you open Update Manager, the main
+ window displays the list of packages that need to be installed to update
+ your computer. If the software on your computer is up to date, the main window contains
+ only the message "The software on this computer is up to date."
+
+
+
+
+
+
+ Available Updates
+
+
+
+ By default, all packages are marked for installation. In most
+ cases you will install all of the packages right away. However, if there
+ are a large number of updates you may want to do only a few at a time.
+ To un-mark a package for installation, clear the check box
+ for the package.
+ To see additional information about a package, click on
+ Details.
+ (see )
+ When you are ready to install the selected packages,
+ click on Install.
+ If Update Manager detects one or more
+ packages without a digital signature, the
+ Summary dialog is displayed.
+ The Summary dialog lists three groups of update
+ categories:
+
+
+
+ NOT AUTHENTICATED
+
+
+ Packages without a digital signature.
+
+
+
+
+ To be upgraded
+
+
+ Packages that will be upgraded.
+
+
+
+
+ Unchanged
+
+
+ Packages that will not be upgraded due to dependency issues.
+ The packages will be upgraded in a future Update
+ Manager session, once the developers have
+ resolved the package dependencies.
+
+
+
+ If you do not want to install non-authenticated packages, click
+ Cancel. The Summary
+ dialog will close, and you can
+ deselect the packages in the Update Manager
+ main window.
+
+ If a deselected package is required as a dependency for a selected
+ package, Update Manager will install the
+ deselected package to satisfy the dependency.
+
+
+ Update Manager downloads all of the
+ selected packages before installing them. The entire process might take a
+ long time depending on the amount of data that needs to be downloaded, the
+ speed of your network connection, and the number of packages that need to
+ be installed. While downloading packages,
+ Update Manager displays a dialog box that
+ monitors the download progress. (See ).
+
+
+ Expanded Update Information
+ To see additional information about a package:
+
+
+ Click on the package in the main window.
+
+
+ Click on Details.A tabbed section
+ opens within the main window.
+
+
+ The tabs are as follows:
+
+
+
+ Changes
+
+
+ A list of the changes incorporated in the package. The list
+ is the contents of the ChangeLog file for the
+ package.
+
+
+
+
+ Description
+
+
+ A short description of each program in the package.
+
+
+
+
+
+ Monitoring Download Progress
+ Update Manager displays the
+ Installing updates window while the
+ packages are downloading. The progress bar in the
+ Installing updates window shows the progress
+ of the entire update.
+ To display the download progress of each package, click on
+ Show progress of individual files.
+ To cancel the download, click Cancel.
+
+ All files must be downloaded before
+ Update Manager can proceed to the installation stage. If
+ the network connections fails or if you cancel the download, the update
+ will not be installed.
+
+ To resume a canceled or failed download, click on Install in the
+ main window. Update Manager will resume the
+ download from the last successfully downloaded file.
+
+
+
+ Monitoring Installation Progress
+ Update Manager displays the
+ Installation updates window while the updates are
+ being installed. The progress bar inside the Installation
+ updates window shows the progress of the entire installation.
+
+ To display the installation progress of each package, click on
+ Terminal. The terminal view opens within the
+ window. The terminal view displays the unfiltered output of the Advanced
+ Packaging Tool (APT). APT is the tool that Update Manager uses to
+ perform the update.
+
+ Do not terminate the installation process. This may lead to
+ corruption of installed programs and general system
+ instability.
+
+
+
+
+ Setting Preferences
+ The Update Manager
+ Preferences button displays the Software
+ Preferences dialog. From this dialog you can perform the
+ following tasks:
+
+
+ Manage software sources (see ).
+
+
+ Manage authentication keys (see ).
+
+
+ Manage settings (see ).
+
+
+
+ Managing Software Sources
+ During installation of a distro, software repositories are
+ automatically added to the list of 'software sources.'
+ Typical sources added by the distro installation include the
+ installation source, update, and security repositories. Sources can be
+ added to and removed from the list and existing sources can be edited.
+
+ The operations described here modify /etc/apt/sources.list using the Update
+ Manager graphical user interface. Software sources can
+ also be managed by making direct modifications in /etc/apt/sources.list. This is only
+ advised for advanced users.
+
+
+ Adding Software Sources
+ Software may be installed using various access methods:
+
+
+
+ CD-ROM - Compact Disk Read Only Memory,
+ normally directly connected to the computer system and mounted
+ locally by the operating system.
+
+
+
+
+
+
+ FTP - File Transfer Protocol, a secure and
+ reliable protocol designed specifically for the purpose of
+ transferring large files across the Internet.
+
+
+
+ HTTP - HyperText Transfer Protocol, commonly
+ used to request and receive Web pages, but can also be used for
+ file transfer.
+
+
+
+ SMB - Server Management Block is used to
+ access shared resources on computers running Microsoft
+ Windows or Samba
+ Server.
+
+
+
+ NFS - Network File System is used to access
+ shared resources on Linux/UNIX computers.
+
+
+
+ Before software sources residing on SMB or NFS shares can be
+ defined, the share must be mounted by the local system. Access can
+ then be made via the local filesystem. For more information see
+ .
+
+ A new software source can be defined by clicking
+ the Add button located on the
+ Software Preferences dialog. This will
+ display the Edit Repository dialog.
+
+
+
+
+
+
+ Adding Software Sources
+
+
+
+ Complete the Edit Repository dialog to add
+ a new Software source.
+
+
+
+ Repository
+
+
+ A drop-list containing known software sources.
+
+
+
+
+ Components
+
+
+ The Ubuntu software repository contains thousands of
+ software packages organized into four
+ 'components,' on the basis of the level of
+ support we can offer them, and whether or not they comply with
+ Free Software Philosophy. The components are called
+ 'main,' 'restricted,'
+ 'universe,' and
+ 'multiverse.'
+ Check the components you wish to include in the update list.
+
+
+
+ Officially supported (main)
+ - The main distribution component contains applications that
+ are free software, can freely be redistributed and are fully
+ supported by the Ubuntu team. This includes the most popular
+ and most reliable open source applications available, much
+ of which is installed by default when you install Ubuntu.
+ Software in main includes a hand-selected list of
+ applications that the Ubuntu developers, community, and
+ users feel are important and that the Ubuntu security and
+ distribution team are willing to support. When you install
+ software from the main component you are assured that the
+ software will come with security updates and technical
+ support. We believe that the software in main includes
+ everything most people will need for a fully functional
+ desktop or Internet server running only open source
+ software. The licenses for software applications in main
+ must be free, but main may also may contain binary firmware
+ and selected fonts that cannot be modified without
+ permission from their authors. In all cases redistribution
+ is unencumbered.
+
+
+
+ Restricted Copyright - The
+ restricted component is reserved for software that is very
+ commonly used, and which is supported by the Ubuntu team
+ even though it is not available under a completely free
+ license. Please note that it may not be possible to provide
+ complete support for this software since we are unable to
+ fix the software ourselves, but can only forward problem
+ reports to the actual authors. Some software from restricted
+ will be installed on Ubuntu CDs but is clearly separated to
+ ensure that it is easy to remove. We include this software
+ because it is essential in order for Ubuntu to run on
+ certain machines - typical examples are the binary drivers
+ that some video card vendors publish, which are the only way
+ for Ubuntu to run on those machines. By default, we will
+ only use open source software unless there is simply no
+ other way to install Ubuntu. The Ubuntu team works with such
+ vendors to accelerate the open-sourcing of their software to
+ ensure that as much software as possible is available under
+ a Free license.
+
+
+
+ Community maintained
+ (Universe) - The universe component is a snapshot
+ of the free, open source, and Linux world. In universe you
+ can find almost every piece of open source software, and
+ software available under a variety of less open licenses,
+ all built automatically from a variety of public sources.
+ All of this software is compiled against the libraries and
+ using the tools that form part of main, so it should install
+ and work well with the software in main, but it comes with
+ no guarantee of security fixes and support. The universe
+ component includes thousands of pieces of software. Through
+ universe, users are able to have the diversity and
+ flexibility offered by the vast open source world on top of
+ a stable Ubuntu core.
+
+
+
+ Non Free (Multiverse) - The
+ 'multiverse' component contains software
+ that is not free, which means the
+ licensing requirements of this software do not meet the
+ Ubuntu 'main' Component license Policy.
+ The onus is on you to verify your rights to use this
+ software and comply with the licensing terms of the
+ copyright holder. This software is not supported and usually
+ cannot be fixed or updated. Use it at your own risk.
+
+
+
+
+
+
+
+ Creating Custom Software Sources
+ It is also possible to define custom software sources.
+ To define a custom software source click the
+ Custom button located on the Edit
+ Repository dialog. This will display a dialog in which
+ the custom repository can be defined using
+ apt command syntax.
+ Apt is an Advanced Packaging Tool and
+ front-end to dpkg the Debian Package
+ Management System. Once the apt line is entered
+ click the Add repository
+ button.
+
+
+
+
+
+
+ Creating Custom Software Sources
+
+
+
+ The apt command syntax defines the
+ 'type,' 'location,' and
+ 'content' of the repository. Example of the command
+ syntax could look like this.
+
+deb ftp://archive.ubuntu.com/ubuntu/ hoary main restricted universe multiverse
+
+ This example would define the software sources as a Debian source
+ at ubuntu.com containing the hoary release and using all components.
+ For definition of the components, see .
+
+
+ Removing Software Sources
+ Software sources can be removed from the sources list by selecting
+ the software source then clicking the
+ Remove button located on the
+ Software Preferences dialog.
+ Removal of a software source requires that the
+ apt file (/etc/apt/sources.list) that contains the a list of
+ software sources is updated. Before modifying this file
+ Update Manager prompts to confirm the
+ operation. If the operation is confirmed a backup copy is create in
+ /etc/apt/sources.list.save.
+
+
+ Editing Software Sources
+ To change the values defining a software source, select the source
+ record then click the edit button. This will display
+ the Edit Repository dialog.
+
+
+
+
+
+
+ Editing Software Sources
+
+
+
+
+
+
+ Type
+
+
+ Software sources may contain software in
+ 'Binary' or 'Source Code'
+ format. Select the option correlating to the repository
+ format.
+
+
+
+
+ URI
+
+
+ Enter a valid Uniform Resource Indicator
+ (URI). Following is a list of examples for
+ each of the possible access methods:
+
+
+
+
+ CD-ROM -
+ cdrom:[description_of_cd]/
+
+
+
+
+
+
+
+ FTP -
+ ftp://ftp.domain.ext/path/to/repository
+
+
+
+
+ HTTP -
+ http://www.domain.ext/path/to/repository
+
+
+
+
+ SMB - Works only when the computer is
+ already connected to an SMB share. To connect to SMB share
+ use the following command syntax from the shell
+ smbclient //hostname/sharename -U
+ username.
+ The SMB share is accessed from the local file system
+ once the local system is connected.
+ file://path/to/sharefile
+
+
+
+
+ NFS - Works only when the computer is
+ already connected to a NFS share. To connect the NFS share
+ must be mounted. NFS shares are mounted on the client side
+ using the mount command. The format of the command is as
+ follows: mount -o [options] [host]:[/remote/export]
+ [/local/directory]
+
+ Once mounted Update Manager
+ can access the share using the following command
+ file://path/to/local/directory
+
+
+
+
+ If accessing a SMB or NFS shares by manually issuing the
+ mount commands, the file system must be
+ remounted manually after the system is rebooted. Failing to
+ remount will result in Update
+ Manager not being able to access the
+ resource.
+
+
+
+
+
+ Distribution
+
+
+ The name of the distribution or name of the distribution
+ version.
+
+
+
+
+ Sections
+
+
+ The section of the distribution repository to access.
+
+
+
+
+ Comment
+
+
+ Add a comment to describe the repository.
+
+
+
+
+ Repositories defined using Synaptic,
+ another package management tool, are automatically displayed in the
+ Update Manager Software Sources
+ list.
+
+
+
+
+ Managing Authentication Keys
+ Authentication keys make it possible to verify the integrity of
+ update software. From the Authentication Keys
+ dialog it is possible to view and manage the list authentication keys.
+ Each key corresponds to a Software Source defined in the
+ Software Preference dialog (see ). Keys can be added and removed. In the
+ event of an error it is also possible to restore the default
+ authentication keys provided by the defined update repositories.
+
+
+
+
+
+
+
+ Managing Authentication Keys
+
+
+
+
+ Adding Authentication Keys
+ Authentication keys are usually obtained from the software vendor
+ running the repository. Often the vendor will place a copy of the
+ authentication key on a key server, for example www.keyserver.net. The key
+ can then be retrieved using the command gpg
+ -recv-key. When the key resides on a key server the option
+ must be used to give the name of this
+ key server.
+
+gpg -recv-key --keyserver www.keyserver.net
+
+
+ If the key is fetched over a untrusted medium, like the
+ Internet, additional steps should be taken to verify the key. For
+ example, getting the fingerprint with a secure method such as by
+ phone, letter, or business card. Alternately you can check if the
+ key is signed with a known-good key.
+
+ Once the key is downloaded, select it using the Choose
+ a key-file dialog that is displayed when the
+ Add button.
+
+
+
+
+
+
+ Adding Authentication Keys
+
+
+
+
+
+ Removing Authentication Keys
+ Authentication keys can be removed by selecting a record item then
+ clicking the Remove
+ button.
+
+
+ Restoring Default Keys
+ During installation the default Ubuntu Authentication keys are
+ added to the Ubuntu GPG Keyring package. In
+ the even of a key being accidentally deleted it can be restored by
+ clicking the Restore default keys
+ button.
+
+
+
+ Managing Settings
+ The Settings button, located on the
+ Software Preferences dialog, displays the
+ Settings dialog. From this interface you can
+ manage the behavior of the application and pre-update process.
+
+
+
+
+
+
+ Managing Settings
+
+
+
+ The following options are available:
+
+ User Interface
+
+
+ Show disabled software sources: - When checked
+ software sources that are not checked in the Software
+ Preferences dialog are displayed. When unchecked,
+ these items are not displayed in the list.
+
+
+
+ Updates
+
+
+
+
+
+ Automatically check for software updates:
+ - When checked the Update interval in
+ days option is enabled. Update
+ Manager will poll all enabled software sources
+ for updates according to the value specified in the
+ scroll-box.
+
+
+
+ Download upgradable packages: - When
+ checked Update Manager will
+ automatically download any available software update packages.
+ It will not install them until the user has defined the
+ installation list (see ).
+
+
+
+
+
+
+ Temporary files
+
+
+ Automatically clean temporary packages files: -
+ When checked the Clean interval in days option
+ is enabled. Update Manager automatically
+ removes any temporary files created by the upgrade process according
+ to the value specified in the scroll-box.
+
+
+ Set maximum size of the package cache: When checked the size of
+ the package cache is limited to the value specified in the Maximum size in
+ MB spin-box.
+
+
+ Delete old packages in the package cache: When checked cached
+ packaged with a date older than the value specified in the Maximum age in
+ days spin-box will be automatically purged from the cache.
+
+
+
+
+ Install Progress for Terminal View Only
+ It is also possible to configure the installation progress to use
+ only a terminal view. That is to say, no progress bar is displayed, only
+ a terminal view.
+
+
+
+
+
+
+ Monitoring Installation Progress
+
+
+
+
+ Do not terminate the installation process. This may lead to
+ corruption of installed programs and general system
+ instability.
+
+ Changing between 'Progress Bar' and
+ 'Terminal View,' modes is managed via
+ Synaptic. To change modes proceed as
+ follows:
+
+
+ Start Synaptic by selecting
+ System
+ Administration
+ Synaptic Package Manager
+ from the Desktop menu system.
+
+
+ When prompted, enter your password.
+
+
+ From the main menu, select
+ Settings
+ Preferences
+ . The Preferences dialog is
+ displayed.
+
+
+ From the General tab, Apply
+ Changes group, check or
+ uncheck the Apply changes in terminal
+ window checkbox.
+
+
+
+
+
+
+ Synaptic Preferences - General Tab
+
+
+
+
+
+
+ Click
+ OK and exit
+ Synaptic.
+
+
+
+
+
+ About Update Manager
+ The Update Manager was written by Michiel
+ Sikkes michiel@eyeopened.nl and Michael Vogt
+ michael.vogt@ubuntu.com as an
+ apt update manager for the GNOME Desktop of the
+ Ubuntu distribution. The user manual was written by Sean Wheller
+ sean@inwords.co.za.
+ To report a bug or make a suggestion regarding this package or this
+ manual, send mail to ubuntu-users@lists.ubuntu.com.
+ &GFDL;
diff -Nru update-manager-17.10.11/hwe-support-status update-manager-0.156.14.15/hwe-support-status
--- update-manager-17.10.11/hwe-support-status 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/hwe-support-status 2017-12-23 05:00:37.000000000 +0000
@@ -4,14 +4,12 @@
import optparse
import datetime
-import distro_info
import os
import re
-import subprocess
import sys
import apt
-from UpdateManager.Core.utils import twrap, get_dist
+from UpdateManager.Core.utils import twrap
# set locale early so that the subsequent imports have localized
# strings
@@ -28,68 +26,58 @@
from HweSupportStatus.consts import (
Messages,
- LTS_EOL_DATE,
- HWE_EOL_DATE,
- NEXT_LTS_DOT1_DATE,
+ PRECISE_EOL_DATE,
+ PRECISE_HWE_EOL_DATE,
+ TRUSTY_DOT1_DATE,
)
+
-
-# HWE stack with a short support period
+# HWE backport names that are no longer supported
HWE_UNSUPPORTED_BACKPORTS = (
- "-lts-utopic",
- "-lts-vivid",
- "-lts-wily"
+ "-lts-quantal",
+ "-lts-raring",
+ "-lts-saucy"
)
# from https://wiki.ubuntu.com/Kernel/LTSEnablementStack
-UNSUPPORTED_KERNEL_IMAGE_REGEX = \
- r'linux-image.*-(3\.16|3\.19|4\.2)(\.[0-9]+)?-.*'
+ # version 3.11.x 3.8.x and 3.5.x are unsupported in precise
+UNSUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.(11|8|5)(\.[0-9]+)?-.*'
-# HWE stack with a long support period
-HWE_SUPPORTED_BACKPORT = "-lts-xenial"
-SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-image.*-4\.4(\.[0-9]+)?-.*'
+# supported HWE stack
+HWE_SUPPORTED_BACKPORT = "-lts-trusty"
+SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-.*-3\.13(\.[0-9]+)?-.*'
KERNEL_METAPKGS = (
"linux-generic",
"linux-image-generic",
- "linux-signed-generic",
- "linux-signed-image-generic",
)
XORG_METAPKGS = (
"xserver-xorg",
"libgl1-mesa-glx",
- # LP: #1610434 - Ubuntu GNOME needed libwayland
- "libwayland-egl1-mesa",
-)
-VBOX_METAPKGS = (
- "virtualbox-guest-utils",
- "virtualbox-guest-source"
)
-METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS + VBOX_METAPKGS
+METAPKGS = KERNEL_METAPKGS + XORG_METAPKGS
class Package:
"""A lightweight apt package """
- def __init__(self, name, version, arch, foreign=False):
+ def __init__(self, name, version):
self.name = name
self.installed_version = version
- self.arch = arch
- self.foreign = foreign
def find_hwe_packages(installed_packages):
unsupported_hwe_packages = set()
supported_hwe_packages = set()
for pkg in installed_packages:
- # metapackages and X are marked with the -lts-$distro string
+ # metapackages and X are marked with the -lts-distro string
for name in HWE_UNSUPPORTED_BACKPORTS:
if pkg.name.endswith(name):
unsupported_hwe_packages.add(pkg)
- # The individual backported kernels have names like
+ # The individual backported kernels have names like
# linux-image-3.11.0-17-generic
# so we match via a regexp.
- #
- # The linux-image-generic-lts-$distro metapkg has additional
+ #
+ # The linux-image-generic-lts-saucy metapkg has additional
# dependencies (like linux-firmware) so we can't just walk the
# dependency chain.
if re.match(UNSUPPORTED_KERNEL_IMAGE_REGEX, pkg.name):
@@ -119,7 +107,7 @@
def is_unsupported_xstack_running(unsupported_hwe_packages):
# the HWE xstacks conflict with each other, so we can simply test
- # for existence in the installed unsupported hwe packages
+ # for existance in the installed unsupported hwe packages
for pkg in unsupported_hwe_packages:
for xorg_meta in XORG_METAPKGS:
if pkg.name.startswith(xorg_meta):
@@ -127,22 +115,18 @@
return False
-def find_supported_replacement_hwe_packages(unsupported_hwe_packages,
- installed_packages):
+def find_supported_replacement_hwe_packages(unsupported_hwe_packages):
unsupported_metapkg_names = set()
replacement_names = set()
+ unsupported_hwe_package_names = set(
+ [pkg.name for pkg in unsupported_hwe_packages])
for metapkg in METAPKGS:
for unsupported_backport in HWE_UNSUPPORTED_BACKPORTS:
metapkg_name = metapkg + unsupported_backport
- for pkg in unsupported_hwe_packages:
- if pkg.name == metapkg_name:
- replacement_name = metapkg + HWE_SUPPORTED_BACKPORT
- if (replacement_name, pkg.arch) not in \
- [(p.name, p.arch) for p in installed_packages]:
- if pkg.foreign:
- replacement_name += ':' + pkg.arch
- replacement_names.add(replacement_name)
- unsupported_metapkg_names.add(metapkg_name)
+ if metapkg_name in unsupported_hwe_package_names:
+ replacement_name = metapkg + HWE_SUPPORTED_BACKPORT
+ replacement_names.add(replacement_name)
+ unsupported_metapkg_names.add(metapkg_name)
return unsupported_metapkg_names, replacement_names
@@ -152,38 +136,30 @@
def advice_about_hwe_status(unsupported_hwe_packages, supported_hwe_packages,
- installed_packages, has_update_manager, today,
- verbose):
+ has_update_manager, verbose):
unsupported_hwe_stack_running = is_unsupported_hwe_running(
unsupported_hwe_packages)
unsupported_hwe_metapkgs, supported_replacement_hwe = \
- find_supported_replacement_hwe_packages(unsupported_hwe_packages,
- installed_packages)
- # we need the "-p" option until the next LTS point release is available
- if today < NEXT_LTS_DOT1_DATE:
+ find_supported_replacement_hwe_packages(unsupported_hwe_packages)
+ # we need the "-p" option until 14.04.1 is released on 2014-07-15
+ if datetime.date.today() < TRUSTY_DOT1_DATE:
do_release_upgrade_option = "-p"
else:
do_release_upgrade_option = ""
if unsupported_hwe_stack_running:
- if today < HWE_EOL_DATE:
+ if datetime.date.today() < PRECISE_HWE_EOL_DATE:
s = Messages.HWE_SUPPORT_ENDS
else:
s = Messages.HWE_SUPPORT_HAS_ENDED
if has_update_manager:
print(s + Messages.UM_UPGRADE)
else:
- # bug #1341320 - if no metapkg is left we need to show
- # what is no longer supported
- if supported_replacement_hwe:
- print(s + Messages.APT_UPGRADE % (
- do_release_upgrade_option,
- " ".join(supported_replacement_hwe)))
- else:
- print(s + Messages.APT_SHOW_UNSUPPORTED % (
- " ".join([pkg.name for pkg in unsupported_hwe_packages])))
+ print(s + Messages.APT_UPGRADE % (
+ do_release_upgrade_option,
+ " ".join(supported_replacement_hwe)))
- # some unsupported package installed but not running and not superseded
+ # some unsupported package installed but not running and not superseeded
# - this is worth reporting
elif (unsupported_hwe_packages and
not supported_hwe_packages and
@@ -191,40 +167,40 @@
s = _("""
You have packages from the Hardware Enablement Stack (HWE) installed that
are going out of support on %s.
- """) % HWE_EOL_DATE
+ """) % PRECISE_HWE_EOL_DATE
if has_update_manager:
print(s + Messages.UM_UPGRADE)
else:
print(s + Messages.APT_UPGRADE % (
do_release_upgrade_option,
" ".join(supported_replacement_hwe)))
+
elif supported_hwe_packages:
print(Messages.HWE_SUPPORTED)
elif verbose:
print(
_("You are not running a system with a Hardware Enablement Stack. "
"Your system is supported until %(month)s %(year)s.") % {
- 'month': LTS_EOL_DATE.strftime("%B"),
- 'year': LTS_EOL_DATE.year})
+ 'month': PRECISE_EOL_DATE.strftime("%B"),
+ 'year': PRECISE_EOL_DATE.year})
if __name__ == "__main__":
parser = optparse.OptionParser(description=_("Check HWE support status"))
parser.add_option('--quiet', action='store_true', default=False,
- help="No output, exit code 10 on unsupported HWE "
- "packages")
+ help="No output, exit code 1 on unsupported HWE "
+ "packages")
parser.add_option('--verbose', action='store_true', default=False,
- help="more verbose output")
+ help="more verbose output")
parser.add_option('--show-all-unsupported', action='store_true',
- default=False,
- help="Show unsupported HWE packages")
+ default=False,
+ help="Show unsupported HWE packages")
parser.add_option('--show-replacements', action='store_true',
default=False,
- help="show what packages need installing to be "
- "supported")
+ help='show what packages need installing to be supported')
# hidden, only useful for testing
parser.add_option(
- '--disable-hwe-check-semaphore-file',
+ '--disable-hwe-check-semaphore-file',
default="/var/lib/update-notifier/disable-hwe-eol-messages",
help=optparse.SUPPRESS_HELP)
options, args = parser.parse_args()
@@ -233,17 +209,7 @@
nullfd = os.open(os.devnull, os.O_WRONLY)
os.dup2(nullfd, sys.stdout.fileno())
- # Check to see if we are an LTS release
- di = distro_info.UbuntuDistroInfo()
- codename = get_dist()
- lts = di.is_lts(codename)
- if not lts:
- if options.verbose:
- print("Only LTS releases have Hardware Enablement stacks",
- file=sys.stderr)
- sys.exit(0)
-
- # request from PSE to be able to disable the hwe check via a special
+ # request from PSE to be able to disabled the hwe check via a special
# semaphore file
HWE_CHECK_DISABLED_FILE = options.disable_hwe_check_semaphore_file
if os.path.exists(HWE_CHECK_DISABLED_FILE):
@@ -252,47 +218,32 @@
HWE_CHECK_DISABLED_FILE, file=sys.stderr)
sys.exit(0)
- foreign_archs = set(subprocess.check_output(
- ['dpkg', '--print-foreign-architectures'],
- universal_newlines=True).split())
-
# do the actual check
installed_packages = set()
- today = datetime.date.today()
tagf = apt.apt_pkg.TagFile("/var/lib/dpkg/status")
while tagf.step():
if tagf.section.find("Status", "") != "install ok installed":
continue
pkgname = tagf.section.find("Package")
version = tagf.section.find("Version")
- arch = tagf.section.find("Architecture")
- foreign = arch in foreign_archs
- installed_packages.add(Package(pkgname, version, arch, foreign))
+ installed_packages.add(Package(pkgname, version))
- has_update_manager = "update-manager" in [
- pkg.name for pkg in installed_packages]
+ has_update_manager = "update-manager" in installed_packages
unsupported_hwe_packages, supported_hwe_packages = find_hwe_packages(
installed_packages)
-
if options.show_all_unsupported:
- if today > HWE_EOL_DATE:
- print(twrap(" ".join([
- pkg.foreign and pkg.name + ':' + pkg.arch or pkg.name
- for pkg in unsupported_hwe_packages])))
-
+ print(twrap(" ".join(unsupported_hwe_packages)))
if options.show_replacements:
- unsupported, replacements = find_supported_replacement_hwe_packages(
- unsupported_hwe_packages, installed_packages)
- if replacements:
- print(" ".join(replacements))
-
+ unsupported, replacements = find_supported_replacement_hwe_packages(
+ unsupported_hwe_packages)
+ print(" ".join(replacements))
+
if not options.show_all_unsupported and not options.show_replacements:
advice_about_hwe_status(
- unsupported_hwe_packages, supported_hwe_packages,
- installed_packages, has_update_manager, today,
- options.verbose)
- if is_unsupported_hwe_running(unsupported_hwe_packages) and \
- today > HWE_EOL_DATE:
+ unsupported_hwe_packages, supported_hwe_packages,
+ has_update_manager, options.verbose)
+
+ if is_unsupported_hwe_running(unsupported_hwe_packages):
sys.exit(10)
sys.exit(0)
diff -Nru update-manager-17.10.11/HweSupportStatus/consts.py update-manager-0.156.14.15/HweSupportStatus/consts.py
--- update-manager-17.10.11/HweSupportStatus/consts.py 2017-08-07 19:24:17.000000000 +0000
+++ update-manager-0.156.14.15/HweSupportStatus/consts.py 2017-12-23 05:00:37.000000000 +0000
@@ -5,52 +5,44 @@
from gettext import gettext as _
-# the day on which the short support HWE stack goes EoL
-HWE_EOL_DATE = datetime.date(2016, 8, 4)
-# the day on which the next LTS first point release is available
-# used to propose a release upgrade
-NEXT_LTS_DOT1_DATE = datetime.date(2016, 7, 21)
+# the day on which the PRECISE (12.04) HWE stack goes out of support
+PRECISE_HWE_EOL_DATE = datetime.date(2014, 8, 7)
-# end of the month in which this LTS goes EoL
-LTS_EOL_DATE = datetime.date(2019, 4, 30)
+# the date 14.04.1 is available
+TRUSTY_DOT1_DATE = datetime.date(2014, 7, 16)
+
+# the month in wich PRECISE (12.04) goes out of support
+PRECISE_EOL_DATE = datetime.date(2017, 4, 1)
class Messages:
UM_UPGRADE = _("""
-There is a graphics stack installed on this system. An upgrade to a
-configuration supported for the full lifetime of the LTS will become
-available on %(date)s and can be installed by running 'update-manager'
-in the Dash.
- """) % {'date': NEXT_LTS_DOT1_DATE.isoformat()}
+There is a graphics stack installed on this system. An upgrade to a
+supported (or longer supported) configuration will become available
+on %(date)s and can be invoked by running 'update-manager' in the
+Dash.
+ """) % {'date': TRUSTY_DOT1_DATE.strftime("%x"),
+ }
APT_UPGRADE = _("""
-To upgrade to a supported (or longer-supported) configuration:
+To upgrade to a supported (or longer supported) configuration:
-* Upgrade from Ubuntu 14.04 LTS to Ubuntu 16.04 LTS by running:
+* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:
sudo do-release-upgrade %s
OR
-* Switch to the current security-supported stack by running:
+* Install a newer HWE version by running:
sudo apt-get install %s
and reboot your system.""")
- # this message is shown if there is no clear upgrade path via a
- # meta pkg that we recognize
- APT_SHOW_UNSUPPORTED = _("""
-The following packages are no longer supported:
- %s
-
-Please upgrade them to a supported HWE stack or remove them if you
-no longer need them.
-""")
-
HWE_SUPPORTED = _("Your Hardware Enablement Stack (HWE) is "
"supported until %(month)s %(year)s.") % {
- 'month': LTS_EOL_DATE.strftime("%B"),
- 'year': LTS_EOL_DATE.year}
+ 'month': PRECISE_EOL_DATE.strftime("%B"),
+ 'year': PRECISE_EOL_DATE.year,
+ }
HWE_SUPPORT_ENDS = _("""
Your current Hardware Enablement Stack (HWE) is going out of support
@@ -58,11 +50,14 @@
and graphics stack) of your system will no longer be available.
For more information, please see:
-http://wiki.ubuntu.com/1404_HWE_EOL
-""") % HWE_EOL_DATE.isoformat()
+http://wiki.ubuntu.com/1204_HWE_EOL
+""") % PRECISE_HWE_EOL_DATE.strftime("%x")
HWE_SUPPORT_HAS_ENDED = _("""
-WARNING: Security updates for your current Hardware Enablement
-Stack ended on %s:
- * http://wiki.ubuntu.com/1404_HWE_EOL
-""") % HWE_EOL_DATE.isoformat()
+Your current Hardware Enablement Stack (HWE) is no longer supported
+since %s. Security updates for critical parts (kernel
+and graphics stack) of your system are no longer available.
+
+For more information, please see:
+http://wiki.ubuntu.com/1204_HWE_EOL
+""") % PRECISE_HWE_EOL_DATE.strftime("%x")
diff -Nru update-manager-17.10.11/janitor/__init__.py update-manager-0.156.14.15/janitor/__init__.py
--- update-manager-17.10.11/janitor/__init__.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/__init__.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-#
-# The following license applies to all files (including the icons):
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-# This is a namespace package.
-try:
- import pkg_resources
- pkg_resources.declare_namespace(__name__)
-except ImportError:
- import pkgutil
- __path__ = pkgutil.extend_path(__path__, __name__)
diff -Nru update-manager-17.10.11/janitor/plugincore/core/file_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/file_cruft.py
--- update-manager-17.10.11/janitor/plugincore/core/file_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/core/file_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-import os
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.i18n import setup_gettext
-_ = setup_gettext()
-
-
-class FileCruft(Cruft):
- """Cruft that is individual files.
-
- This type of cruft consists of individual files that should be removed.
- Various plugins may decide that various files are cruft; they can all use
- objects of FileCruft type to mark such files, regardless of the reason the
- files are considered cruft.
- """
-
- def __init__(self, pathname, description):
- self.pathname = pathname
- self._disk_usage = os.stat(pathname).st_blocks * 512
- self._description = description
-
- def get_prefix(self):
- return 'file'
-
- def get_prefix_description(self):
- return _('A file on disk')
-
- def get_shortname(self):
- return self.pathname
-
- def get_description(self):
- return '{}\n'.format(self._description)
-
- def get_disk_usage(self):
- return self._disk_usage
-
- def cleanup(self):
- os.remove(self.pathname)
diff -Nru update-manager-17.10.11/janitor/plugincore/core/missing_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/missing_package_cruft.py
--- update-manager-17.10.11/janitor/plugincore/core/missing_package_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/core/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'MissingPackageCruft',
-]
-
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.i18n import setup_gettext
-_ = setup_gettext()
-
-
-class MissingPackageCruft(Cruft):
- """Install a missing package."""
-
- def __init__(self, package, description=None):
- self.package = package
- self._description = description
-
- def get_prefix(self):
- return 'install-deb'
-
- def get_prefix_description(self):
- return _('Install missing package.')
-
- def get_shortname(self):
- return self.package.name
-
- def get_description(self):
- if self._description:
- return self._description
- else:
- # 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
- return _('Package %s should be installed.') % self.package.name
-
- def cleanup(self):
- self.package.markInstall()
diff -Nru update-manager-17.10.11/janitor/plugincore/core/package_cruft.py update-manager-0.156.14.15/janitor/plugincore/core/package_cruft.py
--- update-manager-17.10.11/janitor/plugincore/core/package_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/core/package_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'PackageCruft',
-]
-
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.i18n import setup_gettext
-_ = setup_gettext()
-
-
-class PackageCruft(Cruft):
- """Cruft that is .deb packages.
-
- This type of cruft consists of .deb packages installed onto the system
- which can be removed. Various plugins may decide that various packages
- are cruft; they can all use objects of PackageCruft type to mark such
- packages, regardless of the reason the packages are considered cruft.
-
- When PackageCruft instantiated, the package is identified by an
- apt.Package object. That object is used for all the real operations, so
- this class is merely a thin wrapper around it.
- """
-
- def __init__(self, pkg, description):
- self._pkg = pkg
- self._description = description
-
- def get_prefix(self):
- return 'deb'
-
- def get_prefix_description(self):
- return _('.deb package')
-
- def get_shortname(self):
- return self._pkg.name
-
- def get_description(self):
- return '{}\n\n{}'.format(self._description, self._pkg.summary)
-
- def get_disk_usage(self):
- return self._pkg.installedSize
-
- def cleanup(self):
- self._pkg.markDelete()
diff -Nru update-manager-17.10.11/janitor/plugincore/cruft.py update-manager-0.156.14.15/janitor/plugincore/cruft.py
--- update-manager-17.10.11/janitor/plugincore/cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,158 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'Cruft']
-
-
-from janitor.plugincore.i18n import setup_gettext
-_ = setup_gettext()
-
-
-from janitor.plugincore.exceptions import UnimplementedMethod
-
-
-class Cruft:
- """One piece of cruft to be cleaned out.
-
- A piece of cruft can be a file, a package, a configuration tweak that is
- missing, or something else.
-
- This is a base class, which does nothing. Subclasses do the actual work,
- though they must override the `get_shortname()` and `cleanup()` methods.
- """
-
- def get_prefix(self):
- """Return the unique prefix used to group this type of cruft.
-
- For example, the .deb package called 'foo' would have a prefix
- of 'deb'. This way, the package foo is not confused with the
- file foo, or the username foo.
-
- Subclasses SHOULD define this. The default implementation
- returns the name of the class, which is rarely useful to
- the user.
- """
- return self.__class__.__name__
-
- @property
- def prefix(self):
- return self.get_prefix()
-
- def get_prefix_description(self):
- """Return human-readable description of class of cruft."""
- return self.get_description()
-
- @property
- def prefix_description(self):
- return self.get_prefix_description()
-
- def get_shortname(self):
- """Return the name of this piece of cruft.
-
- The name should be something that the user will understand. For
- example, it might be the name of a package, or the full path to a
- file.
-
- The name should be unique within the unique prefix returned by
- `get_prefix()`. The prefix MUST NOT be included by this method, the
- `get_name()` method does that instead. The intent is that
- `get_shortname()` will be used by the user interface in contexts where
- the prefix is shown separately from the short name, and `get_name()`
- when a single string is used.
-
- Subclasses MUST define this. The default implementation raises an
- exception.
- """
- raise UnimplementedMethod(self.get_shortname)
-
- @property
- def shortname(self):
- return self.get_shortname()
-
- def get_name(self):
- """Return prefix plus name.
-
- See `get_prefix()` and `get_shortname()` for a discussion of the
- prefix and the short name. This method will return the prefix, a
- colon, and the short name.
-
- The long name will used to store state/configuration data: _this_
- package should not be removed.
- """
- return '{}:{}'.format(self.prefix, self.shortname)
-
- @property
- def name(self):
- return self.get_name()
-
- def __repr__(self):
- return '<{} "{}">'.format(self.__class__.__name__, self.name)
-
- def get_description(self):
- """Return a description of this piece of cruft.
-
- This may be arbitrarily long. The user interface will take care of
- breaking it into lines or otherwise presenting it to the user in a
- nice manner. The description should be plain text UTF-8 unicode.
-
- The default implementation returns the empty string. Subclasses MAY
- override this as they wish.
- """
- return ''
-
- @property
- def description(self):
- return self.get_description()
-
- def get_disk_usage(self):
- """Return amount of disk space reserved by this piece of cruft.
-
- The unit is bytes.
-
- The disk space in question should be the amount that will be freed if
- the cruft is cleaned up. The amount may be an estimate (i.e. a
- guess). It is intended to be shown to the user to help them decide
- what to remove and what to keep.
-
- This will also be used by the user interface to better estimate how
- much remaining time there is when cleaning up a lot of cruft.
-
- For some types of cruft, this is not applicable and they should return
- `None`. The base class implementation does that, so subclasses MUST
- define this method if it is useful for them to return something else.
-
- The user interface will distinguish between None (not applicable) and
- 0 (no disk space being used).
- """
- return None
-
- @property
- def disk_usage(self):
- return self.get_disk_usage()
-
- def cleanup(self):
- """Clean up this piece of cruft.
-
- Depending on the type of cruft, this may mean removing files,
- packages, modifying configuration files, or something else.
-
- The default implementation raises an exception. Subclasses MUST
- override this.
- """
- raise UnimplementedMethod(self.cleanup)
diff -Nru update-manager-17.10.11/janitor/plugincore/docs/README.rst update-manager-0.156.14.15/janitor/plugincore/docs/README.rst
--- update-manager-17.10.11/janitor/plugincore/docs/README.rst 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/docs/README.rst 1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-=========================
-Computer Janitor plugins
-=========================
-
-Computer Janitor supports a plugin architecture which allows you to add
-additional ways of identifying and cleaning up *cruft*. Cruft is anything on
-your system that is no longer necessary and can be safely removed.
-
-Identifying cruft is the primary purpose of plugins, and each plugin should
-identify exactly one kind of cruft.
-
-The primary interface for this is the `get_cruft()` method on each plugin.
-This method should return an iterator over cruft objects, which allows for the
-UI to provide useful progress feedback.
-
-
-Cruft
-=====
-
-Cruft objects themselves must implement a specific interface, which is used to
-provide information to the user, and to perform the actual clean up
-operations. There is a useful base class that you can start with.
-
- >>> from janitor.plugincore.cruft import Cruft
-
-You can derive from this base class, but you must implement a couple of
-methods, or your cruft class will not be usable.
-
- >>> cruft = Cruft()
- >>> cruft.get_shortname()
- Traceback (most recent call last):
- ...
- UnimplementedMethod: Unimplemented method: get_shortname
- >>> cruft.cleanup()
- Traceback (most recent call last):
- ...
- UnimplementedMethod: Unimplemented method: cleanup
-
-Here is a cruft subclass that is usable in a plugin.
-
- >>> class MyCruft(Cruft):
- ... cruft_id = 1
- ... def __init__(self):
- ... self.cleanup_count = 0
- ... self._prefix = 'MyCruft{:02d}'.format(MyCruft.cruft_id)
- ... MyCruft.cruft_id += 1
- ... super(MyCruft, self).__init__()
- ... def get_shortname(self):
- ... return 'Example'
- ... def get_prefix(self):
- ... return self._prefix
- ... def cleanup(self):
- ... self.cleanup_count += 1
-
-Not only do the above methods work, but you can also use a more modern
-interface for getting information about the cruft.
-
- >>> mycruft = MyCruft()
- >>> print(mycruft.shortname)
- Example
- >>> print(mycruft.prefix)
- MyCruft01
- >>> print(mycruft.prefix_description)
-
- >>> print(mycruft.name)
- MyCruft01:Example
- >>> print(mycruft.description)
-
- >>> print(mycruft.disk_usage)
- None
- >>> mycruft.cleanup()
- >>> mycruft.cleanup_count
- 1
-
-Cruft objects also have a reasonable repr.
-
- >>> mycruft
-
-
-
-Plugins
-=======
-
-Computer Janitor plugins identify cruft. They use whatever algorithm
-necessary to return iterators over cruft in their `get_cruft()` method.
-Plugins must derived from the abstract base class, and must override certain
-methods.
-
- >>> from janitor.plugincore.plugin import Plugin
- >>> Plugin().get_cruft()
- Traceback (most recent call last):
- ...
- UnimplementedMethod: Unimplemented method: cleanup
-
-By subclassing the base class, we can provide a way to find cruft.
-
- >>> class MyPlugin(Plugin):
- ... def __init__(self):
- ... self.post_cleanup_count = 0
- ... self._my_cruft = [MyCruft()]
- ... super(MyPlugin, self).__init__()
- ... def get_cruft(self):
- ... for cruft in self._my_cruft:
- ... yield cruft
- ... def post_cleanup(self):
- ... self.post_cleanup_count += 1
-
-Now the plugin returns one piece of cruft.
-
- >>> plugin = MyPlugin()
- >>> for cruft in plugin.cruft:
- ... print(cruft)
-
-
-Plugins are also the way to clean up all their cruft.
-
- >>> plugin.do_cleanup_cruft()
- >>> for cruft in plugin.cruft:
- ... print(cruft.name, 'clean ups:', cruft.cleanup_count)
- MyCruft02:Example clean ups: 1
-
-The plugin also gets a chance to perform post-cleanup operations.
-
- >>> plugin.post_cleanup_count
- 1
-
-For historical API reasons, plugins have conditions which are set to the empty
-list by default.
-
- >>> plugin.condition
- []
-
-These conditions can be set.
-
- >>> plugin.condition = 'my condition'
- >>> print(plugin.condition)
- my condition
-
-Plugins also have optional applications, but by default there is no `app`
-attribute (this is for historical API reasons).
-
- >>> print(plugin.app)
- Traceback (most recent call last):
- ...
- AttributeError: app
-
-The `app` can be set through this historical API.
-
- >>> plugin.set_application('my application')
- >>> print(plugin.app)
- my application
-
-
-Plugin manager
-==============
-
-The plugin manager is used to find and load plugins. It searches a list of
-directories for files that end in `_plugin.py`.
-::
-
- >>> from janitor.plugincore.testing.helpers import (
- ... setup_plugins, Application)
- >>> plugin_dir, cleanup = setup_plugins('alpha_plugin.py')
- >>> cleanups.append(cleanup)
- >>> app = Application()
-
- >>> from janitor.plugincore.manager import PluginManager
- >>> manager = PluginManager(app, [plugin_dir])
- >>> for filename in manager.plugin_files:
- ... print('plugin file:', filename)
- plugin file: .../alpha_plugin.py
-
-The plugin manager can import each plugin module found and instantiate all
-`Plugin` base classes it finds. After each plugin is found, a callback is
-called, which can be used to inform the user of progress. The arguments of
-the callback are:
-
- * The plugin filename.
- * This plugin number in the total list of plugins found, starting from 0
- * The total number of plugin files to be examined.
-
- >>> def callback(filename, i, total):
- ... print('[{:02d}/{:02d}] {}'.format(i, total, filename))
-
-The loaded plugins are cached, so the modules are only imported once. We'll
-use the wildcard condition which matches all plugins.
-
- >>> plugins = manager.get_plugins(condition='*', callback=callback)
- [00/01] .../alpha_plugin.py
- >>> for plugin in plugins:
- ... print(plugin)
-
-
-However, plugins can have conditions and we can use these conditions to get
-back a different set of plugins from the manager.
-
- >>> plugins[0].condition = 'happy'
- >>> len(manager.get_plugins(condition='sad'))
- 0
- >>> len(manager.get_plugins(condition='happy'))
- 1
diff -Nru update-manager-17.10.11/janitor/plugincore/exceptions.py update-manager-0.156.14.15/janitor/plugincore/exceptions.py
--- update-manager-17.10.11/janitor/plugincore/exceptions.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/exceptions.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'ComputerJanitorException',
- 'UnimplementedMethod',
-]
-
-
-from janitor.plugincore.i18n import setup_gettext
-_ = setup_gettext()
-
-
-class ComputerJanitorException(Exception):
- """Base class for all Computer Janitor exceptions."""
-
-
-class UnimplementedMethod(ComputerJanitorException, NotImplementedError):
- """A method expected by the Computer Janitor API is unimplemented."""
-
- def __init__(self, method):
- self._method = method
-
- def __str__(self):
- # Why do we use %s here instead of $strings or {} format placeholders?
- # It's because we don't want to break existing translations.
- return _('Unimplemented method: %s') % self._method.__name__
diff -Nru update-manager-17.10.11/janitor/plugincore/i18n.py update-manager-0.156.14.15/janitor/plugincore/i18n.py
--- update-manager-17.10.11/janitor/plugincore/i18n.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/i18n.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""Set up the gettext context."""
-
-
-import os
-import gettext
-
-
-def setup_gettext():
- """Set up gettext for a module."""
- domain = 'update-manager'
- localedir = os.environ.get('LOCPATH', None)
- t = gettext.translation(domain, localedir=localedir, fallback=True)
- try:
- # We must receive unicodes from the catalog. Python 2 by default
- # returns 8-bit strings from the .gettext() method, so use the unicode
- # variant. If this doesn't exist, we're in Python 3 and there,
- # .gettext does the right thing.
- return t.ugettext
- except AttributeError:
- return t.gettext
diff -Nru update-manager-17.10.11/janitor/plugincore/__init__.py update-manager-0.156.14.15/janitor/plugincore/__init__.py
--- update-manager-17.10.11/janitor/plugincore/__init__.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/__init__.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-#
-# The following license applies to all files (including the icons):
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-__version__ = '1.0'
diff -Nru update-manager-17.10.11/janitor/plugincore/manager.py update-manager-0.156.14.15/janitor/plugincore/manager.py
--- update-manager-17.10.11/janitor/plugincore/manager.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/manager.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'PluginManager',
-]
-
-
-import os
-import imp
-import sys
-import errno
-import inspect
-import logging
-
-from janitor.plugincore.plugin import Plugin
-
-
-SPACE = ' '
-STR_TYPES = (basestring if str is bytes else str)
-
-
-class PluginManager:
- """Find and load plugins.
-
- Plugins are stored in files named '*_plugin.py' in the list of directories
- given to the constructor.
- """
-
- def __init__(self, app, plugin_dirs):
- self._app = app
- # Make a copy to immune ourselves from mutability. For safety, double
- # check a common mistake.
- if isinstance(plugin_dirs, STR_TYPES):
- raise TypeError(
- 'Expected sequence, got {}'.format(type(plugin_dirs)))
- self._plugin_dirs = list(plugin_dirs)
- self._plugins = None
-
- def get_plugin_files(self):
- """Return all filenames in which plugins may be stored."""
-
- for dirname in self._plugin_dirs:
- try:
- basenames = [filename for filename in os.listdir(dirname)
- if filename.endswith('_plugin.py')]
- except OSError as error:
- if error.errno != errno.ENOENT:
- raise
- logging.debug('No such plugin directory: {}'.format(dirname))
- continue
- logging.debug(
- 'Plugin modules in {}: {}'.format(
- dirname, SPACE.join(basenames)))
- # Sort the base names alphabetically for predictability.
- for filename in sorted(basenames):
- yield os.path.join(dirname, filename)
-
- @property
- def plugin_files(self):
- for filename in self.get_plugin_files():
- yield filename
-
- def _find_plugins(self, module):
- """Find and instantiate all plugins in a module."""
- def is_plugin(target):
- # Don't return the base class itself.
- return (inspect.isclass(target) and
- issubclass(target, Plugin) and
- target is not Plugin)
- plugin_classes = [
- member
- for name, member in inspect.getmembers(module, is_plugin)
- ]
- logging.debug('Plugins in {}: {}'.format(
- module, SPACE.join(str(plugin) for plugin in plugin_classes)))
- for plugin_class in plugin_classes:
- yield plugin_class()
-
- def _load_module(self, filename):
- """Load a module from a filename."""
- logging.debug('Loading module from file {}'.format(filename))
- # 2012-06-08 BAW: I don't particularly like putting an entry in
- # sys.modules with the basename of the file. Note that
- # imp.load_module() will reload the plugin if it's already been
- # imported, so check sys.modules first and don't reload the plugin
- # (this is a change in behavior from older versions, but a valid one I
- # think - reloading modules is problematic). Ideally, we'd be using
- # __import__() but we can't guarantee that the path to the filename is
- # on sys.path, so we'll just live with this as the most backward
- # compatible implementation.
- #
- # The other problem is that the module could be encoded, but this
- # mechanism doesn't support PEP 263 style source file encoding
- # specifications. To make matters worse, we can't use codecs.open()
- # with encoding='UTF-8' because imp.load_module() requires an actual
- # file object, not whatever codecs wrapper is used. If we were Python
- # 3 only, we could use the built-in open(), but since we have to also
- # support Python 3, we just have to live with the platform dependent
- # default text encoding of built-in open().
- module_name, ignore = os.path.splitext(os.path.basename(filename))
- if module_name in sys.modules:
- return sys.modules[module_name]
- with open(filename, 'r') as fp:
- try:
- module = imp.load_module(
- module_name, fp, filename,
- ('.py', 'r', imp.PY_SOURCE))
- except Exception as error:
- logging.warning("Failed to load plugin '{}' ({})".format(
- module_name, error))
- return None
- else:
- return module
-
- def get_plugins(self, condition=None, callback=None):
- """Return all plugins that have been found.
-
- Loaded plugins are cached, so they will only be loaded once.
-
- `condition` is matched against each plugin to determine whether it
- will be returned or not. A `condition` of the string '*' matches all
- plugins. The default condition matches all default plugins, since by
- default, plugins have a condition of the empty list.
-
- If `condition` matches the plugin's condition exactly, the plugin is
- returned. The plugin's condition can also be a sequence, and if
- `condition` is in that sequence, the plugin is returned.
-
- Note that even though loaded plugins are cached, calling
- `get_plugin()` with different a `condition` can return a different set
- of plugins.
-
- If `callback` is specified, it is called after each plugin has
- been found, with the following arguments: filename, index of
- filename in list of files to be examined (starting with 0), and
- total number of files to be examined. The purpose of this is to
- allow the callback to inform the user in case things take a long
- time.
- """
- # By default, plugins have a condition of the empty list, so unless a
- # plugin has an explicit condition set, this will match everything.
- if condition is None:
- condition = []
- # Only load the plugins once, however when different conditions are
- # given, a different set of the already loaded plugins may be
- # returned.
- if self._plugins is None:
- self._plugins = []
- filenames = list(self.plugin_files)
- total = len(filenames)
- for i, filename in enumerate(filenames):
- if callback is not None:
- callback(filename, i, total)
- module = self._load_module(filename)
- for plugin in self._find_plugins(module):
- plugin.set_application(self._app)
- self._plugins.append(plugin)
- # Now match each of the plugins against the specified condition,
- # returning only those that match, or all of them if there is no
- # condition.
- plugins = [
- plugin for plugin in self._plugins
- if (plugin.condition == condition or
- condition in plugin.condition or
- condition == '*')
- ]
- logging.debug("plugins for condition '{}' are '{}'".format(
- condition, plugins))
- return plugins
diff -Nru update-manager-17.10.11/janitor/plugincore/NEWS.rst update-manager-0.156.14.15/janitor/plugincore/NEWS.rst
--- update-manager-17.10.11/janitor/plugincore/NEWS.rst 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/NEWS.rst 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-============================
-NEWS for janitor.plugincore
-============================
-
-1.0 (2012-XX-XX)
-================
- * Initial release since refactoring into a separate package.
diff -Nru update-manager-17.10.11/janitor/plugincore/plugin.py update-manager-0.156.14.15/janitor/plugincore/plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'Plugin',
-]
-
-
-from janitor.plugincore.exceptions import UnimplementedMethod
-
-
-class Plugin:
- """Base class for plugins.
-
- These plugins only do one thing: identify cruft. See the 'get_cruft'
- method for details.
- """
-
- # XXX BAW 2012-06-08: For historical reasons, we do not set
- # self._condition or self.app in a constructor. This needs to be fixed.
-
- @property
- def condition(self):
- return (self._condition if hasattr(self, '_condition') else [])
-
- @condition.setter
- def condition(self, condition):
- self._condition = condition
-
- def set_application(self, app):
- """Set the Application instance this plugin belongs to."""
- self.app = app
-
- def do_cleanup_cruft(self):
- """Find cruft and clean it up.
-
- This is a helper method.
- """
- for cruft in self.get_cruft():
- cruft.cleanup()
- self.post_cleanup()
-
- def get_cruft(self):
- """Find some cruft in the system.
-
- This method MUST return an iterator (see 'yield' statement).
- This interface design allows cruft to be collected piecemeal,
- which makes it easier to show progress in the user interface.
-
- The base class default implementation of this raises an
- exception. Subclasses MUST override this method.
- """
- raise UnimplementedMethod(self.get_cruft)
-
- @property
- def cruft(self):
- for cruft in self.get_cruft():
- yield cruft
-
- def post_cleanup(self):
- """Do plugin-wide cleanup after the individual cleanup was performed.
-
- This is useful for stuff that needs to be processed in batches
- (e.g. for performance reasons) like package removal.
- """
- pass
diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/deb_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/deb_plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugins/deb_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'DebPlugin',
-]
-
-
-import apt
-
-from janitor.plugincore.plugin import Plugin
-
-
-class DebPlugin(Plugin):
- """Plugin for post-cleanup processing with apt.
-
- This plugin does not find any cruft of its own. Instead it centralizes
- the post-cleanup handling for all packages that remove .deb packages.
- """
- def get_cruft(self):
- return []
-
- def post_cleanup(self):
- try:
- self.app.apt_cache.commit(apt.progress.text.AcquireProgress(),
- apt.progress.base.InstallProgress())
- finally:
- self.app.refresh_apt_cache()
diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/dpkg_status_plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugins/dpkg_status_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'DpkgStatusCruft',
- 'DpkgStatusPlugin',
-]
-
-
-import logging
-import subprocess
-
-from apt_pkg import TagFile
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.i18n import setup_gettext
-from janitor.plugincore.plugin import Plugin
-
-_ = setup_gettext()
-
-
-class DpkgStatusCruft(Cruft):
- def __init__(self, n_items):
- self.n_items = n_items
-
- def get_prefix(self):
- return 'dpkg-status'
-
- def get_prefix_description(self):
- return _('%i obsolete entries in the status file') % self.n_items
-
- def get_shortname(self):
- return _('Obsolete entries in dpkg status')
-
- def get_description(self): # pragma: no cover
- return _('Obsolete dpkg status entries')
-
- def cleanup(self):
- logging.debug('calling dpkg --forget-old-unavail')
- res = subprocess.call('dpkg --forget-old-unavail'.split())
- logging.debug('dpkg --forget-old-unavail returned {}'.format(res))
-
-
-class DpkgStatusPlugin(Plugin):
- def __init__(self, filename=None):
- self.status = ('/var/lib/dpkg/status'
- if filename is None
- else filename)
- self.condition = ['PostCleanup']
-
- def get_cruft(self):
- n_cruft = 0
- with open(self.status) as fp:
- tagf = TagFile(fp)
- while tagf.step():
- statusline = tagf.section.get('Status')
- (want, flag, status) = statusline.split()
- if (want == 'purge' and
- flag == 'ok' and
- status == 'not-installed'):
- # Then...
- n_cruft += 1
- logging.debug('DpkgStatusPlugin found {} cruft items'.format(n_cruft))
- if n_cruft:
- return [DpkgStatusCruft(n_cruft)]
- return []
diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/kdelibs4to5_plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugins/kdelibs4to5_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""Install kdelibs5-dev if kdeblibs4-dev is installed."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'Kdelibs4devToKdelibs5devPlugin',
-]
-
-
-from janitor.plugincore.core.missing_package_cruft import MissingPackageCruft
-from janitor.plugincore.i18n import setup_gettext
-from janitor.plugincore.plugin import Plugin
-
-_ = setup_gettext()
-
-
-class Kdelibs4devToKdelibs5devPlugin(Plugin):
- """Plugin to install kdelibs5-dev if kdelibs4-dev is installed.
-
- See also LP: #279621.
- """
-
- def __init__(self):
- self.condition = ['from_hardyPostDistUpgradeCache']
-
- def get_cruft(self):
- fromp = 'kdelibs4-dev'
- top = 'kdelibs5-dev'
- cache = self.app.apt_cache
- if (fromp in cache and cache[fromp].is_installed and
- top in cache and not cache[top].is_installed):
- yield MissingPackageCruft(
- cache[top],
- _('When upgrading, if kdelibs4-dev is installed, '
- 'kdelibs5-dev needs to be installed. See '
- 'bugs.launchpad.net, bug #279621 for details.'))
diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/langpack_manual_plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugins/langpack_manual_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""Mark langpacks to be manually installed."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'ManualInstallCruft',
- 'MarkLangpacksManuallyInstalledPlugin',
-]
-
-
-import logging
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.i18n import setup_gettext
-from janitor.plugincore.plugin import Plugin
-
-_ = setup_gettext()
-
-
-class ManualInstallCruft(Cruft):
- def __init__(self, pkg):
- self.pkg = pkg
-
- def get_prefix(self):
- return 'mark-manually-installed'
-
- def get_shortname(self):
- return self.pkg.name
-
- def get_description(self):
- return (_('%s needs to be marked as manually installed.') %
- self.pkg.name)
-
- def cleanup(self):
- self.pkg.markKeep()
- self.pkg.markInstall()
-
-
-class MarkLangpacksManuallyInstalledPlugin(Plugin):
- """Plugin to mark language packs as manually installed.
-
- This works around quirks in the hardy->intrepid upgrade.
- """
-
- def __init__(self):
- self.condition = ['from_hardyPostDistUpgradeCache']
-
- def get_cruft(self):
- # language-support-* changed its dependencies from "recommends" to
- # "suggests" for language-pack-* - this means that apt will think they
- # are now auto-removalable if they got installed as a dep of
- # language-support-* - we fix this here
- cache = self.app.apt_cache
- for pkg in cache:
- if (pkg.name.startswith('language-pack-') and
- not pkg.name.endswith('-base') and
- cache._depcache.IsAutoInstalled(pkg._pkg) and
- pkg.is_installed):
- # Then...
- logging.debug("setting '%s' to manual installed" % pkg.name)
- yield ManualInstallCruft(pkg)
diff -Nru update-manager-17.10.11/janitor/plugincore/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/janitor/plugincore/plugins/remove_lilo_plugin.py
--- update-manager-17.10.11/janitor/plugincore/plugins/remove_lilo_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-# Copyright (C) 2009 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""Remove lilo if grub is also installed."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'RemoveLiloPlugin',
-]
-
-
-import os
-import logging
-
-from janitor.plugincore.i18n import setup_gettext
-from janitor.plugincore.core.package_cruft import PackageCruft
-from janitor.plugincore.plugin import Plugin
-
-_ = setup_gettext()
-
-
-class RemoveLiloPlugin(Plugin):
- """Plugin to remove lilo if grub is also installed."""
-
- def __init__(self):
- self.condition = ['jauntyPostDistUpgradeCache']
-
- def get_description(self):
- return _('Remove lilo since grub is also installed.'
- '(See bug #314004 for details.)')
-
- def get_cruft(self):
- if 'lilo' in self.app.apt_cache and 'grub' in self.app.apt_cache:
- lilo = self.app.apt_cache['lilo']
- grub = self.app.apt_cache['grub']
- if lilo.is_installed and grub.is_installed:
- if not os.path.exists('/etc/lilo.conf'):
- yield PackageCruft(lilo, self.description)
- else:
- logging.warning('lilo and grub installed, but '
- 'lilo.conf exists')
diff -Nru update-manager-17.10.11/janitor/plugincore/testing/helpers.py update-manager-0.156.14.15/janitor/plugincore/testing/helpers.py
--- update-manager-17.10.11/janitor/plugincore/testing/helpers.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/testing/helpers.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-
-__metaclass__ = type
-__all__ = [
- 'Application',
- 'MockAptPackage',
- 'setup_plugins',
-]
-
-
-import os
-import shutil
-import tempfile
-import pkg_resources
-
-
-def setup_plugins(*plugin_filenames):
- plugin_dir = tempfile.mkdtemp()
- for filename in plugin_filenames:
- src = pkg_resources.resource_filename(
- 'janitor.plugincore.tests.data', filename)
- dst = os.path.join(plugin_dir, filename)
- shutil.copyfile(src, dst)
- return (plugin_dir, lambda: shutil.rmtree(plugin_dir))
-
-
-class Application:
- def __init__(self):
- self.notifications = []
- self.commit_called = False
- self.refresh_called = False
- self.apt_cache = self
-
- def commit(self, foo, bar):
- self.commit_called = True
-
- def refresh_apt_cache(self):
- self.refresh_called = True
-
-
-class MockAptPackage:
- def __init__(self):
- self.name = 'name'
- self.summary = 'summary'
- self.installedSize = 12765
- self.installed = False
- self.deleted = False
-
- def markInstall(self):
- self.installed = True
-
- def markDelete(self):
- self.deleted = True
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/alpha_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/alpha_plugin.py
--- update-manager-17.10.11/janitor/plugincore/tests/data/alpha_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/data/alpha_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""A test plugin."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'AlphaCruft',
- 'AlphaPlugin',
-]
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.plugin import Plugin
-
-
-class AlphaCruft(Cruft):
- def __init__(self, app):
- self.app = app
-
- def get_shortname(self):
- return 'Alpha'
-
- def cleanup(self):
- # Tell the app we're cleaning up this cruft.
- self.app.notifications.append((self, 'cruft'))
-
-
-class AlphaPlugin(Plugin):
- def get_cruft(self):
- yield AlphaCruft(self.app)
-
- def post_cleanup(self):
- self.app.notifications.append((self, 'post'))
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/bravo_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/bravo_plugin.py
--- update-manager-17.10.11/janitor/plugincore/tests/data/bravo_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/data/bravo_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""A test plugin."""
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'BravoCruft',
- 'BravoPlugin',
-]
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.plugin import Plugin
-
-
-class BravoCruft(Cruft):
- def __init__(self, app):
- self.app = app
-
- def get_shortname(self):
- return 'Bravo'
-
- def cleanup(self):
- # Tell the app we're cleaning up this cruft.
- self.app.notifications.append((self, 'cruft'))
-
-
-class BravoPlugin(Plugin):
- def get_cruft(self):
- yield BravoCruft(self.app)
-
- def post_cleanup(self):
- self.app.notifications.append((self, 'post'))
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/data/charlie_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/data/charlie_plugin.py
--- update-manager-17.10.11/janitor/plugincore/tests/data/charlie_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/data/charlie_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-"""A test plugin."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'CharlieCruft',
- 'CharliePlugin',
-]
-
-from janitor.plugincore.cruft import Cruft
-from janitor.plugincore.plugin import Plugin
-
-
-class CharlieCruft(Cruft):
- def __init__(self, app):
- self.app = app
-
- def get_shortname(self):
- return 'Charlie'
-
- def cleanup(self):
- # Tell the app we're cleaning up this cruft.
- self.app.notifications.append((self, 'cruft'))
-
-
-class CharliePlugin(Plugin):
- def get_cruft(self):
- yield CharlieCruft(self.app)
-
- def post_cleanup(self):
- self.app.notifications.append((self, 'post'))
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_deb_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/test_deb_plugin.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_deb_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_deb_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'DebPluginTests',
-]
-
-
-import unittest
-
-from janitor.plugincore.plugins.deb_plugin import DebPlugin
-from janitor.plugincore.testing.helpers import Application
-
-
-class DebPluginTests(unittest.TestCase):
- def setUp(self):
- self.plugin = DebPlugin()
- self.app = Application()
- self.plugin.set_application(self.app)
-
- def test_no_cruft(self):
- self.assertEqual(self.plugin.get_cruft(), [])
-
- def test_post_cleanup_calls_commit(self):
- self.plugin.post_cleanup()
- self.assertTrue(self.app.commit_called)
-
- def test_post_cleanup_calls_refresh(self):
- self.plugin.post_cleanup()
- self.assertTrue(self.app.refresh_called)
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_documentation.py update-manager-0.156.14.15/janitor/plugincore/tests/test_documentation.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_documentation.py 2017-08-07 19:44:31.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_documentation.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-"""Test harness for doctests."""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'additional_tests',
-]
-
-import os
-import atexit
-import doctest
-import unittest
-
-from pkg_resources import (
- resource_filename, resource_exists, resource_listdir, cleanup_resources)
-
-COMMASPACE = ', '
-DOT = '.'
-DOCTEST_FLAGS = (
- doctest.ELLIPSIS |
- doctest.NORMALIZE_WHITESPACE |
- doctest.REPORT_NDIFF |
- doctest.IGNORE_EXCEPTION_DETAIL)
-
-
-WHOAMI = 'janitor.plugincore'
-
-
-def stop():
- """Call into pdb.set_trace()"""
- # Do the import here so that you get the wacky special hacked pdb instead
- # of Python's normal pdb.
- import pdb
- pdb.set_trace()
-
-
-def setup(testobj):
- """Test setup."""
- # Make sure future statements in our doctests match the Python code.
- try:
- testobj.globs['absolute_import'] = absolute_import
- testobj.globs['print_function'] = print_function
- testobj.globs['unicode_literals'] = unicode_literals
- except NameError:
- pass
- testobj.globs['stop'] = stop
- testobj.globs['cleanups'] = []
-
-
-def teardown(testobj):
- for cleanup in testobj.globs['cleanups']:
- cleanup()
-
-
-def additional_tests():
- "Run the doc tests (README.rst and docs/*, if any exist)"
- doctest_files = [
- # os.path.abspath(resource_filename(WHOAMI, 'README.rst')),
- ]
- if resource_exists(WHOAMI, 'docs'):
- for name in resource_listdir(WHOAMI, 'docs'):
- if name.endswith('.rst'):
- doctest_files.append(
- os.path.abspath(
- resource_filename(WHOAMI, 'docs/%s' % name)))
- kwargs = dict(module_relative=False,
- optionflags=DOCTEST_FLAGS,
- setUp=setup, tearDown=teardown,
- )
- atexit.register(cleanup_resources)
- return unittest.TestSuite((
- doctest.DocFileSuite(*doctest_files, **kwargs)))
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_dpkg_status_plugin.py update-manager-0.156.14.15/janitor/plugincore/tests/test_dpkg_status_plugin.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_dpkg_status_plugin.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-# Copyright (C) 2009-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'AutoRemovalPluginTests',
-]
-
-
-import os
-import tempfile
-import unittest
-
-from janitor.plugincore.plugins.dpkg_status_plugin import DpkgStatusPlugin
-
-
-class AutoRemovalPluginTests(unittest.TestCase):
- def setUp(self):
- fd, self.filename = tempfile.mkstemp()
- self.addCleanup(lambda: os.remove(self.filename))
- try:
- os.write(fd, b'Status: purge ok not-installed\n')
- finally:
- os.close(fd)
- self.plugin = DpkgStatusPlugin(self.filename)
-
- def test_dpkg_status(self):
- names = [cruft.get_name() for cruft in self.plugin.get_cruft()]
- self.assertEqual(
- sorted(names),
- ['dpkg-status:Obsolete entries in dpkg status']
- )
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_file_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_file_cruft.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_file_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_file_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'FileCruftTests',
-]
-
-import os
-import errno
-import tempfile
-import unittest
-import subprocess
-
-from janitor.plugincore.core.file_cruft import FileCruft
-
-
-class FileCruftTests(unittest.TestCase):
- def setUp(self):
- fd, self.pathname = tempfile.mkstemp()
-
- def cleanup():
- try:
- os.remove(self.pathname)
- except OSError as error:
- if error.errno != errno.ENOENT:
- raise
-
- self.addCleanup(cleanup)
- try:
- os.write(fd, b'x' * 1024)
- finally:
- os.close(fd)
- self.cruft = FileCruft(self.pathname, 'description')
-
- def test_refix(self):
- self.assertEqual(self.cruft.get_prefix(), 'file')
- self.assertEqual(self.cruft.prefix, 'file')
-
- def test_prefix_description(self):
- self.assertEqual(self.cruft.get_prefix_description(), 'A file on disk')
- self.assertEqual(self.cruft.prefix_description, 'A file on disk')
-
- def test_shortname(self):
- self.assertEqual(self.cruft.get_shortname(), self.pathname)
- self.assertEqual(self.cruft.shortname, self.pathname)
-
- def test_name(self):
- expected = 'file:{}'.format(self.pathname)
- self.assertEqual(self.cruft.get_name(), expected)
- self.assertEqual(self.cruft.name, expected)
-
- def test_description(self):
- self.assertEqual(self.cruft.get_description(), 'description\n')
- self.assertEqual(self.cruft.description, 'description\n')
-
- def test_disk_usage(self):
- stdout = subprocess.check_output(
- ('du -s -B 1 {}'.format(self.pathname)).split(),
- # Decode output as UTF-8 and convert line endings to \n
- universal_newlines=True)
- du = int(stdout.splitlines()[0].split('\t')[0])
- self.assertEqual(self.cruft.get_disk_usage(), du)
- self.assertEqual(self.cruft.disk_usage, du)
-
- def test_cleanup(self):
- self.assertTrue(os.path.exists(self.pathname))
- self.cruft.cleanup()
- self.assertFalse(os.path.exists(self.pathname))
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_manager.py update-manager-0.156.14.15/janitor/plugincore/tests/test_manager.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_manager.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_manager.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'ManagerTests',
-]
-
-import os
-import sys
-import unittest
-
-from janitor.plugincore.manager import PluginManager
-from janitor.plugincore.plugin import Plugin
-from janitor.plugincore.testing.helpers import setup_plugins, Application
-
-
-class ManagerTests(unittest.TestCase):
- """Test of the plugin manager."""
-
- def setUp(self):
- self._app = Application()
- self._sys_path = sys.path[:]
-
- def tearDown(self):
- # The tests which actually load plugins pollutes sys.path, so save and
- # restore it around tests.
- sys.path = self._sys_path
-
- def test_missing_plugindir_is_ignored(self):
- plugin_dir, cleanup = setup_plugins()
- self.addCleanup(cleanup)
- missing_dir = os.path.join(plugin_dir, 'does', 'not', 'exist')
- manager = PluginManager(self._app, [missing_dir])
- # Even though the manager is pointing to a missing plugins dir,
- # getting all the plugin files will not crash, it will just return an
- # empty sequence.
- self.assertEqual(list(manager.plugin_files), [])
-
- def test_finds_no_plugins_in_empty_directory(self):
- plugin_dir, cleanup = setup_plugins()
- self.addCleanup(cleanup)
- manager = PluginManager(self._app, [plugin_dir])
- self.assertEqual(len(manager.get_plugins()), 0)
-
- def test_finds_one_plugin_file(self):
- plugin_dir, cleanup = setup_plugins('alpha_plugin.py')
- self.addCleanup(cleanup)
- manager = PluginManager(self._app, [plugin_dir])
- self.assertEqual(list(manager.plugin_files),
- [os.path.join(plugin_dir, 'alpha_plugin.py')])
-
- def test_finds_one_plugin(self):
- plugin_dir, cleanup = setup_plugins('alpha_plugin.py')
- self.addCleanup(cleanup)
- manager = PluginManager(self._app, [plugin_dir])
- plugins = list(manager.get_plugins())
- self.assertEqual(len(plugins), 1)
- self.assertTrue(isinstance(plugins[0], Plugin))
-
- def test_plugin_loading_sets_application(self):
- plugin_dir, cleanup = setup_plugins('alpha_plugin.py')
- self.addCleanup(cleanup)
- manager = PluginManager(self._app, [plugin_dir])
- plugins = list(manager.get_plugins())
- self.assertEqual(plugins[0].app, self._app)
-
- def test_plugin_loading_callback(self):
- callback_calls = []
-
- def callback(filename, i, total):
- callback_calls.append((os.path.basename(filename), i, total))
-
- plugin_dir, cleanup = setup_plugins('alpha_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- manager.get_plugins(callback=callback)
- self.assertEqual(callback_calls, [('alpha_plugin.py', 0, 1)])
-
- def test_plugin_loading_callback_with_multiple_plugins(self):
- callback_calls = []
-
- def callback(filename, i, total):
- callback_calls.append((os.path.basename(filename), i, total))
-
- plugin_dir, cleanup = setup_plugins(
- 'alpha_plugin.py', 'bravo_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- manager.get_plugins(callback=callback)
- self.assertEqual(callback_calls, [
- ('alpha_plugin.py', 0, 2),
- ('bravo_plugin.py', 1, 2),
- ])
-
- def test_condition_equality(self):
- # The first part of the conditions test looks for exactly equality
- # between the condition argument and the plugin's condition
- # attribute.
- plugin_dir, cleanup = setup_plugins(
- 'alpha_plugin.py', 'bravo_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- # Start by getting all the plugins.
- all_plugins = manager.get_plugins()
- # Set some conditions on the plugins.
- all_plugins[0].condition = 'alpha'
- all_plugins[1].condition = 'bravo'
- self.assertEqual(manager.get_plugins(condition='zero'), [])
- self.assertEqual(manager.get_plugins(condition='alpha'),
- [all_plugins[0]])
- self.assertEqual(manager.get_plugins(condition='bravo'),
- [all_plugins[1]])
-
- def test_condition_in(self):
- # The second part of the conditions test checks for the given
- # condition being in the sequence of conditions in the plugin. This
- # is kind of crappy because let's say a plugin's condition is
- # 'happy_days' and you pass in condition='happy', you'll get a match.
- # Oh well, it's been this way forever.
- plugin_dir, cleanup = setup_plugins(
- 'alpha_plugin.py', 'bravo_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- # Start by getting all the plugins.
- all_plugins = manager.get_plugins()
- # Set some conditions on the plugins.
- all_plugins[0].condition = ['alpha', 'happy']
- all_plugins[1].condition = ['bravo', 'happy', 'sad']
- self.assertEqual(manager.get_plugins(condition='zero'), [])
- self.assertEqual(manager.get_plugins(condition='alpha'),
- [all_plugins[0]])
- self.assertEqual(manager.get_plugins(condition='bravo'),
- [all_plugins[1]])
- self.assertEqual(manager.get_plugins(condition='happy'), all_plugins)
- self.assertEqual(manager.get_plugins(condition='sad'),
- [all_plugins[1]])
-
- def test_condition_wildcard(self):
- # The third conditions test matches everything.
- plugin_dir, cleanup = setup_plugins(
- 'alpha_plugin.py', 'bravo_plugin.py', 'charlie_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- # Start by getting all the plugins.
- all_plugins = manager.get_plugins()
- self.assertEqual(len(all_plugins), 3)
- # Set some conditions on the plugins.
- all_plugins[0].condition = ['alpha', 'happy']
- all_plugins[1].condition = ['bravo', 'happy', 'sad']
- # Do not give the third plugin an explicit condition.
- self.assertEqual(manager.get_plugins(condition='*'), all_plugins)
-
- def test_condition_default_matches_conditionless(self):
- # By default, only conditionless plugins match the manager default.
- plugin_dir, cleanup = setup_plugins(
- 'alpha_plugin.py', 'bravo_plugin.py', 'charlie_plugin.py')
- manager = PluginManager(self._app, [plugin_dir])
- # Start by getting all the plugins.
- all_plugins = manager.get_plugins()
- self.assertEqual(len(all_plugins), 3)
- # Set some conditions on the plugins.
- all_plugins[0].condition = ['alpha', 'happy']
- all_plugins[1].condition = ['bravo', 'happy', 'sad']
- # Do not give the third plugin an explicit condition.
- self.assertEqual(manager.get_plugins(), [all_plugins[2]])
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_missing_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_missing_package_cruft.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_missing_package_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'MissingPackageCruftTests',
-]
-
-
-import unittest
-
-from janitor.plugincore.core.missing_package_cruft import MissingPackageCruft
-from janitor.plugincore.testing.helpers import MockAptPackage
-
-
-class MissingPackageCruftTests(unittest.TestCase):
- def setUp(self):
- self.pkg = MockAptPackage()
- self.cruft = MissingPackageCruft(self.pkg)
-
- def test_prefix(self):
- self.assertEqual(self.cruft.get_prefix(), 'install-deb')
- self.assertEqual(self.cruft.prefix, 'install-deb')
-
- def test_prefix_description(self):
- self.assertTrue('Install' in self.cruft.get_prefix_description())
- self.assertTrue('Install' in self.cruft.prefix_description)
-
- def test_shortname(self):
- self.assertEqual(self.cruft.get_shortname(), 'name')
- self.assertEqual(self.cruft.shortname, 'name')
-
- def test_name(self):
- self.assertEqual(self.cruft.get_name(), 'install-deb:name')
- self.assertEqual(self.cruft.name, 'install-deb:name')
-
- def test_description(self):
- self.assertTrue('name' in self.cruft.get_description())
- self.assertTrue('name' in self.cruft.description)
-
- def test_explicit_description(self):
- pkg = MissingPackageCruft(self.pkg, 'foo')
- self.assertEqual(pkg.get_description(), 'foo')
- self.assertEqual(pkg.description, 'foo')
-
- def test_cleanup(self):
- self.cruft.cleanup()
- self.assertTrue(self.pkg.installed)
diff -Nru update-manager-17.10.11/janitor/plugincore/tests/test_package_cruft.py update-manager-0.156.14.15/janitor/plugincore/tests/test_package_cruft.py
--- update-manager-17.10.11/janitor/plugincore/tests/test_package_cruft.py 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/janitor/plugincore/tests/test_package_cruft.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-# Copyright (C) 2008-2012 Canonical, Ltd.
-# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
-#
-# 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, version 3 of the License.
-#
-# 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, see .
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'PackageCruftTests',
-]
-
-import unittest
-
-from janitor.plugincore.core.package_cruft import PackageCruft
-from janitor.plugincore.testing.helpers import MockAptPackage
-
-
-class PackageCruftTests(unittest.TestCase):
- def setUp(self):
- self.pkg = MockAptPackage()
- self.cruft = PackageCruft(self.pkg, 'description')
-
- def test_prefix(self):
- self.assertEqual(self.cruft.get_prefix(), 'deb')
- self.assertEqual(self.cruft.prefix, 'deb')
-
- def test_prefix_description(self):
- self.assertEqual(self.cruft.get_prefix_description(), '.deb package')
- self.assertEqual(self.cruft.prefix_description, '.deb package')
-
- def test_shortname(self):
- self.assertEqual(self.cruft.get_shortname(), 'name')
- self.assertEqual(self.cruft.shortname, 'name')
-
- def test_name(self):
- self.assertEqual(self.cruft.get_name(), 'deb:name')
- self.assertEqual(self.cruft.name, 'deb:name')
-
- def test_description(self):
- self.assertEqual(self.cruft.get_description(),
- 'description\n\nsummary')
- self.assertEqual(self.cruft.description, 'description\n\nsummary')
-
- def test_disk_usage(self):
- self.assertEqual(self.cruft.get_disk_usage(), 12765)
- self.assertEqual(self.cruft.disk_usage, 12765)
-
- def test_cleanup(self):
- self.cruft.cleanup()
- self.assertTrue(self.pkg.deleted)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/cruft.py
--- update-manager-17.10.11/Janitor/computerjanitor/cruft.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/cruft.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,138 @@
+# cruft.py - base class for different kinds of cruft
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+
+
+class Cruft(object):
+
+ """One piece of cruft to be cleaned out.
+
+ A piece of cruft can be a file, a package, a configuration tweak
+ that is missing, or something else.
+
+ This is a base class, which does nothing. Subclasses do the
+ actual work.
+
+ """
+
+ def get_prefix(self):
+ """Return the unique prefix used to group this type of cruft.
+
+ For example, the .deb package called 'foo' would have a prefix
+ of 'deb'. This way, the package foo is not confused with the
+ file foo, or the username foo.
+
+ Subclasses SHOULD define this. The default implementation
+ returns the name of the class, which is rarely useful to
+ the user.
+
+ """
+
+ return self.__class__.__name__
+
+ def get_prefix_description(self):
+ """Return human-readable description of class of cruft."""
+ return self.get_description()
+
+ def get_shortname(self):
+ """Return the name of this piece of cruft.
+
+ The name should be something that the user will understand.
+ For example, it might be the name of a package, or the full
+ path to a file.
+
+ The name should be unique within the unique prefix returned
+ by get_prefix. The prefix MUST NOT be included by this method,
+ the get_name() method does that instead. The intent is that
+ get_shortname() will be used by the user interface in contexts
+ where the prefix is shown separately from the short name,
+ and get_name() when a single string is used.
+
+ Subclasses MUST define this. The default implementation
+ raises an exception.
+
+ """
+
+ raise computerjanitor.UnimplementedMethod(self.get_shortname)
+
+ def get_name(self):
+ """Return prefix plus name.
+
+ See get_prefix() and get_shortname() for a discussion of
+ the prefix and the short name. This method will return
+ the prefix, a colon, and the short name.
+
+ The long name will used to store state/configuration data:
+ _this_ package should not be removed.
+
+ """
+
+ return "%s:%s" % (self.get_prefix(), self.get_shortname())
+
+ def get_description(self):
+ """Return a description of this piece of cruft.
+
+ This may be arbitrarily long. The user interface will take
+ care of breaking it into lines or otherwise presenting it to
+ the user in a nice manner. The description should be plain
+ text, in UTF-8.
+
+ The default implementation returns the empty string. Subclasses
+ MAY override this as they wish.
+
+ """
+
+ return ""
+
+ def get_disk_usage(self):
+ """Return amount of disk space reserved by this piece of cruft.
+
+ The unit is bytes.
+
+ The disk space in question should be the amount that will be
+ freed if the cruft is cleaned up. The amount may be an estimate
+ (read: guess). It is intended to be shown to the user to help
+ them decide what to remove and what to keep.
+
+ This will also be used by the user interface to better
+ estimate how much remaining time there is when cleaning
+ up a lot of cruft.
+
+ For some types of cruft, this is not applicable and they should
+ return None. The base class implementation does that, so
+ subclasses MUST define this method if it is useful for them to
+ return something else.
+
+ The user interface will distinguish between None (not
+ applicable) and 0 (no disk space being used).
+
+ """
+
+ return None
+
+ def cleanup(self):
+ """Clean up this piece of cruft.
+
+ Depending on the type of cruft, this may mean removing files,
+ packages, modifying configuration files, or something else.
+
+ The default implementation raises an exception. Subclasses
+ MUST override this.
+
+ """
+
+ raise computerjanitor.UnimplementedMethod(self.cleanup)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/cruft_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/cruft_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/cruft_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,56 @@
+# cruft_tests.py - unit tests for cruft.py
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import unittest
+
+import computerjanitor
+
+
+class CruftTests(unittest.TestCase):
+
+ def setUp(self):
+ self.cruft = computerjanitor.Cruft()
+
+ def testReturnsClassNameAsDefaultPrefix(self):
+ class Mockup(computerjanitor.Cruft):
+ pass
+ self.assertEqual(Mockup().get_prefix(), "Mockup")
+
+ def testReturnsEmptyStringAsDefaultPrefixDescription(self):
+ self.assertEqual(self.cruft.get_prefix_description(), "")
+
+ def testReturnsDescriptionAsDefaultPrefixDescription(self):
+ self.cruft.get_description = lambda: "foo"
+ self.assertEqual(self.cruft.get_prefix_description(), "foo")
+
+ def testRaisesErrorForDefaultGetShortname(self):
+ self.assertRaises(computerjanitor.UnimplementedMethod,
+ self.cruft.get_shortname)
+
+ def testReturnsCorrectStringForFullName(self):
+ self.cruft.get_prefix = lambda *args: "foo"
+ self.cruft.get_shortname = lambda *args: "bar"
+ self.assertEqual(self.cruft.get_name(), "foo:bar")
+
+ def testReturnsEmptyStringAsDefaultDescription(self):
+ self.assertEqual(self.cruft.get_description(), "")
+
+ def testReturnsNoneForDiskUsage(self):
+ self.assertEqual(self.cruft.get_disk_usage(), None)
+
+ def testRaisesErrorForDefaultCleanup(self):
+ self.assertRaises(computerjanitor.UnimplementedMethod,
+ self.cruft.cleanup)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/exc.py update-manager-0.156.14.15/Janitor/computerjanitor/exc.py
--- update-manager-17.10.11/Janitor/computerjanitor/exc.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/exc.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,30 @@
+# exc.py - exceptions for computerjanitor
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class ComputerJanitorException(Exception):
+
+ def __str__(self):
+ return self._str
+
+
+class UnimplementedMethod(ComputerJanitorException):
+
+ def __init__(self, method):
+ self._str = _("Unimplemented method: %s") % str(method)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/exc_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/exc_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/exc_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/exc_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,34 @@
+# exc_tests.py - unit tests for exc.py
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import unittest
+
+import computerjanitor
+
+
+class ComputerJanitorExceptionTests(unittest.TestCase):
+
+ def testReturnsStrCorrectly(self):
+ e = computerjanitor.Exception()
+ e._str = "pink"
+ self.assertEqual(str(e), "pink")
+
+
+class UnimplementedMethodTests(unittest.TestCase):
+
+ def testErrorMessageContainsMethodName(self):
+ e = computerjanitor.UnimplementedMethod(self.__init__)
+ self.assert_("__init__" in str(e))
\ No newline at end of file
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/file_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft.py
--- update-manager-17.10.11/Janitor/computerjanitor/file_cruft.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,58 @@
+# file_cruft.py - implementation of file cruft
+# Copyright (C) 2008, 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import os
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class FileCruft(computerjanitor.Cruft):
+
+ """Cruft that is individual files.
+
+ This type of cruft consists of individual files that should be
+ removed. Various plugins may decide that various files are cruft;
+ they can all use objects of FileCruft type to mark such files,
+ regardless of the reason the files are considered cruft.
+
+ When FileCruft instantiated, the file is identified by a pathname.
+
+ """
+
+ def __init__(self, pathname, description):
+ self.pathname = pathname
+ st = os.stat(pathname)
+ self.disk_usage = st.st_blocks * 512
+ self.description = description
+
+ def get_prefix(self):
+ return "file"
+
+ def get_prefix_description(self):
+ return _("A file on disk")
+
+ def get_shortname(self):
+ return self.pathname
+
+ def get_description(self):
+ return "%s\n" % self.description
+
+ def get_disk_usage(self):
+ return self.disk_usage
+
+ def cleanup(self):
+ os.remove(self.pathname)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/file_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/file_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/file_cruft_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,63 @@
+# file_cruft_tests.py - unit tests for file_cruft.py
+# Copyright (C) 2008, 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import os
+import subprocess
+import tempfile
+
+import unittest
+
+import computerjanitor
+
+
+class FileCruftTests(unittest.TestCase):
+
+ def setUp(self):
+ fd, self.pathname = tempfile.mkstemp()
+ os.write(fd, "x" * 1024)
+ os.close(fd)
+ self.cruft = computerjanitor.FileCruft(self.pathname, "description")
+
+ def tearDown(self):
+ if False and os.path.exists(self.pathname):
+ os.remove(self.pathname)
+
+ def testReturnsCorrectPrefix(self):
+ self.assertEqual(self.cruft.get_prefix(), "file")
+
+ def testReturnsCorrectPrefixDescription(self):
+ self.assertEqual(self.cruft.get_prefix_description(), "A file on disk")
+
+ def testReturnsCorrectShortname(self):
+ self.assertEqual(self.cruft.get_shortname(), self.pathname)
+
+ def testReturnsCorrectName(self):
+ self.assertEqual(self.cruft.get_name(), "file:%s" % self.pathname)
+
+ def testReturnsCorrectDescription(self):
+ self.assertEqual(self.cruft.get_description(), "description\n")
+
+ def testReturnsCorrectDiskUsage(self):
+ p = subprocess.Popen(["du", "-s", "-B", "1", self.pathname],
+ stdout=subprocess.PIPE)
+ stdout, stderr = p.communicate()
+ du = int(stdout.splitlines()[0].split("\t")[0])
+ self.assertEqual(self.cruft.get_disk_usage(), du)
+
+ def testDeletesPackage(self):
+ self.assert_(os.path.exists(self.pathname))
+ self.cruft.cleanup()
+ self.assertFalse(os.path.exists(self.pathname))
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/__init__.py update-manager-0.156.14.15/Janitor/computerjanitor/__init__.py
--- update-manager-17.10.11/Janitor/computerjanitor/__init__.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/__init__.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,60 @@
+# __init__.py for computerjanitor
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+VERSION = "1.11"
+
+
+# Set up gettext. This needs to be before the import statements below
+# so that if any modules call it right after importing, they find
+# setup_gettext.
+
+def setup_gettext():
+ """Set up gettext for a module.
+
+ Return a method to be used for looking up translations. Usage:
+
+ import computerjanitor
+ _ = computerjanitor.setup_gettext()
+
+ """
+
+ import gettext
+ import os
+
+ domain = 'update-manager'
+ localedir = os.environ.get('LOCPATH', None)
+ t = gettext.translation(domain, localedir=localedir, fallback=True)
+ return t.ugettext
+
+
+from cruft import Cruft
+from file_cruft import FileCruft
+from package_cruft import PackageCruft
+from missing_package_cruft import MissingPackageCruft
+from exc import ComputerJanitorException as Exception, UnimplementedMethod
+from plugin import Plugin, PluginManager
+
+# reference it here to make pyflakes happy
+Cruft
+FileCruft
+PackageCruft
+Exception
+UnimplementedMethod
+MissingPackageCruft
+Plugin
+PluginManager
+
+
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft.py
--- update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,45 @@
+# missing_package_cruft.py - install a missing package
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class MissingPackageCruft(computerjanitor.Cruft):
+
+ """Install a missing package."""
+
+ def __init__(self, package, description=None):
+ self.package = package
+ self.description = description
+
+ def get_prefix(self):
+ return "install-deb"
+
+ def get_prefix_description(self):
+ return _("Install missing package.")
+
+ def get_shortname(self):
+ return self.package.name
+
+ def get_description(self):
+ if self.description:
+ return self.description
+ else:
+ return _("Package %s should be installed.") % self.package.name
+
+ def cleanup(self):
+ self.package.markInstall()
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/missing_package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/missing_package_cruft_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,61 @@
+# missing_package_cruft_tests.py - unit tests for missing_package_cruft.py
+# Copyright (C) 2008, 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import unittest
+
+import computerjanitor
+
+
+class MockAptPackage(object):
+
+ def __init__(self):
+ self.name = "name"
+ self.summary = "summary"
+ self.installedSize = 12765
+ self.installed = False
+
+ def markInstall(self):
+ self.installed = True
+
+
+class MissingPackageCruftTests(unittest.TestCase):
+
+ def setUp(self):
+ self.pkg = MockAptPackage()
+ self.cruft = computerjanitor.MissingPackageCruft(self.pkg)
+
+ def testReturnsCorrectPrefix(self):
+ self.assertEqual(self.cruft.get_prefix(), "install-deb")
+
+ def testReturnsCorrectPrefixDescription(self):
+ self.assert_("Install" in self.cruft.get_prefix_description())
+
+ def testReturnsCorrectShortname(self):
+ self.assertEqual(self.cruft.get_shortname(), "name")
+
+ def testReturnsCorrectName(self):
+ self.assertEqual(self.cruft.get_name(), "install-deb:name")
+
+ def testReturnsCorrectDescription(self):
+ self.assert_("name" in self.cruft.get_description())
+
+ def testSetsDescriptionWhenAsked(self):
+ pkg = computerjanitor.MissingPackageCruft(self.pkg, "foo")
+ self.assertEqual(pkg.get_description(), "foo")
+
+ def testInstallsPackage(self):
+ self.cruft.cleanup()
+ self.assert_(self.pkg.installed)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/package_cruft.py update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft.py
--- update-manager-17.10.11/Janitor/computerjanitor/package_cruft.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,57 @@
+# package_cruft.py - implementation for the package craft
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class PackageCruft(computerjanitor.Cruft):
+
+ """Cruft that is .deb packages.
+
+ This type of cruft consists of .deb packages installed onto the
+ system which can be removed. Various plugins may decide that
+ various packages are cruft; they can all use objects of PackageCruft
+ type to mark such packages, regardless of the reason the packages
+ are considered cruft.
+
+ When PackageCruft instantiated, the package is identified by an
+ apt.Package object. That object is used for all the real operations,
+ so this class is merely a thin wrapper around it.
+
+ """
+
+ def __init__(self, pkg, description):
+ self._pkg = pkg
+ self._description = description
+
+ def get_prefix(self):
+ return "deb"
+
+ def get_prefix_description(self):
+ return _(".deb package")
+
+ def get_shortname(self):
+ return self._pkg.name
+
+ def get_description(self):
+ return u"%s\n\n%s" % (self._description, self._pkg.summary)
+
+ def get_disk_usage(self):
+ return self._pkg.installedSize
+
+ def cleanup(self):
+ self._pkg.markDelete()
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/package_cruft_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/package_cruft_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/package_cruft_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,61 @@
+# package_cruft_tests.py - unit tests for package_cruft.py
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import unittest
+
+import computerjanitor
+
+
+class MockAptPackage(object):
+
+ def __init__(self):
+ self.name = "name"
+ self.summary = "summary"
+ self.installedSize = 12765
+ self.deleted = False
+
+ def markDelete(self):
+ self.deleted = True
+
+
+class PackageCruftTests(unittest.TestCase):
+
+ def setUp(self):
+ self.pkg = MockAptPackage()
+ self.cruft = computerjanitor.PackageCruft(self.pkg, "description")
+
+ def testReturnsCorrectPrefix(self):
+ self.assertEqual(self.cruft.get_prefix(), "deb")
+
+ def testReturnsCorrectPrefixDescription(self):
+ self.assertEqual(self.cruft.get_prefix_description(), ".deb package")
+
+ def testReturnsCorrectShortname(self):
+ self.assertEqual(self.cruft.get_shortname(), "name")
+
+ def testReturnsCorrectName(self):
+ self.assertEqual(self.cruft.get_name(), "deb:name")
+
+ def testReturnsCorrectDescription(self):
+ self.assertEqual(self.cruft.get_description(),
+ "description\n\nsummary")
+
+ def testReturnsCorrectDiskUsage(self):
+ self.assertEqual(self.cruft.get_disk_usage(), 12765)
+
+ def testDeletesPackage(self):
+ self.cruft.cleanup()
+ self.assert_(self.pkg.deleted)
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/plugin.py update-manager-0.156.14.15/Janitor/computerjanitor/plugin.py
--- update-manager-17.10.11/Janitor/computerjanitor/plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,184 @@
+# plugin.py - plugin base class for computerjanitor
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import imp
+import inspect
+import logging
+import os
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+class Plugin(object):
+
+ """Base class for plugins.
+
+ These plugins only do one thing: identify cruft. See the 'get_cruft'
+ method for details.
+
+ """
+
+ def get_condition(self):
+ if hasattr(self, "_condition"):
+ return self._condition
+ else:
+ return []
+
+ def set_condition(self, condition):
+ self._condition = condition
+
+ condition = property(get_condition, set_condition)
+
+ def set_application(self, app):
+ """Set the Application instance this plugin belongs to.
+
+ This is used by the plugin manager when creating the plugin
+ instance. In a perfect world, this would be done via the
+ __init__ method, but since I took a wrong left turn, I ended
+ up in an imperfect world, and therefore giving the Application
+ instance to __init__ would mandate that all sub-classes would
+ have to deal with that explicitly. That is a lot of unnecessary
+ make-work, which we should avoid. Therefore, we do it via this
+ method.
+
+ The class may access the Application instance via the
+ 'app' attribute.
+
+ """
+
+ self.app = app
+
+ def do_cleanup_cruft(self): # pragma: no cover
+ """Find cruft and clean it up.
+
+ This is a helper method.
+ """
+
+ for cruft in self.get_cruft():
+ cruft.cleanup()
+ self.post_cleanup()
+
+ def get_cruft(self):
+ """Find some cruft in the system.
+
+ This method MUST return an iterator (see 'yield' statement).
+ This interface design allows cruft to be collected piecemeal,
+ which makes it easier to show progress in the user interface.
+
+ The base class default implementation of this raises an
+ exception. Subclasses MUST override this method.
+
+ """
+
+ raise computerjanitor.UnimplementedMethod(self.get_cruft)
+
+ def post_cleanup(self):
+ """Does plugin wide cleanup after the individual cleanup
+ was performed.
+
+ This is useful for stuff that needs to be proccessed
+ in batches (e.g. for performance reasons) like package
+ removal.
+ """
+ pass
+
+
+class PluginManager(object):
+
+ """Class to find and load plugins.
+
+ Plugins are stored in files named '*_plugin.py' in the list of
+ directories given to the initializer.
+
+ """
+
+ def __init__(self, app, plugin_dirs):
+ self._app = app
+ self._plugin_dirs = plugin_dirs
+ self._plugins = None
+
+ def get_plugin_files(self):
+ """Return all filenames in which plugins may be stored."""
+
+ names = []
+
+
+ for dirname in self._plugin_dirs:
+ if not os.path.exists(dirname):
+ continue
+ basenames = [x for x in os.listdir(dirname)
+ if x.endswith("_plugin.py")]
+ logging.debug("Plugin modules in %s: %s" %
+ (dirname, " ".join(basenames)))
+ names += [os.path.join(dirname, x) for x in basenames]
+
+ return names
+
+ def _find_plugins(self, module):
+ """Find and instantiate all plugins in a module."""
+ plugins = []
+ for dummy, member in inspect.getmembers(module):
+ if inspect.isclass(member) and issubclass(member, Plugin):
+ plugins.append(member)
+ logging.debug("Plugins in %s: %s" %
+ (module, " ".join(str(x) for x in plugins)))
+ return [plugin() for plugin in plugins]
+
+ def _load_module(self, filename):
+ """Load a module from a filename."""
+ logging.debug("Loading module %s" % filename)
+ module_name, dummy = os.path.splitext(os.path.basename(filename))
+ f = file(filename, "r")
+ try:
+ module = imp.load_module(module_name, f, filename,
+ (".py", "r", imp.PY_SOURCE))
+ except Exception, e: # pragma: no cover
+ logging.warning("Failed to load plugin '%s' (%s)" %
+ (module_name, e))
+ return None
+ f.close()
+ return module
+
+ def get_plugins(self, condition=[], callback=None):
+ """Return all plugins that have been found.
+
+ If callback is specified, it is called after each plugin has
+ been found, with the following arguments: filename, index of
+ filename in list of files to be examined (starting with 0), and
+ total number of files to be examined. The purpose of this is to
+ allow the callback to inform the user in case things take a long
+ time.
+
+ """
+
+ if self._plugins is None:
+ self._plugins = []
+ filenames = self.get_plugin_files()
+ for i in range(len(filenames)):
+ if callback:
+ callback(filenames[i], i, len(filenames))
+ module = self._load_module(filenames[i])
+ for plugin in self._find_plugins(module):
+ plugin.set_application(self._app)
+ self._plugins.append(plugin)
+ # get the matching plugins
+ plugins = [p for p in self._plugins
+ if (p.condition == condition) or
+ (condition in p.condition) or
+ (condition == "*") ]
+ logging.debug("plugins for condition '%s' are '%s'" %
+ (condition, plugins))
+ return plugins
diff -Nru update-manager-17.10.11/Janitor/computerjanitor/plugin_tests.py update-manager-0.156.14.15/Janitor/computerjanitor/plugin_tests.py
--- update-manager-17.10.11/Janitor/computerjanitor/plugin_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/computerjanitor/plugin_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,112 @@
+# plugin_tests.py - unit tests for plugin.py
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import os
+import tempfile
+import unittest
+
+import computerjanitor
+
+
+class PluginTests(unittest.TestCase):
+
+ def testGetCruftRaisesException(self):
+ p = computerjanitor.Plugin()
+ self.assertRaises(computerjanitor.UnimplementedMethod, p.get_cruft)
+
+ def testPostCleanupReturnsNone(self):
+ p = computerjanitor.Plugin()
+ self.assertEqual(p.post_cleanup(), None)
+
+ def testDoesNotHaveAppAttributeByDefault(self):
+ p = computerjanitor.Plugin()
+ self.assertFalse(hasattr(p, "app"))
+
+ def testSetApplicationSetsApp(self):
+ p = computerjanitor.Plugin()
+ p.set_application("foo")
+ self.assertEqual(p.app, "foo")
+
+ def testSetsRequiredConditionToNoneByDefault(self):
+ p = computerjanitor.Plugin()
+ self.assertEqual(p.condition, [])
+
+
+class PluginManagerTests(unittest.TestCase):
+
+ def testFindsNoPluginsInEmptyDirectory(self):
+ tempdir = tempfile.mkdtemp()
+ pm = computerjanitor.PluginManager(None, [tempdir])
+ plugins = pm.get_plugins()
+ os.rmdir(tempdir)
+ self.assertEqual(plugins, [])
+
+ def testFindsOnePluginFileInTestPluginDirectory(self):
+ pm = computerjanitor.PluginManager(None, ["testplugins"])
+ self.assertEqual(pm.get_plugin_files(),
+ ["testplugins/hello_plugin.py"])
+
+ def testFindsOnePluginInTestPluginDirectory(self):
+ pm = computerjanitor.PluginManager(None, ["testplugins"])
+ self.assertEqual(len(pm.get_plugins()), 1)
+
+ def testFindPluginsSetsApplicationInPluginsFound(self):
+ pm = computerjanitor.PluginManager("foo", ["testplugins"])
+ self.assertEqual(pm.get_plugins()[0].app, "foo")
+
+ def callback(self, filename, index, count):
+ self.callback_called = True
+
+ def testCallsCallbackWhenFindingPlugins(self):
+ pm = computerjanitor.PluginManager(None, ["testplugins"])
+ self.callback_called = False
+ pm.get_plugins(callback=self.callback)
+ self.assert_(self.callback_called)
+
+
+class ConditionTests(unittest.TestCase):
+
+ def setUp(self):
+ self.pm = computerjanitor.PluginManager(None, ["testplugins"])
+
+ class White(computerjanitor.Plugin):
+ pass
+
+ class Red(computerjanitor.Plugin):
+ def __init__(self):
+ self.condition = ["red"]
+
+ class RedBlack(computerjanitor.Plugin):
+ def __init__(self):
+ self.condition = ["red","black"]
+
+ self.white = White()
+ self.red = Red()
+ self.redblack = RedBlack()
+ self.pm._plugins = [self.white, self.red, self.redblack]
+
+ def testReturnsOnlyConditionlessPluginByDefault(self):
+ self.assertEqual(self.pm.get_plugins(), [self.white])
+
+ def testReturnsOnlyRedPluginWhenConditionIsRed(self):
+ self.assertEqual(self.pm.get_plugins(condition="red"), [self.red, self.redblack])
+
+ def testReturnsOnlyRedPluginWhenConditionIsRedAndBlack(self):
+ self.assertEqual(self.pm.get_plugins(condition=["red","black"]), [self.redblack])
+
+ def testReturnsEallPluginsWhenRequested(self):
+ self.assertEqual(set(self.pm.get_plugins(condition="*")),
+ set([self.white, self.red, self.redblack]))
diff -Nru update-manager-17.10.11/Janitor/find-conffiles-dirs update-manager-0.156.14.15/Janitor/find-conffiles-dirs
--- update-manager-17.10.11/Janitor/find-conffiles-dirs 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/find-conffiles-dirs 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+temp=$(mktemp -d)
+
+find "$@" -type f -name '*.deb' |
+while read deb
+do
+ rm -rf "$temp/DEBIAN"
+ dpkg-deb -e "$deb" "$temp/DEBIAN"
+ if [ -e "$temp/DEBIAN/conffiles" ]
+ then
+ cat "$temp/DEBIAN/conffiles"
+ fi
+done |
+xargs -n1 dirname |
+sort -u |
+python -c '
+# remove /some/path from input if its parent exists in input too
+# assume sorted input
+import sys
+dirs = set()
+for line in sys.stdin:
+ line = line.rstrip("\n")
+ for dir in dirs:
+ if line.startswith(dir + "/"):
+ break
+ else:
+ dirs.add(line)
+for dir in sorted(dirs):
+ print dir
+'
+
+
+
+rm -rf "$temp"
diff -Nru update-manager-17.10.11/Janitor/Makefile update-manager-0.156.14.15/Janitor/Makefile
--- update-manager-17.10.11/Janitor/Makefile 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/Makefile 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,43 @@
+# Makefile for Computer Janitor
+# Copyright (C) 2008, 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+all:
+
+check: check-unittests check-has-unit-tests
+
+check-unittests:
+ env COMPUTER_JANITOR_UNITTEST=yes LC_ALL=C python -m CoverageTestRunner
+ rm -f .coverage
+
+check-has-unit-tests:
+ find computerjanitor plugins -name '*.py' ! -name '*_tests.py' | \
+ grep -Exv '^computerjanitor/(__init__|ui_gtk).py' | \
+ grep -Exv '^plugins/(remove_lilo|check_admin_group)_plugin.py' | \
+ grep -Exv '^plugins/(add_nfs_common)_plugin.py' | \
+ grep -Exv '^plugins/(kdelibs4to5|langpack_manual)_plugin.py' | \
+ grep -Exv '^plugins/(add_nfs_common)_plugin.py' | \
+ sed 's/\.py$$//' | \
+ while read file; do \
+ [ -e $${file}_tests.py ] || \
+ (echo "Missing unit test: $$file.py"; exit 1); done
+
+clean:
+ rm -f computerjanitor/*.py[co] testplugins/*.py[co] .coverage
+ rm -rf build $(DESKTOP)
+
+update-po:
+ (echo '[encoding: UTF-8]'; \
+ ls computerjanitor/*.py plugins/*.py) > po/POTFILES.in
+ python setup.py build_i18n --merge-po --po-dir po
diff -Nru update-manager-17.10.11/Janitor/plugins/deb_plugin.py update-manager-0.156.14.15/Janitor/plugins/deb_plugin.py
--- update-manager-17.10.11/Janitor/plugins/deb_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/deb_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,41 @@
+# deb_plugin.py - common package for post_cleanup for apt/.deb packages
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+import apt
+
+
+class DebPlugin(computerjanitor.Plugin):
+
+ """Plugin for post_cleanup processing with apt.
+
+ This plugin does not find any cruft of its own. Instead it
+ centralizes the post_cleanup handling for all packages that remove
+ .deb packages.
+
+ """
+
+ def get_cruft(self):
+ return []
+
+ def post_cleanup(self):
+ try:
+ self.app.apt_cache.commit(apt.progress.text.AcquireProgress(),
+ apt.progress.base.InstallProgress())
+ except Exception: # pragma: no cover
+ raise
+ finally:
+ self.app.refresh_apt_cache()
diff -Nru update-manager-17.10.11/Janitor/plugins/deb_plugin_tests.py update-manager-0.156.14.15/Janitor/plugins/deb_plugin_tests.py
--- update-manager-17.10.11/Janitor/plugins/deb_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/deb_plugin_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,52 @@
+# deb_plugin_tests.py - unittests for deb_plugin.py
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import unittest
+
+import deb_plugin
+
+
+class MockApplication(object):
+
+ def __init__(self):
+ self.commit_called = False
+ self.refresh_called = False
+ self.apt_cache = self
+
+ def commit(self, foo, bar):
+ self.commit_called = True
+
+ def refresh_apt_cache(self):
+ self.refresh_called = True
+
+
+class DebPluginTests(unittest.TestCase):
+
+ def setUp(self):
+ self.plugin = deb_plugin.DebPlugin()
+ self.app = MockApplication()
+ self.plugin.set_application(self.app)
+
+ def testReturnsEmptyListOfCruft(self):
+ self.assertEqual(self.plugin.get_cruft(), [])
+
+ def testPostCleanupCallsCommit(self):
+ self.plugin.post_cleanup()
+ self.assert_(self.app.commit_called)
+
+ def testPostCleanupCallsRefresh(self):
+ self.plugin.post_cleanup()
+ self.assert_(self.app.refresh_called)
diff -Nru update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin.py update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin.py
--- update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,66 @@
+# dpkg_status.py - compact the dpkg status file
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+from apt_pkg import TagFile
+import subprocess
+import logging
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class DpkgStatusCruft(computerjanitor.Cruft):
+
+ def __init__(self, n_items):
+ self.n_items = n_items
+
+ def get_prefix(self):
+ return "dpkg-status"
+
+ def get_prefix_description(self): # pragma: no cover
+ return _("%i obsolete entries in the status file") % self.n_items
+
+ def get_shortname(self):
+ return _("Obsolete entries in dpkg status")
+
+ def get_description(self): # pragma: no cover
+ return _("Obsolete dpkg status entries")
+
+ def cleanup(self): # pragma: no cover
+ logging.debug("calling dpkg --forget-old-unavail")
+ res = subprocess.call(["dpkg","--forget-old-unavail"])
+ logging.debug("dpkg --forget-old-unavail returned %s" % res)
+
+class DpkgStatusPlugin(computerjanitor.Plugin):
+
+ def __init__(self, fname="/var/lib/dpkg/status"):
+ self.status = fname
+ self.condition = ["PostCleanup"]
+
+ def get_cruft(self):
+ n_cruft = 0
+ tagf = TagFile(open(self.status))
+ while tagf.step():
+ statusline = tagf.section.get("Status")
+ (want, flag, status) = statusline.split()
+ if want == "purge" and flag == "ok" and status == "not-installed":
+ n_cruft += 1
+ logging.debug("DpkgStatusPlugin found %s cruft items" % n_cruft)
+ if n_cruft:
+ return [DpkgStatusCruft(n_cruft)]
+ return [] # pragma: no cover
diff -Nru update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin_tests.py update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin_tests.py
--- update-manager-17.10.11/Janitor/plugins/dpkg_status_plugin_tests.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/dpkg_status_plugin_tests.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,39 @@
+# dpkg_status.py - compact the dpkg status file
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import os
+import tempfile
+import unittest
+
+import dpkg_status_plugin
+
+
+class AutoRemovalPluginTests(unittest.TestCase):
+
+ def setUp(self):
+ fd, self.fname = tempfile.mkstemp()
+ os.write(fd, "Status: purge ok not-installed\n")
+ os.close(fd)
+ self.plugin = dpkg_status_plugin.DpkgStatusPlugin(self.fname)
+
+ def tearDown(self):
+ os.remove(self.fname)
+
+ def testDpkgStatus(self):
+ names = [cruft.get_name() for cruft in self.plugin.get_cruft()]
+ self.assertEqual(sorted(names), sorted([u"dpkg-status:Obsolete entries in dpkg status"]))
diff -Nru update-manager-17.10.11/Janitor/plugins/kdelibs4to5_plugin.py update-manager-0.156.14.15/Janitor/plugins/kdelibs4to5_plugin.py
--- update-manager-17.10.11/Janitor/plugins/kdelibs4to5_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/kdelibs4to5_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,41 @@
+# kdelibs4to5_plugin.py - install kdelibs5-dev if kdeblibs4-dev is installed
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class Kdelibs4devToKdelibs5devPlugin(computerjanitor.Plugin):
+
+ """Plugin to install kdelibs5-dev if kdelibs4-dev is installed.
+
+ See also LP: #279621.
+
+ """
+
+ def __init__(self):
+ self.condition = ["from_hardyPostDistUpgradeCache"]
+
+ def get_cruft(self):
+ fromp = "kdelibs4-dev"
+ top = "kdelibs5-dev"
+ cache = self.app.apt_cache
+ if (fromp in cache and cache[fromp].is_installed and
+ top in cache and not cache[top].is_installed):
+ yield computerjanitor.MissingPackageCruft(cache[top],
+ _("When upgrading, if kdelibs4-dev is installed, "
+ "kdelibs5-dev needs to be installed. See "
+ "bugs.launchpad.net, bug #279621 for details."))
diff -Nru update-manager-17.10.11/Janitor/plugins/langpack_manual_plugin.py update-manager-0.156.14.15/Janitor/plugins/langpack_manual_plugin.py
--- update-manager-17.10.11/Janitor/plugins/langpack_manual_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/langpack_manual_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,65 @@
+# langpack_manual_plugin.py - mark langpacks to be manually installed
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+import logging
+
+class ManualInstallCruft(computerjanitor.Cruft):
+
+ def __init__(self, pkg):
+ self.pkg = pkg
+
+ def get_prefix(self):
+ return "mark-manually-installed"
+
+ def get_shortname(self):
+ return self.pkg.name
+
+ def get_description(self):
+ return (_("%s needs to be marked as manually installed.") %
+ self.pkg.name)
+
+ def cleanup(self):
+ self.pkg.markKeep()
+ self.pkg.markInstall()
+
+
+class MarkLangpacksManuallyInstalledPlugin(computerjanitor.Plugin):
+
+ """Plugin to mark language packs as manually installed.
+
+ This works around quirks in the hardy->intrepid upgrade.
+
+ """
+
+ def __init__(self):
+ self.condition = ["from_hardyPostDistUpgradeCache"]
+
+ def get_cruft(self):
+ # language-support-* changed its dependencies from "recommends"
+ # to "suggests" for language-pack-* - this means that apt will
+ # think they are now auto-removalable if they got installed
+ # as a dep of language-support-* - we fix this here
+ cache = self.app.apt_cache
+ for pkg in cache:
+ if (pkg.name.startswith("language-pack-") and
+ not pkg.name.endswith("-base") and
+ cache._depcache.IsAutoInstalled(pkg._pkg) and
+ pkg.is_installed):
+ logging.debug("setting '%s' to manual installed" % pkg.name)
+ yield ManualInstallCruft(pkg)
diff -Nru update-manager-17.10.11/Janitor/plugins/remove_lilo_plugin.py update-manager-0.156.14.15/Janitor/plugins/remove_lilo_plugin.py
--- update-manager-17.10.11/Janitor/plugins/remove_lilo_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/plugins/remove_lilo_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,43 @@
+# remove_lilo_plugin.py - remove lilo if grub is also installed
+# Copyright (C) 2009 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import os
+
+import logging
+import computerjanitor
+_ = computerjanitor.setup_gettext()
+
+
+class RemoveLiloPlugin(computerjanitor.Plugin):
+
+ """Plugin to remove lilo if grub is also installed."""
+
+ description = _("Remove lilo since grub is also installed."
+ "(See bug #314004 for details.)")
+
+ def __init__(self):
+ self.condition = ["jauntyPostDistUpgradeCache"]
+
+ def get_cruft(self):
+ if "lilo" in self.app.apt_cache and "grub" in self.app.apt_cache:
+ lilo = self.app.apt_cache["lilo"]
+ grub = self.app.apt_cache["grub"]
+ if lilo.is_installed and grub.is_installed:
+ if not os.path.exists("/etc/lilo.conf"):
+ yield computerjanitor.PackageCruft(lilo, self.description)
+ else:
+ logging.warning("lilo and grub installed, but "
+ "lilo.conf exists")
diff -Nru update-manager-17.10.11/Janitor/README update-manager-0.156.14.15/Janitor/README
--- update-manager-17.10.11/Janitor/README 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/README 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,37 @@
+README for Computer Janitor Core
+================================
+
+
+Computer Janitor is a tool to clean up a system so that it is more like
+a freshly installed one. It was written for Ubuntu, but should be
+possible to port to other Unix-like operating systems.
+
+This is the core of the program: the plugin manager, and (some of) the
+plugins. The user interface and some other things are in a separate
+source tree. This is because Ubuntu's and Debian's Update Manager
+program will be using Computer Janitor. Since Update Manager is used
+also to upgrade from operating system release to release, it needs to
+keep its external dependencies to a minimum. Thus, the core of Computer
+Janitor is incorporated into Update Manager, and the upper layers will
+remain as a separate package.
+
+
+Copyright license
+-----------------
+
+Computer Janitor - clean up a computer system
+Copyright (C) 2008, 2009 Canonical, Ltd.
+
+The following license applies to all files (including the icons):
+
+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, version 3 of the License.
+
+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, see .
diff -Nru update-manager-17.10.11/Janitor/testplugins/hello_plugin.py update-manager-0.156.14.15/Janitor/testplugins/hello_plugin.py
--- update-manager-17.10.11/Janitor/testplugins/hello_plugin.py 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/Janitor/testplugins/hello_plugin.py 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,33 @@
+# hello_plugin.py - a test plugin for Computer Janitor
+# Copyright (C) 2008 Canonical, Ltd.
+#
+# 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, version 3 of the License.
+#
+# 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, see .
+
+
+import logging
+
+import computerjanitor
+
+
+class HelloPlugin(computerjanitor.Plugin):
+
+ def get_cruft(self):
+ cache = self.app.apt_cache
+ if cache.has_key("hello"):
+ pkg = cache["hello"]
+ if pkg.is_installed:
+ yield computerjanitor.PackageCruft(cache["hello"],
+ "We don't like hello.")
+
+ def post_cleanup(self):
+ logging.info("Post-cleanup for HelloPlugin called")
diff -Nru update-manager-17.10.11/kubuntu-devel-release-upgrade update-manager-0.156.14.15/kubuntu-devel-release-upgrade
--- update-manager-17.10.11/kubuntu-devel-release-upgrade 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.14.15/kubuntu-devel-release-upgrade 2017-12-23 05:00:37.000000000 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+kdesudo "do-release-upgrade -m desktop -f kde -d"
Binary files /tmp/tmpWx1Pxp/6nuZtWfMmp/update-manager-17.10.11/.noseids and /tmp/tmpWx1Pxp/NC2tFRRc7A/update-manager-0.156.14.15/.noseids differ
diff -Nru update-manager-17.10.11/po/af.po update-manager-0.156.14.15/po/af.po
--- update-manager-17.10.11/po/af.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/af.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2007.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-02-23 19:53+0000\n"
"Last-Translator: hawk \n"
"Language-Team: Afrikaans \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "Bediener vir %s"
@@ -42,20 +43,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Hoofbediener"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Gebruikersspesifieke bedieners"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "Kon nie sources.list inskrywing bereken nie"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -63,11 +64,11 @@
"Kon nie enige pakkette opspoor nie. Hierdie is dalk nie 'n Ubuntu Skyf nie "
"of van die verkeerde argitektuur?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "Misluk om die CD toe te voeg"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -82,13 +83,13 @@
"Die foutboodskap was:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Verwyder pakket in swak toestand"
msgstr[1] "Verwyder pakette in swak toestand"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -109,15 +110,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "Die bediener is dalk oorlaai"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Gebroke pakette"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -127,7 +128,7 @@
"maak voordat u voort gaan."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -149,28 +150,28 @@
"*Nie-amptelike sagtewarepakkette, nie deur Ubuntu gelewer nie\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Hierdie is heel waarskynlik 'n tydelike probleem, probeer asseblief later "
"weer."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "Kon nie die opgradering bereken nie"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "Fout by bepaling van die egtheid van sommige pakkette"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -180,7 +181,7 @@
"tydelike netwerkprobleem. Probeer later weer. Sien hieronder vir 'n lys van "
"ongestaafde pakkette."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -188,33 +189,33 @@
"Die pakket '%s' is gemerk vir verwydering, maar dit is op die verwyderings-"
"swartlys."
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Die noodsaaklike pakket '%s' is gemerk vir verwydering."
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Probeer tans om die swartlys weergawe '%s' te installeer."
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "Kan nie '%s' installeer nie."
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "Kan nie 'n meta-paket raai nie"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -226,15 +227,15 @@
"edubuntu-desktop paket nie en dit was nie moontlik om jou weergawe van "
"Ubuntu te bepaal nie."
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Lees geheuekas"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "Kan nie 'n eksklusiewe slot bekom nie"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -242,11 +243,11 @@
"Hierdie beteken gewoonlik dat 'n ander pakketbestuurder (soos apt-get of "
"aptitude) alreeds loop. Maak asseblief eers daardie program toe."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Opgradering oor 'n afstandsverbinding word nie ondersteun nie"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -260,11 +261,11 @@
"\n"
"Die opgradering gaan nou staak. Probeer asseblief weer sonder ssh."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "Voortgaan met die uitvoer van SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -282,11 +283,11 @@
"'%s' begin word.\n"
"Wil u voortgaan?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Begin bykomende sshd"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -297,7 +298,7 @@
"sshd op poort '%s' begin word. Indien iets sou verkeerd loop, kan u steeds "
"deur middel van hierdie bykomende sshd konnekteer.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -306,30 +307,30 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Kan nie opgradeer nie"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr ""
"Opgradering van '%s' na '%s' is nie met hierdie nutsprogram moontlik nie."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Sandpit opstelling het misluk"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "Dit was nie moontlik om 'n sandpit omgewing te skep nie."
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Sandpit-modus"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -339,18 +340,18 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"U python installasie is korrup. Maak asseblief die '/usr/bin/python' "
"simboliese skakel reg."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "Pakket 'debsig-verify' is geÏnstalleer"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -360,12 +361,12 @@
"Verwyder asseblief eers die pakket met synaptic of `apt-get remove debsig-"
"verify' en begin dan weer die opgradering."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -373,11 +374,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "Moet die nuutste opdaterings vanaf die Internet ingesluit word?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -398,16 +399,16 @@
"installeer.\n"
"Indien u hier 'nee' kies' sal die netwerk glad nie gebruik word nie."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "versper op opgradering na %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "Geldige spieëlbediener nie gevind nie"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -420,11 +421,11 @@
msgstr ""
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -433,21 +434,21 @@
"will cancel."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "Stoorplek inligting ongeldig"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "Derde-party bronne versper"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -457,13 +458,13 @@
"die opgradering herstel deur gebruik te maak van die 'software-properties' "
"nutsprogram of u pakket bestuurder."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "Pakket in inkonsekwente toestand"
msgstr[1] "Pakkette in inkonsekwente toestand"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -476,11 +477,11 @@
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "Fout gedurende opdatering"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -489,13 +490,13 @@
"van 'n probleem met die netwerkverbing. Kontrolleer asseblief u "
"netwerkverbinding en probeer weer."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "Onvoldoende skyfspasie beskikaar"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -506,32 +507,32 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "Bereken die veranderinge"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "Begin met opgradering?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "Opgradering gekanselleer"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "Kon nie die opgraderings aflaai nie"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -539,33 +540,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "Oorspronklike stelseltoestand word herstel"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "Kon nie die opgraderings installeer nie"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -576,26 +577,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "Verouderde pakkette verwyder?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Behou"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "Sk_rap"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -605,37 +606,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "Kontrolleer pakketbestuurder"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "Misluk om die opgradering voor te berei"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -643,79 +644,79 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "Stoorplek inligting word opgedateer"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "Ongeldige pakketinligting"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "Haal tans"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "Besig om op te gradeer"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "Opgradering voltooi"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "Soek na verouderde sagteware"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "Sisteem-opgradering voltooi."
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "Die gedeeltelike opgradering is voltooi."
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms in gebruik"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
"again when this is done."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -723,16 +724,16 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -741,7 +742,7 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -750,11 +751,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -762,11 +763,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "Geen ARMv6 verwerker"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -774,11 +775,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -788,72 +789,72 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "Sandpit-opgradering deur gebruik van aufs"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
"Gebruik die gegewe aanwysing om 'n CD-ROM te soek met opdaterende pakette"
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
msgstr "Gebruik koppelvlak. Tans beskikbaar."
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr "Voer slegs 'n gedeeltelike opgradering uit (sources.list nie herskryf)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "Stel datadir"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Plaas asseblief '%s' in dryf '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "Haal lêer %li van %li teen %sB/s"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "Haal lêer %li van %li"
@@ -863,27 +864,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "Pas veranderings toe"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "Kon nie '%s' installeer nie"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -895,7 +896,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -904,7 +905,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -912,20 +913,20 @@
"U sal enige veranderinge wat u aan hierdie instellingslêer gemaak het "
"verloor indien u kies om dit met 'n nuwer weergawe te vervang."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "Die 'diff' bevel is nie gevind nie"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "'n Fatale fout het voorgekom"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -933,148 +934,148 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "Ctrl-c gedruk"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
msgstr ""
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
"Om dataverlies te voorkom, sluit asseblief alle toepassings en dokumente."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr ""
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "Media verwisseling"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "Toon verskil >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< Versteek verskil"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "Fout"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "&Kanselleer"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "&Sluit"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "Inligting"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "Besonderhede"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "Verwyder %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "Verwyder (is outomaties geïinstalleer) %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "Installeer %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "Opgradeer %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "Herlaai benodig"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "Herlaai die sisteem om die opgradering te voltooi"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "He_rlaai nou"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1082,32 +1083,32 @@
"strongly advised to resume the upgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "Opgradering kanselleer?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "%li dag"
msgstr[1] "%li dae"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "%li uur"
msgstr[1] "%li ure"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "%li minuut"
msgstr[1] "%li minute"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1123,7 +1124,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr ""
@@ -1137,14 +1138,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr ""
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1152,34 +1153,32 @@
msgstr ""
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr ""
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "Maak gereed vir opgradering"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "Verkry nuwe pakkette"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "Installeer die opgraderings"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "Besig om skoon te maak"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1192,28 +1191,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "%d pakket gaan verwyder word."
msgstr[1] "%d pakkette gaan verwyder word."
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "%d nuwe pakket gaan geïinstalleer word."
msgstr[1] "%d nuwe pakkette gaan geïinstalleer word."
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "%d pakket gaan opgegradeer word."
msgstr[1] "%d pakkette gaan opgegradeer word."
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1224,28 +1223,28 @@
"\n"
"U moet in totaal %s aflaai. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
@@ -1253,68 +1252,68 @@
"Daar is geen opdaterings vir u sisteem beskikbaar nie. Die opgradering word "
"nou gekanselleer."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "Herlaai benodig"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "Kon nie die opgradering-nutsprogram loop nie."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "Opgradering-nutsprogram"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "Stawing het misluk"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -1322,25 +1321,25 @@
"Stawing van die opgradering het misluk. Daar is moontlik 'n probleem met die "
"netwerkverbinding of die bediener. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "Verifikasie het misluk"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1348,27 +1347,27 @@
"Verifikasie van die opgradering het misluk. Daar is moontlik 'n probleem met "
"die netwerkverbinding of die bediener. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "Kan nie die opgradering loop nie"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "Die foutboodskap is '%s'."
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1376,73 +1375,73 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "Besig om te kanselleer"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "Voortgaan [yN] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "Besonderhede [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "j"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "n"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "Verwyder: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "Installeer: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "Opgradeer: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "Voortgaan [Yn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1503,7 +1502,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:19
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1522,166 +1521,180 @@
msgid "Terminal"
msgstr "Terminaal"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "Wag asseblief, hierdie kan 'n ruk duur."
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "Opdatering is voltooi"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "Die bediener is dalk oorlaai. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "Kontrolleer asseblief u Internet-verbinding."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "Gradeer op"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "Laai bykomende pakketlêers af..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "Lêer %s van %s teen %sB/s"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "Lêer %s van %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "Open skakel in Webblaaier"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "Kopieer skakel na knipbord"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Laai lêer %(current)li van %(total)li af teen %(speed)s/s"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "Laai lêer %(current)li van %(total)li af"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "Installeer"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "Weergawe %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "Laai lys van veranderinge af..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr ""
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] ""
+msgstr[1] ""
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr ""
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "Die bediener is dalk oorlaai. "
-msgstr[1] "Die bediener is dalk oorlaai. "
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
"Press the 'Check' button below to check for new software updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1690,34 +1703,42 @@
msgstr[1] ""
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "Welkom by Ubuntu"
+
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
-msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1725,29 +1746,29 @@
"temporary packages of former installations using 'sudo apt-get clean'."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "Lees pakketinligting"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1756,7 +1777,7 @@
"following error message:\n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1764,58 +1785,68 @@
"following error message:"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (Nuwe installasie)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(Grootte: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "Van weergawe %(old_version)s na weergawe %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "Weergawe %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "Sagteware-indeks is stukkend"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
"this issue at first."
msgstr ""
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+msgid "New hardware support is available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "Kanselleer"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr ""
@@ -1825,22 +1856,18 @@
msgstr ""
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "Kanselleer"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1854,20 +1881,20 @@
" * Normal changes of a pre-release version of Ubuntu"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "Ander opdaterings (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -1875,7 +1902,7 @@
"Misluk om die lys veranderinge af te laai. \n"
"Kontrolleer asseblief u Internet-verbinding."
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -1884,7 +1911,7 @@
"\n"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -1893,7 +1920,7 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -1907,48 +1934,41 @@
"+changelog\n"
"totdat die veranderinge beskikbaar word of probeer later weer."
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "Aanbevole opdaterings"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Voorgestelde updaterings"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "Ander opdaterings"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Begin met opgradering?"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
+msgid "Starting Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:3
@@ -2009,59 +2029,59 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "Sagteware-indeks is stukkend"
+msgid "Update Manager"
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Herlaai die rekenaar"
+msgid "Starting Update Manager"
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr ""
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "opdaterings"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "Installeer"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "Veranderinge"
+msgid "updates"
+msgstr "opdaterings"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "Omskrywing"
+msgid ""
+"You are connected via roaming and may be charged for the data consumed by "
+"this update."
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "Besonderhede [d]"
+msgid "You are connected via a wireless modem."
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:31
-msgid ""
-"You are connected via roaming and may be charged for the data consumed by "
-"this update."
+msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
+msgid "_Install Updates"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:33
-msgid "It’s safer to connect the computer to AC power before updating."
-msgstr ""
+msgid "Changes"
+msgstr "Veranderinge"
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr ""
+msgid "Description"
+msgstr "Omskrywing"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "Installeer"
+msgid "Description of update"
+msgstr ""
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr ""
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2086,7 +2106,7 @@
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
@@ -2098,222 +2118,285 @@
msgid "Show and install available updates"
msgstr "Wys en installeer beskikbare opdaterings"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "Toon weergawe en sluit af"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "Gids wat die datalêers bevat"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr ""
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr ""
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr ""
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "Probeer 'n dist-upgrade te loop"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr ""
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr ""
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr ""
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
"for server systems are supported."
msgstr ""
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr ""
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
msgstr ""
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
msgstr ""
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr ""
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr ""
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(version)s opgradering beskikbaar"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr ""
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr ""
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".deb-pakket"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr ""
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "Pakket %s behoort geïnstalleer te word"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".deb-pakket"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
-msgid "%s needs to be marked as manually installed."
+msgid "%i obsolete entries in the status file"
msgstr ""
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
+msgstr ""
+
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr ""
+
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
+msgid "%s needs to be marked as manually installed."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
+msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
msgstr ""
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
-msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
msgstr ""
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "Welkom by Ubuntu"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid ""
#~ "This upgrade is running in sandbox (test) mode. All changes are written "
diff -Nru update-manager-17.10.11/po/am.po update-manager-0.156.14.15/po/am.po
--- update-manager-17.10.11/po/am.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/am.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2006.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2011-12-06 06:39+0000\n"
"Last-Translator: samson \n"
"Language-Team: Amharic \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f ሜ/ባ"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "ሰርቨር ለ %s"
@@ -42,31 +43,31 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "ዋናው ሰርቨር"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "ልማዳዊ ሰርቨሮች"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "የምንጩን ዝርዝር አገባብ ማስላት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr ""
"የጥቅል ፋይሎችን ማግኘት አልተቻለም ፡ ምናልባት ይህ የኡቡንቱ ዲስክ ላይሆን ይችላል ወይም የተሳሳተ አሰራር ይሆን?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "ሲዲ መጨመር አልተቻለም"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -80,13 +81,13 @@
"የስህተቱ መልእክት \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "በመጥፎ ሁኔታ ላይ ያለን ጥቅል ማስወገጃ"
msgstr[1] "በመጥፎ ሁኔታ ላይ ያሉትን ጥቅሎች ማስወገጃ"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -101,15 +102,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "ሰርቨሩ ከአቅሙ በላይ ተጭኗል"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "የተሰበሩ ጥቅሎች"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -118,7 +119,7 @@
"ጌትን በመጠቀም ስብራቱን ያስተካክሉ"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -131,65 +132,65 @@
"\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "ይህ ትንሽ ጊዜ የሚቆይ ችግር ነው ፤ እባክዎ እንደገና ይሞክሩ ትንሽ ቆይተው"
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "ማሻሻያውን ማስላት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "ስህተት በማረጋገጥ ላይ አንዳንድ ጥቅሎችን"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "ጥቅሉ '%s' ምልክት ተድርጎበታል ለማስወገድ ነገር ግን ከሚወገዱት ዝርዝሮች ውስጥ አለ"
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "በጣም አስፈላጊ ጥቅል '%s' ለማስወገድ ምልክት ተደርጎበታል"
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "ለመግጠም በመሞከር ላይ በመጥፎ ዝርዝር እትም ውስጥ ካሉ '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "መግጠም አልተቻለም '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "ስለ-ጥቅል መገመት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -201,25 +202,25 @@
"የትኛውን የኡቡንቱ እትም እንደሚያስኬዱም አልታወቀም ። \n"
"እባክዎን በመጀመሪያ አንዱን ጥቅል እላይ ከተጠቀሱት መካከል ይግጠሙ ሲናፕቴክን ወይም አፕት-ጌትን በመጠቀም ከመቀጠሎ በፊት"
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "ካሽን በማንበብ ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "ማሻሻል በርቀት ግንኙነት የተደገፈ አይደለም"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -228,11 +229,11 @@
"The upgrade will abort now. Please try without ssh."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -243,11 +244,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "በመጀመር ላይ ተጨማሪ sshd"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -255,7 +256,7 @@
"still connect to the additional one.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -264,29 +265,29 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "ማሻሻል አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "ማሻሻያ ከ '%s' ወደ '%s' በዚህ እቃ የተደገፈ አይደለም"
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "መሞከሪያ የአሸዋ ሳጥን ማሰናዳት ወድቋል"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "መሞከሪያ የአሸዋ ሳጥን አካባቢ ማሰናዳት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "መሞከሪያ የአሸዋ ሳጥን ዘዴ"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -296,28 +297,28 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
"run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -325,11 +326,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "ከኢንተርኔት ዘመናዊ ማሻሻያዎችን ልጨምር?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -341,16 +342,16 @@
"If you answer 'no' here, the network is not used at all."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "ያልተቻለ ለማሻሻል ወደ %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "ዋጋ ያለው mirror አልተገኘም"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -363,11 +364,11 @@
msgstr ""
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "ነባር ምንጮችን ላመንጭ?"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -376,34 +377,34 @@
"will cancel."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "የማስቀመጫው መረጃ ዋጋ የለውም"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "የ3ኛ ፓርቲ ምንጮችን አለማስቻል"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -416,11 +417,11 @@
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "ስህተት በማሻሻል ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -428,13 +429,13 @@
"ስህተት ተፈጥሯል በማሻሻል ላይ ፡ ይህ ምናልባት የኔትዎርክ ችግር ይሆናል ፡ እባክዎ የኔትዎርክ ግንኙነትዎን ይመርምሩና "
"እንደገና ይሞክሩ"
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "በቂ ባዶ ቦታ ዲስኩ ላይ የለም"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -445,32 +446,32 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "ለውጦቹን በማስላት ላይ"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "ማሻሻሉን አሁን መጀመር ይፈልጋሉ?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "ማሻሻሉ ተሰርዟል"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "የማሻሻያውን ጭነት ማውረድ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -478,33 +479,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "በመፈጸም ላይ ስህተት"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "መጀመሪያ ወደነበረበት ስርአት መመለሰ"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "ማሻሻያውን መግጠም አልተቻለም"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -515,26 +516,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "ላስወግዳቸው አሮጌ ጥቅሎችን?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_ማስቀመጥ"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "_ማስወገጃ"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -542,37 +543,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "የሚያስፈልጉት ጥገኞች አልተገጠሙም"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "የሚያስፈልጉት ጥገኞች '%s' አልተገጠሙም "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "የጥቅል አስተዳዳሪን በመመርመር ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "ማሻሻያውን ማሰናዳት አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -580,79 +581,79 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "የማስቀመጫውን መረጃ በማሻሻል ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "ሲዲ ራም መጨመር አልተቻለም"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "አዝናለሁ ሲዲ ራም መጨመሩ አልተሳካም"
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "ዋጋ የሌለው የጥቅል መረጃ"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "ሄዶ ማምጣት"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "በማሻሻል ላይ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "ማሻሻሉ ተጠናቋል"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "ጊዜው ያለፈበትን ሶፍትዌር በመፈለግ ላይ"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "ስርአቱን ማሻሻል ተጠናቋል"
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "በከፊል ማሻሻሉ ተጠናቋል"
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
"again when this is done."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -660,16 +661,16 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -678,7 +679,7 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -687,11 +688,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "i686 ሲፒዩ አይደለም"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -699,11 +700,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -711,11 +712,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -725,71 +726,71 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr ""
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "እባክዎ ያስገቡ '%s' በመንጂያው ውስጥ '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "ሄዶ ማምጣት ተጠናቋል"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "ፋይል ሄዳ በማምጣት ላይ %li ከ %li ወደ %sቢ/ሰ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "ስለ %s ቀሪው"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "ፋይል ሄዶ ማምጣት %li ከ %li"
@@ -799,27 +800,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "ለውጦችን በመፈጸም ላይ"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "መግጠም አልተቻለም '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -829,7 +830,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -838,26 +839,26 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "አደገኛ ስህተት ተፈጥሯል"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -865,147 +866,147 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "ኮንትሮል-ሲ መጫን"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
msgstr "ይህ ተግባሩን ያቋርጣል እና ስርአቱን በተሰበረ ሁኔታ ላይ ይተወዋል ፤ በእርግጥ ይህን ማድረግ ይፈልጋሉ?"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr "የተከፈቱ መተግበሪያዎች እና ሰነዶችን ይዝጉ ዳታዎች እንዳይጠፉ ለመከላከል"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "ማስወገጃ (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "መግጠሚያ (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "ማሻሻያ (%s)"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "የሜዲያ ለውጥ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "ልዩነቱን ማሳያ >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< ልዩነቱን መደበቂያ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "ስህተት"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "&መሰረዣ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "&መዝጊያ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "ተርሚናልን ማሳያ >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< ተርሚናልን መደበቂያ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "መረጃ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "ዝርዝሮች"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "ማስወገጃ %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "ማስወገድ (በራሱ ተገጥሟል) %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "መግጠሚያ %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "ማሻሻያ %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "እንደገና ማስጀመር ያስፈልጋል"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "እንደገና ማስጀመር ያስፈልጋል ማሻሻያውን ለማጠናቀቅ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "_አሁን እንደገና ላስጀምር"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1016,32 +1017,32 @@
"\n"
"ማሻሻሉን ከሰረዙት ስርአቱ ባልተረጋጋ ሁኔታ ላይ ይሆናል ፤ ማሻሻሉን አንዲቀጥሉ አጥብቀን እናሳስባለን"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "ማሻሻሉን ልሰረዝ?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "%li ቀን"
msgstr[1] "%li ቀኖች"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "%li ሰአት"
msgstr[1] "%li ሰአቶች"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "%li ደቂቃ"
msgstr[1] "%li ደቂቆች"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1057,7 +1058,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr ""
@@ -1071,14 +1072,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr ""
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1086,34 +1087,32 @@
msgstr "ይህ ማውረድ የሚወስደው ጊዜ በግምት %s በ 1ሜጋ ቢት በዲኤስኤል ግንኙነት እና በግምት %s በ 56ኬ ሞደም"
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "ማውረዱ የሚወስደው ጊዜ በግምት %s በእርስዎ ግንኙነት "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "ለማሻሻል በዝግጅት ላይ"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "አዲስ የሶፍትዌር መገናኛዎች ስለ ማግኘት"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "አዲስ ጥቅሎችን ስለ ማግኘት"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "ማሻሻያውን በመግጠም ላይ"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "በማጽዳት ላይ"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1126,28 +1125,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "%d ጥቅሉ ይወገዳል"
msgstr[1] "%d ጥቅሎቹ ይወገዳሉ"
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "%d አዲሱ ጥቅል ይገጠማል"
msgstr[1] "%d አዲሶቹ ጥቅሎች ይገጠማሉ"
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "%d ጥቅሉ ይሻሻላል"
msgstr[1] "%d ጥቅሎቹ ይሻሻላሉ"
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1158,145 +1157,145 @@
"\n"
"በድምሩ ማውረድ ያለብዎት ከ %s. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr "ለእርስዎ ስርአት ማሻሻያ የለም ፡ ማሻሻያው አሁን ይሰረዛል"
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "እንደገና ማስጀመር ያስፈልጋል"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "ይህ ማሻሻያ ተፈጽሟል እና እንደገና ማስነሳት ያስፈልጋል ፡ ይህን አሁን ማድረግ ይፈልጋሉ?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "የማሻሻያውን መሳሪያዎች ማስኬድ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "የማሻሻያዎች መሳሪያዎች ፊርማ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "ማሻሻያ መሳሪያዎች"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "ሄዶ ማምጣት ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "ማሻሻያውን ሄዶ ማምጣት ወድቋል ፤ ምናልባት የኔትዎርክ ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "ማጽደቂያው ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "ለይቶ ማውጣት ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "ማሻሻያውን ለይቶ ማውጣት ወድቋል ፤ ምናልባት የኔትዎርክ ወይም የሰርቨር ችግር ሊሆን ይችላል "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "ማረጋገጫው ወድቋል"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "ማሻሻያውን ማስኬድ አልተቻለም"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "የስህተቱ መልእክት ነው '%s'."
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1304,73 +1303,73 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "በማቋረጥ ላይ"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "ዝቅ ማድረጊያ :\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "እባክዎን ለመቀጠል ማስገቢያውን ይጫኑ"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "መቀጠል [yN] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "ዝርዝሮች [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "አዎ"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "አይ"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "ዝርዝር"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "የተደገፈ አይደለም : %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "ማስወገጃ : %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "መግጠሚያ : %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "ማሻሻያ : %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "መቀጠል [Yn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1433,7 +1432,7 @@
msgstr "የማሻሻያ ስርጭት"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1452,166 +1451,180 @@
msgid "Terminal"
msgstr "ተርሚናል"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "እባክዎ ይቆዩ ይህ ትንሽ ጊዜ ሊፈጅ ይችላል"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "ማሻሻሉ ተጠናቋል"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "የመልቀቂያ ማስታወሻዎችን ማግኘት አልተቻለም"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "ሰርቨሩ ምናልባት ካቅሙ በላይ ተጭኗል "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "የመልቀቂያ ማስታወሻዎችን ማውረድ አልተቻለም"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "እባክዎ የኢንተርኔት ግንኙነትዎን ይመርምሩ"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "ማሻሻል"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "የተለቀቀ ማስታወሻ"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "ጭነት ማውረድ ተጨማሪ የጥቅል ፋይሎች"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "ፋይል %s ከ %s በ %sB/s"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "ፋይል %s ከ %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr ""
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "የእርስዎ ኡቡንቱ የተደገፈ አይደለም"
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "የማሻሻያ መረጃ"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "መግጠም"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "እትም %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "በመጫን ላይ ዝርዝር ለውጦችን..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr ""
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "%(count)s ማሻሻያ ተመርጧል"
+msgstr[1] "%(count)s ማሻሻያዎች ተመርጠዋል"
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "%s ይወርዳሉ"
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "ማሻሻያው ቀደም ሲል ወርዷል ነገር ግን አልተገጠመም"
-msgstr[1] "ማሻሻያዎቹ ቀደም ሲል ወርደዋል ነገር ግን አልተገጠሙም"
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "የሚወርደው መጠን ያልታወቀ"
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
"Press the 'Check' button below to check for new software updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(days_ago)s ቀን በፊት ነው"
msgstr[1] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(days_ago)s ቀኖች በፊት ነው"
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1620,34 +1633,42 @@
msgstr[1] "የጥቅል መረጃ መጨረሻ የተሻሻለው %(hours_ago)s ሰአቶች በፊት ነው"
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "የሶፍትዌር ማሻሻያ ለኮምፒዩተሩ ዝግጁ ነው"
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ"
+
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
-msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1655,30 +1676,30 @@
"temporary packages of former installations using 'sudo apt-get clean'."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
msgstr ""
"ኮምፒዩተሩን አጥፍቶ ማብራት ያስፈልጋል ማሻሻያውን ገጥሞ ለመጨረስ። እባክዎን የሚሰሩትን ያስቀምጡ ከመቀጠሎት በፊት"
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "የጥቅል መረጃን በማንበብ ላይ"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "በመገናኘት ላይ"
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "የጥቅል መረጃውን ማስነሳት አልተቻለም"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1687,7 +1708,7 @@
"following error message:\n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1695,58 +1716,69 @@
"following error message:"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (አዲስ መግጠም)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(መጠን: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "እትም %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "በማውረድ ላይ የተለቀቀውን የማሻሻያ መሳሪያ"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "አዲስ የኡቡንቱ እትም የተለቀቀ '%s' ዝግጁ ነው"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "የሶፍትዌር ማውጫ ተሰብሯል"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
"this issue at first."
msgstr ""
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "አዲሱ እትም '%s' ዝግጁ ነው"
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "መሰረዝ"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr ""
@@ -1756,22 +1788,18 @@
msgstr ""
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "መሰረዝ"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "ማሻሻያ ዝርዝር በመገንባት ላይ"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1785,20 +1813,20 @@
" * Normal changes of a pre-release version of Ubuntu"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "ሌሎች ማሻሻያዎች (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -1806,7 +1834,7 @@
"የለውጦችን ዝርዝር ማውረድ አልተቻለም \n"
"እባክዎን የኢንተርኔት ግንኙነትዎን ይመርምሩ"
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -1815,7 +1843,7 @@
"\n"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -1824,7 +1852,7 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -1837,50 +1865,43 @@
"እባክዎን ይህን ይጠቀሙ http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"የለውጦቹ ዝርዝር ዝግጁ እስከሚሆኑ ድረስ። ወይም ትንሽ ቆይተው ይሞክሩ"
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "ስህተት '%s' ተፈጥሯል ምን አይነት ስርአት እንደሚጠቀሙ በመመርመር ላይ እንዳለ"
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "ጠቃሚ የደህንነት ማሻሻያዎች"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "የተጠቆሙት ማሻሻያዎች"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "የቀረቡ ሃሳቦች ለማሻሻያ"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "ሌሎች ማሻሻያዎች"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "የማሻሻያ አስተዳዳሪን መጀመር"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr ""
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "_በከፊል ማሻሻል"
@@ -1939,59 +1960,59 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "የሶፍትዌር ማሻሻያ"
+msgid "Update Manager"
+msgstr "የማሻሻያ አስተዳዳሪ"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "የሶፍትዌር ማሻሻያ"
+msgid "Starting Update Manager"
+msgstr "የማሻሻያ አስተዳዳሪን በማስጀመር ላይ"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "ማ_ሻሻያ"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "ማሻሻያ"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "መግጠም"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "ለውጦች"
+msgid "updates"
+msgstr "ማሻሻያ"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "መግለጫ"
+msgid ""
+"You are connected via roaming and may be charged for the data consumed by "
+"this update."
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "የማሻሻያው መግለጫ"
+msgid "You are connected via a wireless modem."
+msgstr "የተገናኙት በሽቦ አልባ ሞደም ነው"
#: ../data/gtkbuilder/UpdateManager.ui.h:31
-msgid ""
-"You are connected via roaming and may be charged for the data consumed by "
-"this update."
+msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+msgid "_Install Updates"
+msgstr "_መግጠም ማሻሻያውን"
#: ../data/gtkbuilder/UpdateManager.ui.h:33
-msgid "It’s safer to connect the computer to AC power before updating."
-msgstr ""
+msgid "Changes"
+msgstr "ለውጦች"
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr ""
+msgid "Description"
+msgstr "መግለጫ"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "መግጠም"
+msgid "Description of update"
+msgstr "የማሻሻያው መግለጫ"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr ""
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2015,7 +2036,7 @@
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
@@ -2027,77 +2048,77 @@
msgid "Show and install available updates"
msgstr "ማሳያ እና መግጠሚያ ዝግጁ የሆኑ ማሻሻያዎችን"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "እትሙን አሳይቶ መውጣት"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr ""
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "መመርመር አዲስ የተለቀቀ የኡቡንቱ እትም እንዳለ"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr ""
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr ""
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr ""
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr ""
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr ""
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "በከፊል ማሻሻያውን ማስኬድ"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
"for server systems are supported."
msgstr ""
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr ""
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
msgstr ""
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2105,163 +2126,209 @@
"ላማሻሻያ መረጃ እባክዎን ይህን ይጎብኙ :\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "አዲስ የተለቀቀ እትም የለም"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "አዲሱ እትም '%s' ዝግጁ ነው"
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "የኡቡንቱ %(version)s ማሻሻያ ዝግጁ ነው"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr ""
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "ፋይል በዲስክ ላይ"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".የዴቢያን ጥቅል"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "የጎደሉ ጥቅሎችን መግጠሚያ"
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "ጥቅሉ %s መገጠም አለበት"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".የዴቢያን ጥቅል"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
-msgid "%s needs to be marked as manually installed."
+msgid "%i obsolete entries in the status file"
+msgstr ""
+
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
msgstr ""
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr ""
+
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
+msgid "%s needs to be marked as manually installed."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
+msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
msgstr ""
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
-msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
msgstr ""
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "%(count)s ማሻሻያ ተመርጧል"
-#~ msgstr[1] "%(count)s ማሻሻያዎች ተመርጠዋል"
-
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "እንኳን ደህና መጡ ወደ ኡቡንቱ"
-
-#~ msgid "Update Manager"
-#~ msgstr "የማሻሻያ አስተዳዳሪ"
-
-#~ msgid "Starting Update Manager"
-#~ msgstr "የማሻሻያ አስተዳዳሪን በማስጀመር ላይ"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "የተገናኙት በሽቦ አልባ ሞደም ነው"
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "_Install Updates"
-#~ msgstr "_መግጠም ማሻሻያውን"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid "Software updates are available for this computer"
#~ msgstr "የሶፍትዌር ማሻሻያ ለዚህ ኮምፒዩተር ዝግጁ ነው"
@@ -2278,6 +2345,11 @@
#~ msgid "There are no updates to install"
#~ msgstr "ለመግጠም ማሻሻያ የለም"
+#~ msgid "The update has already been downloaded, but not installed"
+#~ msgid_plural "The updates have already been downloaded, but not installed"
+#~ msgstr[0] "ማሻሻያው ቀደም ሲል ወርዷል ነገር ግን አልተገጠመም"
+#~ msgstr[1] "ማሻሻያዎቹ ቀደም ሲል ወርደዋል ነገር ግን አልተገጠሙም"
+
#~ msgid "Checking for a new ubuntu release"
#~ msgstr "አዲስ የተለቀቀ የኡቡንቱ እትም በመፈለግ ላይ"
diff -Nru update-manager-17.10.11/po/an.po update-manager-0.156.14.15/po/an.po
--- update-manager-17.10.11/po/an.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/an.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2010.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2011-04-14 14:50+0000\n"
"Last-Translator: Daniel Martinez \n"
"Language-Team: Aragonese \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "Servidor ta %s"
@@ -42,20 +43,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Servidor prencipal"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Servidors presonalizaus"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "No se puet calcular a dentrada sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -63,11 +64,11 @@
"Imposible localizar garra paquete, a lo millor no ye un disco d'Ubuntu u no "
"ye l'arquitectura correcta"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "Error al adibir o CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -81,13 +82,13 @@
"O mensache d'error estió:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Eliminar paquete en mal estau"
msgstr[1] "Eliminar paquetes en mal estau"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -108,15 +109,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "O servidor puet estar sobrecargau"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Paquetz crebaus"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -126,7 +127,7 @@
"de continar."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -146,26 +147,26 @@
"* Paquetz de software no oficials, no suministraus por Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "Probablemén siga un problema pasachero, prebe de nuevo mas tardi."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "No s'ha puesto calcular l'esvielle"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "Error autenticando bels paquetz"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -175,7 +176,7 @@
"problema pasachero en o rete. prebe de nuevo mas tardi. veiga abaixo un "
"listau d'os paquetz no autenticaus."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -183,33 +184,33 @@
"O paquet «%s» ye marcau ta desinstalar-se pero ye en a lista negra de "
"desinstalación"
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "O paquet esencial «%s» ha estau marcau ta la suya desinstalación"
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Prebando d'instalar a versión vedada «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "No se ha puesto instalar «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "No s'ha puesto determinar o meta-paquet"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -223,15 +224,15 @@
"Por favor, instale uno d'os paquetz anteriors emplegando Synaptic o apt-get "
"antis de prencipiar."
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Leyindo caché"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "No s'ha puesto obtener un bloqueo exclusivo"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -240,11 +241,11 @@
"chestión de paquetz (como apt-get u aptitude). Por favor, zarre ixa "
"aplicación en primeras."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Actualizando sobre conixión lexana no soportada"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -257,11 +258,11 @@
"release-upgrade».\n"
"L'esvielle s'aturará agora. Prebe sin de ssh."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "¿Continar a echecución baixo SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -277,11 +278,11 @@
"Si contina, escomencipiará un diaple ssh adicinal en o puerto «%s».\n"
"¿Deseya continar?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Prencipiando sshd adicional"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -292,7 +293,7 @@
"o puerto «%s». Si bella cosa va mal con o ssh en echecución, encara podrá "
"conectar-se a o puerto adicional.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -301,29 +302,29 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "No se puet esviellar"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "Ista aina no soporta esvielles de «%s» a «%s»."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Falló a configuración d'a caixa d'arena"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "No s'ha puesto creyar un entorno de caixa d'arena"
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Modo caixa d'arena"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -333,30 +334,30 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"A suya instalación de python ye danyada. Faiga a favor, atecle l'enrrastre "
"simbolico «/usr/bin/python»."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "O paquet «debsig-verify» ye instalau"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
"run the upgrade again."
msgstr "L'esvielle no puet continar con ixe paquet instalau."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -364,11 +365,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "¿Anyadir as zagueras actualizacións dende internet?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -388,16 +389,16 @@
"esvielles a l'inte de pasar a la nueva versión.\n"
"Si responde «no» agora, o rete no se emplegará ta brenca."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "(desactivau en l'esvielle a %s)"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -410,11 +411,11 @@
msgstr ""
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -423,34 +424,34 @@
"will cancel."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -463,23 +464,23 @@
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -490,32 +491,32 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr ""
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -523,33 +524,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr ""
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -560,26 +561,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -587,37 +588,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -625,79 +626,79 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr ""
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
"again when this is done."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -705,16 +706,16 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -723,7 +724,7 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -732,11 +733,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -744,11 +745,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -756,11 +757,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -770,71 +771,71 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr ""
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr ""
@@ -844,27 +845,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr ""
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -874,7 +875,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -883,26 +884,26 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -910,147 +911,147 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
msgstr ""
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr ""
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr ""
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1058,32 +1059,32 @@
"strongly advised to resume the upgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1099,7 +1100,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr ""
@@ -1113,14 +1114,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr ""
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1128,34 +1129,32 @@
msgstr ""
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr ""
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1168,28 +1167,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1197,145 +1196,145 @@
"You have to download a total of %s. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1343,73 +1342,73 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr ""
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr ""
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr ""
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1467,7 +1466,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:19
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1486,133 +1485,141 @@
msgid "Terminal"
msgstr ""
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr ""
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr ""
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr ""
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] ""
+msgstr[1] ""
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr ""
#: ../UpdateManager/UpdateManager.py:584
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
msgstr[0] ""
msgstr[1] ""
@@ -1620,31 +1627,38 @@
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
"Press the 'Check' button below to check for new software updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1653,34 +1667,42 @@
msgstr[1] ""
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
-msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1688,29 +1710,29 @@
"temporary packages of former installations using 'sudo apt-get clean'."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1719,7 +1741,7 @@
"following error message:\n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1727,58 +1749,68 @@
"following error message:"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
"this issue at first."
msgstr ""
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+msgid "New hardware support is available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr ""
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr ""
@@ -1788,22 +1820,18 @@
msgstr ""
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr ""
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1817,26 +1845,26 @@
" * Normal changes of a pre-release version of Ubuntu"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -1845,7 +1873,7 @@
"\n"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -1854,7 +1882,7 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -1863,47 +1891,41 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-msgid "Starting Software Updater"
-msgstr ""
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
+msgid "Starting Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:3
@@ -1964,54 +1986,57 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-msgid "Software Updater"
+msgid "Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr ""
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+msgid "I_nstall"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
+msgid "updates"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
+msgid ""
+"You are connected via roaming and may be charged for the data consumed by "
+"this update."
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:30
-msgid "Details of updates"
+msgid "You are connected via a wireless modem."
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:31
-msgid ""
-"You are connected via roaming and may be charged for the data consumed by "
-"this update."
+msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
+msgid "_Install Updates"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:33
-msgid "It’s safer to connect the computer to AC power before updating."
+msgid "Changes"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
+msgid "Description"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-msgid "_Install Now"
+msgid "Description of update"
+msgstr ""
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
msgstr ""
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
@@ -2036,7 +2061,7 @@
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
@@ -2048,218 +2073,284 @@
msgid "Show and install available updates"
msgstr ""
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr ""
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr ""
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr ""
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr ""
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr ""
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr ""
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr ""
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr ""
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr ""
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
"for server systems are supported."
msgstr ""
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr ""
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
msgstr ""
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
msgstr ""
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr ""
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr ""
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr ""
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr ""
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ""
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr ""
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr ""
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
+#, python-format
+msgid "%i obsolete entries in the status file"
msgstr ""
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
msgstr ""
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr ""
+
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
+msgid "%s needs to be marked as manually installed."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
+msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
msgstr ""
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
-msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
msgstr ""
#~ msgid ""
diff -Nru update-manager-17.10.11/po/ar.po update-manager-0.156.14.15/po/ar.po
--- update-manager-17.10.11/po/ar.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/ar.po 2017-12-23 05:00:37.000000000 +0000
@@ -5,11 +5,12 @@
#
# FIRST AUTHOR , 2006.
# OsamaKhalid , 2009.
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: po_update-manager-ar\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-04-17 08:34+0000\n"
"Last-Translator: Ibrahim Saed \n"
"Language-Team: Arabic\n"
@@ -23,7 +24,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -35,13 +36,13 @@
msgstr[5] "%(size).0f ك.بايت"
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f م.بايت"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "خادوم %s"
@@ -49,30 +50,30 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "الخادوم الرئيسي"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "خواديم مخصصة"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "تعذر حساب مدخلة source.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
msgstr "تعذّر إيجاد أي ملفات حزم، لعل هذا ليس قرص أوبونتو أو البنية الخطأ؟"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "فشلت إضافة الاسطوانة"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -87,7 +88,7 @@
"رسالة الخطأ كانت:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "أزل الحزمة التي في حالة سيئة"
@@ -97,7 +98,7 @@
msgstr[4] "أزل الحزم التي في حالة سيئة"
msgstr[5] "أزل الحزم التي في حالة سيئة"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -128,15 +129,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "قد يكون الخادوم مثقلاً."
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "حزم معطوبة"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -145,7 +146,7 @@
"أو apt-get قبل المواصلة."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -166,11 +167,11 @@
" * حزم برمجيات غير رسمية ليست مقدمة من أبونتو\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "هذا على الأغلب عطل عابر، من فضلك حاول لاحقا."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
@@ -178,16 +179,16 @@
"إذا لم ينطبق أيًا من هذا، رجاءً أبلغ عن هذه العلة باستخدام الأمر 'ubuntu-bug "
"update-manager' في الطرفية."
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "تعذّر حساب الترقية"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "عطل في استيثاق بعض الحزم"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -196,28 +197,28 @@
"تعذّر استيثاق بعض الحزم. قد تكون هذه مشكلة عابرة في الشبكة، وقد تفلح المحاولة "
"مجددا لاحقا. طالع قائمة الحزم غير المستوثقة أدناه."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "الحزمة '%s' معلّمة للإزالة لكنها في قائمة الحذف السوداء."
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "الحزمة الأساسية '%s' معلّمة للإزالة."
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "يحاول تثبيت نسخة في القائمة السوداء '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "تعذّر تثبيت '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
@@ -226,11 +227,11 @@
"الأمر 'ubuntu-bug update-manager' في الطرفية."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "تعذّرت معرفة الحزمة الفوقية"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -243,15 +244,15 @@
" رجاءً ثبت إحدى الحزم المذكورة أعلاه باستخدام synaptic أو apt-get قبل "
"المواصلة."
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "يقرأ المخبئية"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "تعذر الحصول على قفل حصري"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -259,11 +260,11 @@
"يعني هذا عادة أن تطبيق إدارة حزم آخر (مثل apt-get أو aptitude) يعمل حالياً. "
"رجاء أغلق ذاك التطبيق أولاً."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "الترقية عبر اتصال بعيد غير مدعومة"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -276,11 +277,11 @@
"\n"
"سيتم الخروج من عملية الترقية الآن. الرجاء المحاولة بدون الغطاء الأمني."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "أتريد مواصلة العمل تحت SSH؟"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -295,11 +296,11 @@
"إذا استمررت، سيتم بدأ عفريت غطاء أمني إضافي على منفذ '%s'.\n"
"هل تريد الاستمرار؟"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "يشغّل sshd إضافي"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -309,7 +310,7 @@
"لتسهيل الإصلاح في حالة الفشل فإن sshd إضافيا سيُشغّل على المنفذ '%s'. إذا حدث "
"عطل في ssh المشتغل حاليا يمكنك الاتصال بالإضافي.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -321,29 +322,29 @@
"المحتمل أن يكون هذا خطراً لا يتم فتحه تقائياً. بإمكانك فتح المنفذ عن طريق:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "تعذّرت الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "ترقية من '%s' إلى '%s' غير مدعومة بهذه الأداة."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "فشل إعداد صندوق الرمل"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "تعذّر إنشاء بيئة محاطة (صندوق رمل)"
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "طور صندوق الرمل"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -357,17 +358,17 @@
"\n"
"*لن* تُكتب أي تغييرات إلى مجلد النظام من الآن حتى إعادة التشغيل التالي."
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"تثبيتة python الحالية معطوبة. رجاءً أصلح الرابط الرمزي '/usr/bin/python'."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "حزمة 'debsig-verify' مثبتة"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -376,12 +377,12 @@
"لا يمكن مواصة الترقية و تلك الحزمة مثبّتة.\n"
"أزلها باستخدام synaptic أو 'apt-get' ثم أجر الترقية مجددا."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr "لا يمكن الكتابة إلى '%s'"
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -391,11 +392,11 @@
"لا يمكن الكتابة إلى مُجلد النظام '%s' على نظامك. لا يُمكن مُتابعة الترقية.\n"
"رجاءً تأكد أن مُجلد النظام قابل للكتابة."
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "أأضمن آخر التحديثات من الإنترنت؟"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -414,16 +415,16 @@
"مباشرة.\n"
"إذا كانت إجابتك 'لا' هنا، لن تستخدم الشبكة مطلقا."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "عُطّل عند الترقية إلى %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "لم يُعثر على مرآة صحيحة"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -441,11 +442,11 @@
"فستُحدّث كل '%s' إلى '%s'. وإن أجبت ﺑ'ﻻ' فستُلغى عملية الترقية."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "أأولد المصادر المبدئية؟"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -457,11 +458,11 @@
"\n"
"هل تود إضافة المدخلات الافتراضية لـ'%s'؟ إن أجبت ﺑ'ﻻ' فستُلغى عملية الترقية."
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "معلومات المستودع غير صحيحة"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
@@ -469,11 +470,11 @@
"ترقية معلومات المستودعات أسفرت عن ملف غير صالح، لذلك يجري بدء عملية للإبلاغ "
"عن العلّة."
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "مصادر الأطراف الخارجية عُطّلت"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -482,7 +483,7 @@
"بعض مدخلات الأطراف الخارجية في sources.list قد عطلت. يمكنك إعادة تفعيلها بعد "
"الترقية، باستخدام أداة 'software-properties' في مدير الحزم."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "لا حزم في حالة غير متسقة"
@@ -492,7 +493,7 @@
msgstr[4] "حزم في حالة غير متسقة"
msgstr[5] "حزم في حالة غير متسقة"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -521,11 +522,11 @@
"حالة الحزم '%s' متضاربة وتحتاج أن يعاد تثبيتها، لكن لا أرشيف وجد لها. من "
"فضلك أعد تثبيت الحزم يدويا أو أزلها من النظام."
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "عطل أثناء التحديث"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -533,13 +534,13 @@
"طرأت مشكلة أثناء التحديث. عادة ما يكون هذا نتيجة مشكلة ما في الشبكة، تحقق من "
"اتصالك الشبكي وحاول مجددا."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "لا توجد مساحة كافية على القرص"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -553,21 +554,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "يحسب التغيرات"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "أتريد بدء التحديث الآن؟"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "أُلغيت الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -575,12 +576,12 @@
"الترقية ستلغى وسيتم استعادة الحالة الأصلية للنظام. بإمكانك استئناف الترقية "
"في وقت لاحق."
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "تعذّر تنزيل الترقيات"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -590,27 +591,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "عطل أثناء الإيداع"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "يسترجع الحالة الأصلية للنظام"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "تعذّر تثبيت الترقيات"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -618,7 +619,7 @@
"لقد أُجهضت الترقية. قد يصبح نظامك في خالة غير مستقرة. سيُشغل الاستعفاء الآن "
"(dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -635,27 +636,27 @@
"upgrade/ مع البلاغ.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
"لقد أُجهضت الترقية. راجع الاتصال بالإنترت أو وسيط التثبيت ثم أعد المحاولة. "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "أأزيل الحزم المبطلة؟"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ا_ستبق"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "أ_زل"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -663,37 +664,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "اعتمادات مطلوبة غير مثبتة"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "الاعتمادية المطلوبة '%s' ليست مثبتة. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "يفحص مدير الحزم"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "فشل تجهيز الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr "فشل تحضير النظام للترقية، لذلك يجري بدء عملية للإبلاغ عن العلّة."
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "فشل جلب متطلبات الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -705,68 +706,68 @@
"\n"
"بالإضافة إلى ذلك، يجري بدء عملية للإبلاغ عن العلّة."
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "يحدّث معلومات المستودعات"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "فشل في إضافة القرص المدمج"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "عفواً، لم يتم إضافة القرص المدمج بنجاح."
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "معلومات حزم غير صحيحة"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "يجلب"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "تجري الترقية"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "انتهت الترقية"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "الترقية اكتملت، ولكن كان هناك أخطاء أثناء عملية الترقية."
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "يبحث عن برمجيات قديمة"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "تمت ترقية النظام."
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "انتهت الترقية الجزئية."
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms قيد الاستخدام"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -775,11 +776,11 @@
"يستخدم نظامك مدير الصوت 'evms' في /proc/mounts. برمجيات 'evms' لم تعد "
"مدعومة، من فضلك أغلقه ونفذ الترقية مجددا عندما ينتهي."
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr "قد يكون عتاد الرسوميات في جهازك غير مدعوم بالكامل في أوبنتو 12.04."
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -790,9 +791,9 @@
"لمزيد من المعلومات انظر: https://wiki.ubuntu.com/X/Bugs/"
"UpdateManagerWarningForI8xx هل تود الاستمرار في الترقية؟"
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -800,8 +801,8 @@
"قد تقلل الترقية من تأثيرات سطح المكتب، وأداء الألعاب وبرامج الرسوميات "
"المكثفة الأخرى."
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -814,7 +815,7 @@
"\n"
"أتريد المواصلة؟"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -827,11 +828,11 @@
"\n"
"أتريد المواصلة؟"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "لا يوجد معالج i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -842,11 +843,11 @@
"الحزم متطلبةً لبنية i686 كحد أدنى. ليس من الممكن ترقية نظامك إلى إصدارة "
"أوبونتو الجديدة مع هذا العتاد."
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "لا معالج ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -857,11 +858,11 @@
"مبنية لتعمل على الطراز ARMv6 كحد أدنى. من غير الممكن ترقية نظامك إلى إصدارة "
"أوبونتو حديثة مع هذا العتاد."
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "لا يوجد عفريت مدير للعمليات"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -876,15 +877,15 @@
"\n"
"هل حقاً تريد الاستمرار؟"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "ترقية في بيئة محكومة (صندوق رمل)"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr "ابحث في المسار المعطى عن قرص مدمج يحوي حزم ترقية"
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -892,57 +893,57 @@
"استخدم واجهة. المتاح حاليا:\n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKD"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr "*مهجور* سيتم تجاهل هذا الخيار"
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr "قم بترقية جزئية فقط (لا كتابة فوق sources.list)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "عطل دعم شاشة جنو"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "حدد مجلد البيانات"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "رجاء أدرج '%s' في محرك الأقراص '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "تم الجلب"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "يجلب الملف %li من %li بـ %sبايت/ثانية"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "بقي %s تقريبا"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "يجلب الملف %li من %li"
@@ -952,27 +953,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "يطبّق التغييرات"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "مشكلة اعتمادية - سأغادر بدون إعداد"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "تعذّر تثبيت '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -982,7 +983,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -993,7 +994,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -1001,20 +1002,20 @@
"ستفقد أي تغيرات كنت قد أحدثتها في ملف التضبيطات هذا إن اخترت استبداله "
"بإصدارة أحدث."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "تعذّر العثور على أمر 'diff'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "حدث خطأ فادح"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -1026,13 +1027,13 @@
"الترقية.\n"
"ملف sources.list الأصلي حُفِظَ في /etc/apt/sources.list.distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "ضُغط Ctrl-c"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -1040,134 +1041,134 @@
"هذا سيجهض العملية وقد يترك النظام في حالة معطوبة. أمتأكد أنك تريد فعل ذلك؟"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr "لتلافي فقد البيانات أغلق جميع التطبيقات والمستندات."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "لم تعد كانونيكال تدعمها (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "إلى إصدارة أقدم (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "أزل (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "لم تعد مطلوبة (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "ثبّت (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "رقّ (%s)"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "تغيير الوسائط"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "أظهر الفرق >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< أخف الفرق"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "خطأ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "أ&لغِ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "أ&غلق"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "أظهر الطرفية >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< أخف الطرفية"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "معلومات"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "التّفاصيل"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "لم تعد مدعومة %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "أزل %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "أزل %s (ثبّت تلقائيا)"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "ثبّت %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "رقِّ %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "إعادة التشغيل مطلوبة"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "أعد تشغيل النظام لإتمام الترقية"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "أ_عد التشغيل الآن"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1179,11 +1180,11 @@
"قد يصبح النظام في حالة غير صالحة للاستعمال إذا ألغيت الترقية. ننصح بشدة "
"استئناف الترقية."
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "أألغي الترقية؟"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
@@ -1194,7 +1195,7 @@
msgstr[4] "%li يوما"
msgstr[5] "%li يوم"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
@@ -1205,7 +1206,7 @@
msgstr[4] "%li ساعة"
msgstr[5] "%li ساعة"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
@@ -1216,7 +1217,7 @@
msgstr[4] "%li دقيقة"
msgstr[5] "%li دقيقة"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1236,7 +1237,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1250,14 +1251,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1266,34 +1267,32 @@
"سيأخذ التنزيل حوالي %s على اتصال بسرعة 1م.بايت، وحوالي %s على مودم 56ك."
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "سيستغرق التنزيل حوالي %s بسرعة اتصالك. "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "يحضّر للترقية"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "يجلب قنوات البرمجيات الجديدة"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "يجلب الحزم الجديدة"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "يثبّت الترقيات"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "ينظّف"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1322,7 +1321,7 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
@@ -1333,7 +1332,7 @@
msgstr[4] "ستزال %d حزمة."
msgstr[5] "ستزال %d حزمة."
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
@@ -1344,7 +1343,7 @@
msgstr[4] "ستثبت %d حزمة جديدة."
msgstr[5] "ستثبت %d حزمة جديدة."
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
@@ -1355,7 +1354,7 @@
msgstr[4] "سترقى %d حزمة جديدة."
msgstr[5] "سترقى %d حزمة جديدة."
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1366,14 +1365,14 @@
"\n"
"تحتاج لتنزيل ما مجمله %s. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
"تثبيت الترقية قد يأخذ بضع ساعات. حالما ينتهي التنزيل، فلا يمكن إلغاء العملية."
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
@@ -1381,51 +1380,51 @@
"جلب وتثبيت الترقية قد يأخذ بضع ساعات. حالما ينتهي التنزيل، لا يمكن إلغاء "
"العملية."
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr "إزالة الحزم قد يأخذ بضع ساعات. "
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr "البرمجيات على هذا الحاسوب مُحدّثة."
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr "لا توجد أي ترقيات متوفرة لنظامك. ستلغى الترقية الآن."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "إعادة التشغيل مطلوبة"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "لقد انتهت الترقية وإعادة التشغيل مطلوبة. هل تود القيام بذلك الآن؟"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "توثيق '%(file)s' باستخدام البصمة '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr "يستخرج '%s'"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "تعذّر تشغيل أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
@@ -1433,71 +1432,71 @@
"على الأرجح هذه مشكلة في أداة الترقية. رجاءً أبلغ عنها كعلّة باستخدام الأمر "
"'ubuntu-bug update-manager' في الطرفية."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "توقيع أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "أداة الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "فشل الجلب"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "فشل جلب الترقية، قد تكون هناك مشكلة في الشبكة. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "فشل الاستيثاق"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "فشل استيثاق الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "فشل الاستخراج"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "فشل استخلاص الترقية، قد تكون هناك مشكلة في الشبكة أو الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "فشل التحقق"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "فشل التحقق من الترقية. قد توجد مشكلة في الشبكة أو في الخادوم. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "لا يمكن اجراء الترقية"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -1505,13 +1504,13 @@
"غالباً ما يحدث هذا إذا ما تم تحميل /tmp بإشارة nonexec. رجاءاً أعد التحميل "
"بدون nonexec ثم أعد تشغيل الترقية."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "رسالة الخطأ هي '%s'."
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1522,73 +1521,73 @@
"log/dist-upgrade/apt.log في البلاغ. تم الخروج من الترقية.\n"
"ملف sources.list الأصلي حُفِظَ في /etc/apt/sources.list.distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "يُجهض"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "حطّت رتبته:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "للإستمرار اضغط على [Enter]"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "استمر [ن(ل)] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "التّفاصيل [ف]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "ن"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "ل"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "ف"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "لم تعد مدعومة: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "إزالة: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "تثبيت: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "ترقية: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "تابع [Yn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1655,8 +1654,7 @@
msgstr "ترقية التوزيعة"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-#, fuzzy
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr "ترقية أبونتو إلى الإصدارة 12.04"
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1675,84 +1673,85 @@
msgid "Terminal"
msgstr "طرفية"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "رجاء انتظر، قد يستغرق هذا وقتا"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "لقد انتهت عملية التحديث"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "تعذّر العثور على ملاحظات الإصدارة"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "قد يكون الخادوم محملا فوق طاقته. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "تعذّر تنزيل ملاحظات الإصدارة"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "رجاء تأكد من اتصالك بالإنترنت"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "رقّ"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "ملاحظات الإصدار"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "تنزيل ملفات الحزم الإضافية..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "الملف %s من %s بسرعة %s ب/ث"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "ملف %s من %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "افتح الرابط في المتصفح"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "انسخ الرابط إلى الحافظة"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "ينزّل الملف %(current)li من %(total)li بسرعة %(speed)s/ثانية"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "ينزّل الملف %(current)li من %(total)li"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "نسختك من أبونتو لم تعد مدعومة بعد الآن."
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
@@ -1760,51 +1759,61 @@
"لن تحصل على المزيد من الإصلاحات الأمنية أو التحديثات الحرجة. يرجى الترقية "
"إلى آخر نسخة من أبونتو."
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "معلومات الترقية"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "ثبّت"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr "الاسم"
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "الإصدار %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr "لا يوجد اتصال بالشبكة، لن تستطيع الحصول على معلومات التغيير."
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "ينزّل قائمة التغييرات..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr "أ_زِل التحديد عن الكل"
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr "حدّد ال_كل"
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "لم تحدد أي تحديثات"
+msgstr[1] "حُدد تحديث واحد"
+msgstr[2] "حُدد تحديثين"
+msgstr[3] "حُددت %(count)s تحديثات"
+msgstr[4] "حُدد %(count)s تحديثا"
+msgstr[5] "حُدد %(count)s تحديث"
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "سينزل %s"
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
msgstr[0] "تم تنزي التحديثات ولكن لم تُثبّت."
msgstr[1] "تم تنزيل تحديث واحد، ولكن لم يُثبّت."
msgstr[2] "تم تنزيل تحديثين، ولكن لم يُثبّتا."
@@ -1816,11 +1825,18 @@
msgid "There are no updates to install."
msgstr "لا توجد تحديثات للتثبيت."
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "حجم التنزيل مجهول"
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
@@ -1828,7 +1844,7 @@
"غير معروف متى حُدِّثت معلومات الحزم آخر مرة. رجاءً انقر زر 'التمس' لتحديث "
"المعلومات."
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1837,7 +1853,7 @@
"حُدّثت معلومات الحزم آخر مرة قبل %(days_ago)s أيام/يوم.\n"
"اضغط زر 'التمس' لفحص التحديثات الجديدة للبرمجيات."
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
@@ -1848,7 +1864,7 @@
msgstr[4] "حُدّثت معلومات الحزم آخر مرة منذ %(days_ago)s يوما."
msgstr[5] "حُدّثت معلومات الحزم آخر مرة منذ %(days_ago)s يوم."
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1861,34 +1877,42 @@
msgstr[5] "حُدّثت معلومات الحزم آخر مرة منذ %(hours_ago)s ساعة."
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr "حُدّثت معلومات الحزم آخر مرة منذ حوالي %s دقيقة."
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr "حُدثت معلومات الحزم توًا."
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr "تحديثات البرمجيات تصحّح الأخطاء وتسد الثغرات الأمنية وتوّفر ميزات جديدة."
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "قد تتوفر تحديثات برمجيات لحاسوبك."
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
-msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "مرحبًا بك في أوبونتو"
-#: ../UpdateManager/UpdateManager.py:700
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
-msgstr ""
+"These software updates have been issued since this version of Ubuntu was "
+"released."
+msgstr "صدرت هذه التحديثات البرمجية منذ إطلاق هذه الإصدارة من أبونتو."
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
+msgstr "تتوفر تحديثات برمجيات لهذا الحاسوب."
+
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1899,7 +1923,7 @@
"إضافي من مساحة القرص على '%s'. أفرغ مهملاك وأزل الحزم المؤقتة للتثبيتات "
"السابقة باستخدام 'sudo apt-get clean'."
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1907,23 +1931,23 @@
"يحتاج الحاسوب لإعادة التشغيل لتطبيق التحديثات. من فضلك احفظ عملك قبل "
"المواصلة."
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "يقرأ معلومات الحزم"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "يتصل..."
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr "قد لا تستطيع التماس التحديثات أو تنزيل تحديثات جديدة."
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "تعذّر تمهيد معلومات الحزم"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1935,7 +1959,7 @@
"\n"
"من فضلك أبلغ هذه العلة لحزمة 'update-manager' وضمّن رسالة الخطأ التالية:\n"
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1946,52 +1970,52 @@
"\n"
"من فضلك أبلغ هذه العلة للحزمة 'update-manager' وضمّن رسالة الخطأ التالية:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (تثبيت جديد)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(الحجم: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "من الإصدارة %(old_version)s إلى %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "الإصدارة %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "يتعذّر ترقية الإصدارة حاليا"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr "تعذّر ترفية الإصدارة حاليا، أعد المحاولة لاحقا. رد الخادوم: '%s'"
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "ينزّل أداة الترقية"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "تتوفر إصدارة جديدة '%s' من أوبونتو"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "فهرس البرمجيات تالف"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -2000,6 +2024,17 @@
"لا يمكن تثبيت أو إزالة أي برمجيات. استخدم مدير الحزم \"Synaptic\" أو شغل "
"\"sudo apt-get install -f\" في مرقاب لمحاولة إصلاح هذه المشكلة أولا."
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "لا تتوفر إصدارات '%s'"
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "ألغِ"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr "التمس تحديثات"
@@ -2009,22 +2044,18 @@
msgstr "ثبّت جميع التحديثات المتوفرة"
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "ألغِ"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr "سجل التغييرات"
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr "تحديثات"
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "يبني قائمة التحديثات"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -2048,20 +2079,20 @@
" * حزم برمجيات غير رسمية ليست مقدمة من أبونتو\n"
" * تغييرات عادية لنسخة ما قبل الإصدار من أبونتو."
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "تنزيل سجل التغييرات"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "تحديثات أخرى (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr "هذا التحديث لا يأتي من مصدر يدعم سجل التغييرات."
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -2069,7 +2100,7 @@
"فشل تنزيل قائمة التغييرات.\n"
"افحص اتصالك بإنترنت."
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -2082,7 +2113,7 @@
"الإصدارة المُتوفرة: %s\n"
"\n"
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -2095,7 +2126,7 @@
"من فضلك استخدم http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"حتى تتوفر التغييرات أو حاول مجددا لاحقا."
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -2108,50 +2139,43 @@
"من فضلك استخدام http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"حتى تتوفر التغييرات أو حاول مجددا لاحقا."
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "فشل الكشف على التوزيع"
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "صودف خطأ '%s' أثناء التماس ما يستخدمه النظام."
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "تحديثات أمنية مهمّة"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "تحديثات منصوح بها"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "تحديثات مقترحة"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "تحديثات رجوعية"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "تحديثات التوزيعة"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "تحديثات أخرى"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "يبدأ مدير التحديثات"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr "تحديثات البرمجيات تصحّح الأخطاء وتسد الثغرات الأمنية وتوّفر ميزات جديدة."
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "ترقية _جزئية"
@@ -2221,37 +2245,27 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "تحديثات البرمجيات"
+msgid "Update Manager"
+msgstr "مدير التحديثات"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "تحديثات البرمجيات"
+msgid "Starting Update Manager"
+msgstr "يبدأ مدير التحديثات"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "ت_رقية"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "تحديثات"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "ثبّت"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "التغييرات"
+msgid "updates"
+msgstr "تحديثات"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "الوصف"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "وصف التحديث"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
@@ -2259,23 +2273,33 @@
"أنت متصل عبر التجوال ومن الممكن أن تحاسب على البيانات المستهلكة خلال هذا "
"التحديث."
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "أنت متصل عبر مودم لاسلكي."
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr "إنه أكثر أماناً إذا وصلت حاسوبك بمنفذ الطاقة قبل البدء في التحديث."
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "_ثبت التحديثات"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "التغييرات"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr "الإ_عدادات..."
+msgid "Description"
+msgstr "الوصف"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "ثبّت"
+msgid "Description of update"
+msgstr "وصف التحديث"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr "الإ_عدادات..."
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2298,9 +2322,8 @@
msgstr "لقد رفضت الترقية إلى أوبونتو الجديدة"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr "يمكنك الترقية لاحقا بفتح مدير التحديثات والنقر على \"رقِّ\""
@@ -2312,56 +2335,56 @@
msgid "Show and install available updates"
msgstr "أظهر وثبت التحديثات المتوفرة"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "اعرض الإصدارة واخرج"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "المجلد الذي يحتوي ملفات البيانات"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "التمس وجود إصدارة جديدة من أوبونتو"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr "يفحص إن كانت الترقية ممكنة إلى أحدث إصدارة تطوير"
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "رقّ باستخدام آخر نسخة موصى بها لمرقي الإصدار"
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "لا تركز على الخريطة عند البدء"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "حاول تشغيل dist-upgrade"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "لا تلتمس التحديثات عند البدء"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "اختبر الترقية في بيئة محكومة (صندوق رمل)"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "يُجري ترقية جزئية"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr "اعرض وصف الحزمة بدلًا من سجل التغييرات"
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "حاول الترقية إلى أحدث إصدارة باستخدام المحدِّث من $distro-proposed"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2371,11 +2394,11 @@
"حاليا الطوران المدعومان هما 'desktop' للترقية الاعتيادية لنظام سطح مكتب، و "
"'server' لنظم الخواديم."
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "يشغل الواجهة المحددة"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2383,11 +2406,11 @@
"تحقق فقط إذا كان هناك إصدار جديد من التوزيعة متوفرا و أرسل تقريرا خلال كود "
"الخروج"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr "يتحقق من وجود إصدارة جديدة من أبونتو"
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2395,68 +2418,68 @@
"لمعلومات عن الترقية، رجاءً قم بزيارة:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "لا توجد إصدارات أحدث"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "لا تتوفر إصدارات '%s'"
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "شغّل 'do-release-upgrade' للترقية إليه."
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "يتوفر ترقية إلى أوبونتو %(version)s"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "لقد رفضت الترقية إلى أوبونتو %s"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr "أضف مُخرَجات التنقيح"
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr "اعرض الحزم الغير مدعومة على هذا الجهاز"
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr "اعرض الحزم المدعومة على هذا الجهاز"
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr "اعرض كُل الحزم مع حالاتها"
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr "اعرض كُل الحزم في قائمة"
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr "مُلخص حالة الدعم لـ '%s':"
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr "لديك %(num)s حزمة (%(percent).1f%%) مدعومة حتى %(time)s"
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr "لديك %(num)s حزمة (%(percent).1f%%) لم تعد قابلة للتنزيل"
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr "لديك %(num)s حزمة (%(percent).1f%%) غير مدعومة"
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
@@ -2464,79 +2487,145 @@
"شغّل باستخدام --show-unsupported أو --show-supported أو --show-all لرؤية مزيد "
"من التفاصيل"
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr "لم تعد قابلة للتنزيل:"
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr "غير مدعومة: "
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr "مدعومة حتى %s:"
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr "غير مدعومة"
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "طريقة غير مطبقة: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "ملف على القرص"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr "حزمة .deb"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "ثبّت الحزم الناقصة"
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "يجب تثبيت الحزمة %s"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr "حزمة .deb"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "%s تحتاج لتأشيرها على أنها مُثبَّتة يدويا."
-
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
-msgid ""
-"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
-"installed. See bugs.launchpad.net, bug #279621 for details."
-msgstr ""
-"أثناء الترقية، إذا كانت kdelibs4-dev مثبّتة فستحتج تثبيت kdelibs5-dev. راجع "
-"bugs.launchpad.net، علة رقم #279621 لمزيد من التفاصيل."
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
msgid "%i obsolete entries in the status file"
msgstr "%i مدخلات قديمة في ملف الحالة"
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
msgid "Obsolete entries in dpkg status"
msgstr "مدخلات قديمة في حالة dpkg"
#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
msgid "Obsolete dpkg status entries"
msgstr "مدخلات قديمة في حالة dpkg"
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
+msgid ""
+"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
+"installed. See bugs.launchpad.net, bug #279621 for details."
+msgstr ""
+"أثناء الترقية، إذا كانت kdelibs4-dev مثبّتة فستحتج تثبيت kdelibs5-dev. راجع "
+"bugs.launchpad.net، علة رقم #279621 لمزيد من التفاصيل."
+
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
+#, python-format
+msgid "%s needs to be marked as manually installed."
+msgstr "%s تحتاج لتأشيرها على أنها مُثبَّتة يدويا."
+
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr "أزٍل lilo حيث أن grub مثبّت. (راجع العلة #314004 لمزيد من التفاصيل)"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
+
#~ msgid ""
#~ "After your package information was updated the essential package '%s' can "
#~ "not be found anymore so a bug reporting process is being started."
@@ -2544,41 +2633,6 @@
#~ "بعد أن تم تحديث معلومات الحزم، فإن الحزمة الأساسية '%s' لا يمكن العثور "
#~ "عليها بعد الآن، لذلك يجري بدء عملية للإبلاغ عن العلّة."
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "لم تحدد أي تحديثات"
-#~ msgstr[1] "حُدد تحديث واحد"
-#~ msgstr[2] "حُدد تحديثين"
-#~ msgstr[3] "حُددت %(count)s تحديثات"
-#~ msgstr[4] "حُدد %(count)s تحديثا"
-#~ msgstr[5] "حُدد %(count)s تحديث"
-
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
-
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "مرحبًا بك في أوبونتو"
-
-#~ msgid ""
-#~ "These software updates have been issued since this version of Ubuntu was "
-#~ "released."
-#~ msgstr "صدرت هذه التحديثات البرمجية منذ إطلاق هذه الإصدارة من أبونتو."
-
-#~ msgid "Software updates are available for this computer."
-#~ msgstr "تتوفر تحديثات برمجيات لهذا الحاسوب."
-
-#~ msgid "Update Manager"
-#~ msgstr "مدير التحديثات"
-
-#~ msgid "Starting Update Manager"
-#~ msgstr "يبدأ مدير التحديثات"
-
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "أنت متصل عبر مودم لاسلكي."
-
-#~ msgid "_Install Updates"
-#~ msgstr "_ثبت التحديثات"
-
#~ msgid "Checking for a new ubuntu release"
#~ msgstr "يجري التماس إصدارة أحدث من أوبونتو"
diff -Nru update-manager-17.10.11/po/ast.po update-manager-0.156.14.15/po/ast.po
--- update-manager-17.10.11/po/ast.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/ast.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2008.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-03-24 16:02+0000\n"
"Last-Translator: Xandru \n"
"Language-Team: Asturian \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] "%(size).0f kB"
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "Sirvidores pa %s"
@@ -42,20 +43,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Sirvidor principal"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Sirvidores personalizaos"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "Nun pudo calculase la entrada sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -63,11 +64,11 @@
"Nun puede llocalizase dengún paquete, seique nun ye un discu d'Ubuntu o nun "
"ye l'arquiteutura correuta."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "Falló amestar el CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -82,13 +83,13 @@
"El mensax d'error foi:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Desaniciar paquete en mal estáu"
msgstr[1] "Desaniciar paquetes en mal estáu"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -109,15 +110,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "El sirvidor puede tar sobrocargáu"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Paquetes frayaos"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -126,7 +127,7 @@
"software. Por favor ígualo enantes d'usar synaptic o apt-get"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -147,11 +148,11 @@
" * Paquetes de software non oficiales que Ubuntu nun ufre\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "Dablemente seya un problema transitoriu, téntelo otra vegada más sero."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
@@ -159,16 +160,16 @@
"Si denguna d'éstes aplica, entós informa d'esti fallu usando la orde «ubuntu-"
"bug update-manager» nuna terminal."
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "Nun pue calculase l'anovamientu de versión"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "Error autentificando dalgunos paquetes"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -178,7 +179,7 @@
"problema transitoriu na rede. Pruebe otra vegada más sero. Vea abaxo una "
"llista de los paquetes non autenticaos."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -186,22 +187,22 @@
"El paquete '%s' ta conseñáu pa desaniciar, pero ta na llista de non "
"desaniciables."
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "El paquete esencial '%s' ta conseñáu pa desaniciar."
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Intentando instalar la versión prohibida «%s»"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "Nun puede instalase '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
@@ -210,11 +211,11 @@
"«ubuntu-bug update-manager» nuna terminal."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "Nun pudo determinase'l meta-paquete"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -228,15 +229,15 @@
" Por favor, instala un de los paquetes d'abaxo enantes d'usar Synaptic o apt-"
"get."
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Lleendo cache"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "Nun pudo obtenese un bloquéu esclusivu"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -245,11 +246,11 @@
"xestión de paquetes (como apt-get o aptitude). Por favor, pieslla esa "
"aplicación primero."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Nun hai sofitu p'anovar per conexón remota"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -263,11 +264,11 @@
"\n"
"L'anovamientu va parase agora. Inténtalo ensin ssh."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "¿Continuar executando baxo SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -284,11 +285,11 @@
"Si sigues, aniciaráse un degorriu ssh adicional nel puertu «%s».\n"
"¿Quies siguir?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Aniciando sshd adicional"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -299,7 +300,7 @@
"estra nel puertu «%s». Si daqué va mal col ssh n'execución, entá podrás "
"coneutate al estra.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -312,29 +313,29 @@
"abrir el puertu con:\n"
"«%s»"
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Nun se pue anovar"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "Esta ferramienta nun soporta anovamientos de «%s» a «%s»."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Falló la configuración de Sandbox"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "Nun foi dable crear un entornu sandbox."
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Mou Sandbox"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -349,18 +350,18 @@
"*Dengún* de los cambeos escritos nel direutoriu de sistema va ser "
"permanente, dende agora hasta'l siguiente arranque."
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"La so instalación de python ta toyida. Por favor, igüe l'enllaz simbólicu «/"
"usr/bin/python»."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "El paquete 'debsig-verify' ta instaláu"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -370,12 +371,12 @@
"Desinstálalu con synaptic o «apt-get remove debsig-verify» primero y executa "
"l'anovamientu otra vegada."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr "Nun pue escribise en «%s»"
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -386,11 +387,11 @@
"L'anovamientu nun pue continuar.\n"
"Asegúrate de que'l direutoriu de sistema permite escribir."
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "¿Incluyir los caberos anovamientos dende Internet?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -410,16 +411,16 @@
"nuevos anovamientos darréu de pasar a la nueva versión.\n"
"Si respuendes «non» agora, la rede nun s'usará pa nada."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "deshabilitáu nel anovamientu a %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "Nun s'atopó un espeyu válidu"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -439,11 +440,11 @@
"Si escueye «Non» encaboxaráse l'anovamientu."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "¿Xenerar fontes predeterminaes?"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -457,11 +458,11 @@
"Tendríen d'amestase les entraes predeterminaes pa '%s'? Si respuendes 'Non', "
"encaboxaráse l'anovamientu."
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "Información del repositoriu non válida"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
@@ -469,11 +470,11 @@
"L'anovamientu de la información del repositoriu dio como resultáu un ficheru "
"inválidu polo que ta aniciándose un procesu de notificación d'errores."
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "Desactivar fontes de terceres partes"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -483,13 +484,13 @@
"a activales tres l'anovamientu cola ferramienta «Oríxenes del software», o "
"col xestor de paquetes."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "Paquete nun estáu inconsistente"
msgstr[1] "Paquetes nun estáu inconsistente"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -508,11 +509,11 @@
"nun s'alcuentren en dengún repositoriu. Por favor, reinstale los paquetes "
"manualmente o desinstálelos del sistema"
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "Fallu durante l'anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -521,13 +522,13 @@
"rede, polo qu'encamentámoste que compruebes la conexón de rede y tornes a "
"intentalo."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "Nun hai suficiente espaciu llibre en discu"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -542,21 +543,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "Calculando los cambeos"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "¿Quies aniciar l'anovamientu?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "Anovamientu encaboxáu"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -564,12 +565,12 @@
"L'anovamientu va encaboxase agora y el sistema va volver al so estáu "
"orixinal. Pues reanudar l'anovamientu más sero."
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "Nun se puede descargar les actualizaciones"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -580,27 +581,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "Error durante la confirmación"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "Restaurando al estau del sistema orixinal"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "Nun pudieron instalase los anovamientos"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -608,7 +609,7 @@
"Encaboxóse l'anovamientu. Pue que'l sistema quedare nun estáu non usable. "
"Agora, va facese una recuperación (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -625,7 +626,7 @@
"upgrade al informe d'error.\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -633,20 +634,20 @@
"Encaboxóse l'anovamientu. Por favor, comprueba la conexón a Internet o el "
"sofitu d'instalación y vuelvi a intentalo. "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "¿Desaniciar paquetes obsoletos?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Caltener"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "_Esborrar"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -656,27 +657,27 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "Dependencia requería nun ta instalada"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "La dependencia requería «%s» nun ta instalada. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "Comprobando'l xestor de paquetes"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "Falló la tresna del anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -684,11 +685,11 @@
"Hebo un fallu al preparar el sistema pal anovamientu poro, ta arrancando un "
"procesu de notificación de fallos."
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "Falló la tresna del anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -701,68 +702,68 @@
"\n"
"Adicionalmente, ta aniciándose un procesu de notificación d'errores."
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "Anovando información del repositoriu"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "Fallu al amestar el CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "Sentímoslo, nun pudo amestase'l CDROM"
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "Información del paquete nun válida"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "Descargando"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "Anovando"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "Completóse l'anovamientu"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "L'anovamientu completóse pero hebo fallos durante'l procesu."
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "Buscando software obsoletu"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "anovamientu del sistema completáu"
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "L'anovamientu parcial completóse."
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "Ta usándose «evms»"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -772,12 +773,12 @@
"software «evms» yá nun ta sofitáu; por favor, desactívalu y torna a executar "
"de nuevo l'anovamientu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
"El hardware de gráficos nun ye compatible dafechu con Ubuntu 12.04 LTS."
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -789,9 +790,9 @@
"información llei https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
"¿Quies siguir col anovamientu?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -800,8 +801,8 @@
"rendimientu de los xuegos y otros programes qu'usen gráficos de mou "
"intensivu."
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -815,7 +816,7 @@
"\n"
"¿Quier continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -829,11 +830,11 @@
"\n"
"¿Quier continuar?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "La CPU nun ye i686"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -845,11 +846,11 @@
"arquiteutura mínima. Nun ye posible anovar el sistema a una versión nueva "
"d'Ubuntu con esti hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "No ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -861,11 +862,11 @@
"ARMv6 como arquiteutura mínima. Nun ye dable anovar el so sistema a la nueva "
"versión d'Ubuntu con esti hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "El degorriu init nun ta disponible"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -881,15 +882,15 @@
"\n"
"¿Daveres que quies siguir?"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "Anovamientu de prueba usando aufs"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr "Usar la ruta pa guetar un cdrom con paquetes d'anovación"
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -897,58 +898,58 @@
"Usar interfaz d'usuariu. Anguaño disponibles: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr "*OBSOLETU* esta opción va inorase"
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
"Facer namái un anovamientu parcial (nun se reescribirá el «sources.list»)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "Desactiva'l sofitu de pantalla GNU"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "Afitar datadir"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Por favor, inserta '%s' nel dispositivu '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "La descarga completóse"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "Descargando ficheru %li de %li a %sB/s"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "Falten al rodiu de %s"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "Descargando ficheru %li de %li"
@@ -958,27 +959,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "Aplicando cambeos"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "problemes de dependencies - déxase ensin configurar"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "Nun puede istalase '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -990,7 +991,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -999,7 +1000,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -1007,20 +1008,20 @@
"Perderá tolos cambeos que tenga fecho nesi ficheru de configuración si "
"decide sustituyilu por una nueva versión."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "El comandu 'diff' nun fue atopau"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "Ocurrió un error fatal"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -1033,13 +1034,13 @@
"El ficheru sources.list orixinal guardóse en /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "Calcóse Ctrl-C"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -1048,136 +1049,136 @@
"¿Daveres que quier facer eso?"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
"Pa prevenir la perda de datos, zarra toles aplicaciones y documentos "
"abiertos."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "Yá nun ta sofitáu téunicamente por Canonical (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "Desanovar (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "Desaniciar (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "Yá nun fai falta (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "Instalar (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "Anovar (%s)"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "Cambéu de preséu"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "Amosar diferencies >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< Soverar diferencies"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "Fallu"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "&Encaboxar"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "&Zarrar"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "Amosar terminal >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< Soverar terminal"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "Información"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "Detalles"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "Yá nun ta sofitáu %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "Esaniciar %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "Desaniciar (autoinstalóse) %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "Instalar %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "Anovar %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "Necesítase reaniciar"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "Reanicia'l sistema pa completar l'anovamientu"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "_Reaniciar agora"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1189,32 +1190,32 @@
"El sistema podría quedar nun estáu non usable si encaboxa l'anovamientu. "
"Encamentámos-y que siga col anovamientu."
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "¿Encaboxar l'anovamientu?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "%li día"
msgstr[1] "%li díes"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "%li hora"
msgstr[1] "%li hores"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "%li minutu"
msgstr[1] "%li minutos"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1230,7 +1231,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1244,14 +1245,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1261,34 +1262,32 @@
"aproximadamente con un módem de 56k."
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "Esta descarga va tardar aproximadamente %s cola conexón actual. "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "Tresnando l'anovamientu"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "Obteniendo nuevos canales de software"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "Obteniendo paquetes nuevos"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "Instalando los anovamientos"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "Llimpiando"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1305,28 +1304,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "Va desinstalase %d paquete."
msgstr[1] "Van desinstalase %d paquetes."
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "Va instalase %d paquete nuevu."
msgstr[1] "Van instalase %d paquetes nuevos."
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "Va a anovase %d paquete."
msgstr[1] "Van a anovase %d paquetes."
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1337,7 +1336,7 @@
"\n"
"Tienes de descargar un total de %s. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
@@ -1345,7 +1344,7 @@
"Esti anovamientu pue llevar delles hores. Una vegada fine la descarga, el "
"procesu nun pue encaboxase."
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
@@ -1353,53 +1352,53 @@
"Obtener ya instalar l'anovamientu pue llevar delles hores. Una vegada que "
"fine la descarga, el procesu nun pue encaboxase."
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr "La desinstalación de los paquetes pue llevar delles hores. "
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr "El software d'esti equipu ta anováu"
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr ""
"Nun hai anovamientos disponibles pal sistema. Encaboxóse l'anovamientu."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "Necesítase reaniciar"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
"L'anovamientu finó y necesítase reaniciar l'equipu. ¿Quies facelo agora?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "autentificar «%(file)s» escontra «%(signature)s» "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr "estrayendo «%s»"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "Nun pudo executase la ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
@@ -1407,33 +1406,33 @@
"Esto paez ser un fallu na ferramienta d'anovamientu. Informa d'esti fallu "
"usando la orde «ubuntu-bug update-manager»."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "Robla de la ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "Ferramienta d'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "Fallu al descargar"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Falló la baxada del anovamientu. Pue haber un problema cola rede. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "Falló l'autentificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -1441,13 +1440,13 @@
"Falló l'autentificación de l'anovamientu. Ye dable qu'heba un problema cola "
"rede o col sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "Fallu al sacar"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1455,13 +1454,13 @@
"Falló la estraición del anovamientu. Pue haber un problema cola rede o col "
"sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "Falló la verificación"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1469,15 +1468,15 @@
"Falló la verificación del anovamientu. Pue haber un problema cola rede o col "
"sirvidor. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "Nun puede executase l'anovamientu"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -1485,13 +1484,13 @@
"Esto davezu cáusalo un sistema nel que /tmp se montó como non executable. "
"Vuelvi a montalu ensin «noexec» y executa otra vuelta l'anovamientu."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "El mensax de fallu ye «%s»"
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1503,73 +1502,73 @@
"El ficheru sources.list original atroxóse en /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "Albortando"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "Pa quitar:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "Pa continuar, calca Intro"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "Siguir [sN] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "Detalles [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "s"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "n"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "d"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "Yá nun ta sofitáu: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "Quitar: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "Instalar: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "Anovar: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "Continuar [Sn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1636,9 +1635,8 @@
msgstr "Anovamientu de la distribución"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-#, fuzzy
-msgid "Upgrading Ubuntu to version 12.10"
-msgstr "Anovar Ubuntu a la versión 11.10"
+msgid "Upgrading Ubuntu to version 12.04"
+msgstr "Anovando Ubuntu a la versión 12.04"
#: ../DistUpgrade/DistUpgrade.ui.h:20
msgid " "
@@ -1656,84 +1654,85 @@
msgid "Terminal"
msgstr "Terminal"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "Por favor, aguarde; esto pue llevar un tiempu."
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "Anovamientu completáu"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "Nun s'alcontraron les notes de publicación"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "Puede que'l sirvidor tea sobrocargáu. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "Nun pudieron descargase les notes d'espublización"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "Por favor, comprueba la conexón a Internet."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "Anovar"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "Notes de la versión"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "Descargando ficheros de paquetes adicionales..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "Ficheru %s de %s a %sB/s"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "Ficheru %s de %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "Abrir vínculu nel restolador"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "Copiar vínculu nel Cartafueyu"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Descargando ficheru %(current)li de %(total)li a %(speed)s/s"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "Descargando ficheru %(current)li de %(total)li"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "La to versión d'Ubuntu yá nun tien sofitu téunicu."
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
@@ -1741,53 +1740,59 @@
"Nun recibirás más igües de seguridá o anovamientos críticos. Anueva a una "
"versión posterior d'Ubuntu."
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "Información d'anovamientu"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "Instalar"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr "Nome"
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "Versión %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
"Nun se deteutaren conexones de rede, nun pue descargase la información del "
"rexistru de cambeos."
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "Descargando la llista de cambeos..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr "_Deseleicionar too"
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr "Seleicion_ar too"
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "Hai %(count)s anovamientu esbilláu."
+msgstr[1] "Hai %(count)s anovamientos esbillaos."
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "Va descargase %s."
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
msgstr[0] "L'anovamientu yá se descargó, pero nun s'instaló."
msgstr[1] "Los anovamientos yá se descargaron, pero nun s'instalaron."
@@ -1795,11 +1800,18 @@
msgid "There are no updates to install."
msgstr "Nun hai anovamientos pa instalar."
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "Desconozse'l tamañu de descarga."
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
@@ -1807,7 +1819,7 @@
"Nun se sabe cuándo foi la cabera vegada que s'anovó la información del "
"paquete. Calca'l botón «Comprobar» p'anovar la información."
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1818,14 +1830,14 @@
"calca'l botón «Comprobar» d'abaxo pa comprobar nuevos anovamientos de "
"software."
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] "La información del paquete anovóse fai %(days_ago)s día."
msgstr[1] "La información del paquete anovóse fai %(days_ago)s díes."
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1838,34 +1850,46 @@
"%(hours_ago)s hores."
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr "La información de los paquetes anovóse fai %s minutos."
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr "La información de los paquetes acaba d'anovase."
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+"Los anovamientos de software igüen fallos, desanicien vulnerabilidaes de "
+"seguridá y apurren nueves funcionalidaes."
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "Puen esistir anovamientos disponibles pal equipu."
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
-msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "Bienveníu a Ubuntu"
-#: ../UpdateManager/UpdateManager.py:700
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
+"Estos anovamientos de software s'asoleyaron dende que se llanzó esta versión "
+"d'Ubuntu."
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
+msgstr "Hai anovamientos de software disponibles para esti ordenador."
+
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1877,7 +1901,7 @@
"la to papelera y esborra paquetes temporales d'instalaciones usando 'sudo "
"apt-get clean'."
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1885,23 +1909,23 @@
"L'equipu necesita reaniciase pa finar l'anovamientu. Guarda tolos trabayos "
"enantes de continuar."
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "Lleendo información de paquete"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "Coneutando…"
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr "Nun puedes verificar anovamientos o baxar nuevos anovamientos."
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "Nun pudo anicializase la información de los paquetes"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1915,7 +1939,7 @@
"Por favor, informe d'ésto como un fallu nel paquete «update-manager» ya "
"incluya'l siguiente mensax de fallu:\n"
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1927,31 +1951,31 @@
"Por favor, informe d'ésto como un fallu nel paquete «update-manager» ya "
"incluya'l siguiente mensax de fallu:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (Instalación nueva)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(Tamañu: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "De la versión %(old_version)s a la %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "Versión %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "L'anovamientu de versión nun ye posible nesti intre"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
@@ -1960,21 +1984,21 @@
"L'anovamientu de versión nun ye posible nesti intre, inténtalo más sero. El "
"sirvidor informó: «%s»"
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "Descargar la ferramienta d'anovamientu del llanzamientu"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "Nueva versión d'Ubuntu '%s' disponible"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "L'índiz de software ta frañáu"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1984,6 +2008,17 @@
"de paquetes «Synaptic», o execute «sudo apt-get install -f» nuna terminal, "
"pa correxir esti problema primero."
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "Ta disponible la nueva versión «%s»."
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "Encaboxar"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr "Guetar anovamientos"
@@ -1993,22 +2028,18 @@
msgstr "Instalar tolos anovamientos disponibles"
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "Encaboxar"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr "Rexistru de cambeos"
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr "Anovamientos"
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "Construyendo llista d'anovamientos"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -2032,20 +2063,20 @@
" * Paquetes non oficiales de software, non provistos por Ubuntu\n"
" * Cambeos normales nuna versión de pre-llanzamientu d'Ubuntu"
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "Descargando l'informe de cambeos"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "Otros anovamientos (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr "Esti anovamientu nun vien d'una fonte que soporte rexistru de cambeos."
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -2053,7 +2084,7 @@
"Hebo un fallu al descargar la llista de cambeos. \n"
"Comprueba la conexón a Internet."
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -2066,7 +2097,7 @@
"Versión disponible: %s\n"
"\n"
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -2079,7 +2110,7 @@
"Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"hasta que los cambeos tén disponibles, o prebe de nuevu más sero."
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -2092,52 +2123,43 @@
"Por favor, use http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"hasta que los cambeos tean disponibles, o téntelo más sero."
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "Fallu al deteutar la distribución"
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "Hebo un fallu «%s» mientres se comprobaba qué sistema ta usando."
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "Anovamientos importantes de seguridá"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "Anovamientos encamentaos"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Anovamientos propuestos (proposed)"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "Backports"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "Anovamientos de la distribución"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "Otros anovamientos"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "Aniciando Update Manager"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr ""
-"Los anovamientos de software igüen fallos, desanicien vulnerabilidaes de "
-"seguridá y apurren nueves funcionalidaes."
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "_Anovamientu parcial"
@@ -2209,37 +2231,27 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "Anovamientos de software"
+msgid "Update Manager"
+msgstr "Xestor d'anovamientos"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Anovamientos de software"
+msgid "Starting Update Manager"
+msgstr "Aniciando'l Xestor d'anovamientos"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "_Anovar"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "anovamientos"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "Instalar"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "Cambeos"
+msgid "updates"
+msgstr "anovamientos"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "Descripción"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "Descripción del anovamientu"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
@@ -2247,24 +2259,34 @@
"Agora tas coneutáu n'itinerancia y pues tener cargos polos datos consumíos "
"nesti anovamientu."
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "Tas coneutáu vía módem inalámbricu."
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
"Ye conveniente coneutar l'equipu a la toma de corriente enantes d'anovar."
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "_Instalar anovamientos"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "Cambeos"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr "_Configuración..."
+msgid "Description"
+msgstr "Descripción"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "Instalar"
+msgid "Description of update"
+msgstr "Descripción del anovamientu"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr "_Configuración..."
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2287,9 +2309,8 @@
msgstr "Decidisti non anovar a la nueva versión d'Ubuntu"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
"Puedes anovar más alantre abriendo'l Xestor d'anovamientos y calcando en "
@@ -2303,57 +2324,57 @@
msgid "Show and install available updates"
msgstr "Amosar ya instalar los anovamientos disponibles"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "Amosar la versión y salir"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "Direutoriu que contién los ficheros de datos"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "Comprobar si esiste una versión nueva d'Ubuntu"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr "Comprobar si ye dable anovar a la cabera versión de desendolcu"
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "Anovar usando la versión más recién propuesta pol anovador"
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "Nun poner el focu sobro'l mapa cuando s'anicie"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "Tente d'executar dist-upgrade"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "Nun comprobar anovamientos al aniciar"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "Comprobar l'anovamientu nuna capa aufs de caxa de sable (sandbox)"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "Executando un anovamientu parcial"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr "Amosar la descripción del paquete en cuenta de la llista de cambeos"
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
"Intenta anovar a la cabera versión usando l'anovador de $distro-proposed"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2363,11 +2384,11 @@
"Anguaño sofiténse los moos «desktop» (p'anovamientos normales d'un sistema "
"d'escritoriu) y «server» (pa sirvidores)."
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "Executar la interface especificada"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2375,11 +2396,11 @@
"Namái comprueba si ta disponible una nueva versión de la distribución ya "
"informa del resultáu per aciu d'un códigu de salida"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr "Comprobar si hai una versión nueva d'Ubuntu"
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2387,68 +2408,68 @@
"Pa saber más tocante a esti anovamientu, visita:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "Nun s'alcontró denguna edición nueva"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "Ta disponible la nueva versión «%s»."
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Executar 'do-release-upgrade' p'anovase a élli."
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ta disponible l'anovamientu de versión a Ubuntu %(version)s"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Decidisti nun anovar a Ubuntu %s"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr "Amestar resultáu de la depuración"
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr "Amosar paquetes ensin sofitu nesta máquina"
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr "Amosar paquetes con sofitu nesta máquina"
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr "Amosar tolos paquetes colos sos estaos"
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr "Amosar tolos paquetes nuna llista"
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr "Resume d'estáu de sofitu de «%s»:"
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr "Tienes %(num)s paquetes (%(percent).1f%%) con sofitu hasta %(time)s"
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr "Tienes %(num)s paquetes (%(percent).1f%%) que nun puen descargase más"
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr "Tienes %(num)s paquetes (%(percent).1f%%) ensin sofitu"
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
@@ -2456,124 +2477,154 @@
"Executa con --show-unsupported, --show-supported o --show-all pa ver más "
"detalles"
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr "Nun puen descargase más:"
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr "Ensin sofitu téunicu: "
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr "Con sofitu téunicu hasta %s:"
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr "Ensin sofitu téunicu"
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "Métodu non implementáu: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "Un ficheru en discu"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr "paquete .deb"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "Instalar paquete que falta."
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "Ha instalase'l paquete %s"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr "paquete .deb"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "Tien de conseñase %s como instaláu manualmente."
-
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
-msgid ""
-"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
-"installed. See bugs.launchpad.net, bug #279621 for details."
-msgstr ""
-"Al anovar, si kdelibs4-dev ta instaláu, hai qu'instalar tamién kdelibs5-"
-"dev. Llea bugs.launchpad.net , bug #279621 pa más detalles"
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
msgid "%i obsolete entries in the status file"
msgstr "%i entraes obsoletes nel ficheru d'estáu"
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
msgid "Obsolete entries in dpkg status"
msgstr "Entraes obsoletes n'estáu de dpkg"
#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
msgid "Obsolete dpkg status entries"
msgstr "Entraes d'estáu dpkg obsoletes"
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
+msgid ""
+"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
+"installed. See bugs.launchpad.net, bug #279621 for details."
+msgstr ""
+"Al anovar, si kdelibs4-dev ta instaláu, hai qu'instalar tamién kdelibs5-"
+"dev. Llea bugs.launchpad.net , bug #279621 pa más detalles"
+
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
+#, python-format
+msgid "%s needs to be marked as manually installed."
+msgstr "Tien de conseñase %s como instaláu manualmente."
+
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
"Desaníciase LILO yá que GRUB tamién ta instaláu (Consulte'l bug #314004 pa "
"más información.)"
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore so a bug reporting process is being started."
-#~ msgstr ""
-#~ "Dempués de que la información del paquete s'anovare, nun s'alcuentra'l "
-#~ "paquete esencial «%s», polo que ta aniciándose un procesu de notificación "
-#~ "d'errores."
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
-#~ msgid "Upgrading Ubuntu to version 12.04"
-#~ msgstr "Anovando Ubuntu a la versión 12.04"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "Hai %(count)s anovamientu esbilláu."
-#~ msgstr[1] "Hai %(count)s anovamientos esbillaos."
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "Bienveníu a Ubuntu"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid ""
-#~ "These software updates have been issued since this version of Ubuntu was "
-#~ "released."
+#~ "After your package information was updated the essential package '%s' can "
+#~ "not be found anymore so a bug reporting process is being started."
#~ msgstr ""
-#~ "Estos anovamientos de software s'asoleyaron dende que se llanzó esta "
-#~ "versión d'Ubuntu."
-
-#~ msgid "Software updates are available for this computer."
-#~ msgstr "Hai anovamientos de software disponibles para esti ordenador."
-
-#~ msgid "Update Manager"
-#~ msgstr "Xestor d'anovamientos"
-
-#~ msgid "Starting Update Manager"
-#~ msgstr "Aniciando'l Xestor d'anovamientos"
-
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "Tas coneutáu vía módem inalámbricu."
-
-#~ msgid "_Install Updates"
-#~ msgstr "_Instalar anovamientos"
+#~ "Dempués de que la información del paquete s'anovare, nun s'alcuentra'l "
+#~ "paquete esencial «%s», polo que ta aniciándose un procesu de notificación "
+#~ "d'errores."
#~ msgid "Checking for a new ubuntu release"
#~ msgstr "Comprobar si hai una nueva versión d'Ubuntu"
@@ -2672,6 +2723,9 @@
#~ "update-manager» nuna terminal ya inclúi los ficheros de /var/log/dist-"
#~ "upgrade/ nel informe de fallu."
+#~ msgid "Upgrading Ubuntu to version 11.10"
+#~ msgstr "Anovar Ubuntu a la versión 11.10"
+
#~ msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04."
#~ msgstr ""
#~ "Paez que'l to hardware gráficu nun tien sofitu ensembre n'Ubuntu 11.04."
diff -Nru update-manager-17.10.11/po/az.po update-manager-0.156.14.15/po/az.po
--- update-manager-17.10.11/po/az.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/az.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2006.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2011-04-06 21:02+0000\n"
"Last-Translator: Emin Mastizadeh \n"
"Language-Team: Azerbaijani \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "%s üçün Server"
@@ -42,20 +43,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Əsas server"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Şəxsi Server"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr ""
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -63,11 +64,11 @@
"Heçbir paket faylı tapılmadı, bu ya Ubuntu Diski deyil ya da quruluşu "
"səhvdir."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "CD-ni əlavə etmək mümkün olmadı"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -82,13 +83,13 @@
"Xəta məlumatı bu idi:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Pis (xarab) vəziyyətdə olan paketi sil."
msgstr[1] "Pis (xarab) vəziyyətdə olan paketləri sil."
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -109,15 +110,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "Server həddən artıq yüklənmiş ola bilər"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Xarab paketlər"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -126,7 +127,7 @@
"əvvəlcə onları synaptic və ya apt-get ilə düzəldin."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -147,66 +148,66 @@
"* Ubuntu tərəfəindən təmin olunmayan qeyrirəsmi proqram paketləri\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr ""
"Böyük ehtimalla, bu keçici problemdir. Xahiş edirik 1 az sonra cəhd edin"
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "Təzələmə hesablana bilmədi"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' qurula bilmir"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "Meta-paketlər müəyyən olunabilmədi"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -215,15 +216,15 @@
"before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Arxiv oxunur"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "Eksklüziv Qıfılı almaq olmur"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -232,11 +233,11 @@
"kimi) artıq işlədiyi mənasına gəlir. Xahiş olunur əvvəlcə o programı "
"bağlayın."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Uzaqdan idarəetmə ilə yenilənmə mümkün deyildir"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -245,11 +246,11 @@
"The upgrade will abort now. Please try without ssh."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "SSH altında işləməyə davam edilsin?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -260,11 +261,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Əlavə sshd başladılır"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -272,7 +273,7 @@
"still connect to the additional one.\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -281,29 +282,29 @@
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Yenilənmək mümkün deyil"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -313,28 +314,28 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
"run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -342,11 +343,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -358,16 +359,16 @@
"If you answer 'no' here, the network is not used at all."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -380,11 +381,11 @@
msgstr ""
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -393,34 +394,34 @@
"will cancel."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "Saxlanc məlumatı xətalıdır"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -433,23 +434,23 @@
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "Yeniləmə vaxtı xəta"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "Kifayət qədər boş disk sahəsi yoxdur"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -460,32 +461,32 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr ""
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "Sistemin yenilənməsini başlamaq istəyirsinizmi?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "Yeniləmələr endirilə bilmədi"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -493,33 +494,33 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "Yeniləmələr qurula bilmədi"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -530,26 +531,26 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Saxla"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "_Sil"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -557,37 +558,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "Paket idarəçisi yoxlanır"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "Yeniləmənin hazırlanması alınmadı"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -595,79 +596,79 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "Saxlanc məlumatı yenilənir"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "Xətalı paket məlumatı"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "Yenilənir"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "Sistemin yenilənməsi başa çatdı."
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
"again when this is done."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -675,16 +676,16 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -693,7 +694,7 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -702,11 +703,11 @@
"Do you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -714,11 +715,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -726,11 +727,11 @@
"Ubuntu release with this hardware."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -740,71 +741,71 @@
"Are you sure you want to continue?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr ""
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Xaiş olunur '%s' mənbəyini '%s' sürücüsünə yerləşdirin"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "Paketlərin alınması başa çatdı"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "Təxminən %s qalıb"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr ""
@@ -814,27 +815,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "Dəyişikliklər tətbiq olunur"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "'%s' qurula bilmədi"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -844,7 +845,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -855,26 +856,26 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "'dif' əmri tapılmadı"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -882,148 +883,148 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
msgstr ""
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr ""
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "Terminalı Göstər >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "Təfsilatlar"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "%s paketini təzələ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr ""
"Təzələməni başa çatdırmaq üçün sistemi yenidən başladın"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "İndi _yenidən başlad"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1031,32 +1032,32 @@
"strongly advised to resume the upgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "Təzələmə Dayandırılsın?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1072,7 +1073,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr ""
@@ -1086,14 +1087,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr ""
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1101,34 +1102,32 @@
msgstr ""
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr ""
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "Təmizlənir"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1141,28 +1140,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "%d paket silinəcək"
msgstr[1] "%d paket silinəcək"
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "%d yeni paket qurulacaq"
msgstr[1] "%d yeni paket qurulacaq"
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "%d paket təzələnəcək"
msgstr[1] "%d paket təzələnəcək"
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1170,147 +1169,147 @@
"You have to download a total of %s. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr "Sisteminiz üçün heç bir təzələmə yoxdur. Təzələmə indi dayandırılacaq."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "Sistemin yenidən başladılması vacibdir"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
"Təzələmə başa çatdı sistemi təzədən başlatmaq lazımdır. Siz bunu indi etmək "
"istəyirsinizmi?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "Təzələmə alətini işlətmək olmadı"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "Təzələmə aləti"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "Alına bilmədi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "İxrac edilə bilmədi"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1318,73 +1317,73 @@
"Your original sources.list was saved in /etc/apt/sources.list.distUpgrade."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr ""
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr ""
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr ""
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1442,7 +1441,7 @@
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:19
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1461,166 +1460,180 @@
msgid "Terminal"
msgstr "Terminal"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "Xaiş olunur gözləyin, bu bir qədər vaxt alacaq."
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "Yeniləmə başa çatdı"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "Buraxılış qeydləri tapılmadı"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "Server yüklənmiş ola bilər. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "Buraxılış qeydləri endirilə bilmədi"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "İnternet əlaqənizi yoxlayın."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr ""
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr ""
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr ""
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "%(total)li fayldan %(current)li endirilir"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "%s versiyası: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "Dəyişikliklərin siyahısı endirilir..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr ""
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] ""
+msgstr[1] ""
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr ""
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "Server yüklənmiş ola bilər. "
-msgstr[1] "Server yüklənmiş ola bilər. "
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
"Press the 'Check' button below to check for new software updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1629,34 +1642,42 @@
msgstr[1] ""
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
-msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1664,29 +1685,29 @@
"temporary packages of former installations using 'sudo apt-get clean'."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1695,7 +1716,7 @@
"following error message:\n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1703,52 +1724,52 @@
"following error message:"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(Həcm: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "%s versiyası"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
"The server reported: '%s'"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1758,6 +1779,16 @@
"qaldımaq üçün öncə \"Synaptic\" paket idarəçisindən istifadə edin və ya "
"terminalda \"sudo apt-get install -f\" əmrini icra edin."
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+msgid "New hardware support is available"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr ""
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr ""
@@ -1767,22 +1798,18 @@
msgstr ""
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr ""
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1796,26 +1823,26 @@
" * Normal changes of a pre-release version of Ubuntu"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -1824,7 +1851,7 @@
"\n"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -1833,7 +1860,7 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -1842,48 +1869,41 @@
"until the changes become available or try again later."
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "Vacib təhlükəsizlik yeniləmələri"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "Məsləhət görülən yeniləmələri"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Təklif olunan yeniləmələr"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr ""
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "Distributiv yeniləmələri"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "Digər yeniləmələri"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Təzələmə başladılsın?"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
+msgid "Starting Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:3
@@ -1944,57 +1964,58 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-msgid "Software Updater"
-msgstr ""
+msgid "Update Manager"
+msgstr "Yeniləmə İdarəçisi"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "_Təzələ"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "yeniləmələr"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+msgid "I_nstall"
+msgstr ""
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "Dəyişikliklər"
+msgid "updates"
+msgstr "yeniləmələr"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "İzah"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "Distributiv yeniləmələri"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
msgstr ""
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
msgstr ""
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "Yeniləmələri _Qur"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "Dəyişikliklər"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr ""
+msgid "Description"
+msgstr "İzah"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "İndi _yenidən başlad"
+msgid "Description of update"
+msgstr ""
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr ""
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2018,7 +2039,7 @@
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
@@ -2030,222 +2051,282 @@
msgid "Show and install available updates"
msgstr "Mövcud yeniləmələri göstər və qur"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr ""
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr ""
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr ""
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr ""
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr ""
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr ""
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr ""
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr ""
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr ""
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
"for server systems are supported."
msgstr ""
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr ""
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
msgstr ""
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
msgstr ""
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr ""
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr ""
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr ""
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr ""
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr ""
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr ""
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr ""
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ""
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr ""
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr ""
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
+#, python-format
+msgid "%i obsolete entries in the status file"
msgstr ""
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
msgstr ""
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr ""
+
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
+msgid "%s needs to be marked as manually installed."
msgstr ""
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
+msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
msgstr ""
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
-msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
msgstr ""
-#~ msgid "Update Manager"
-#~ msgstr "Yeniləmə İdarəçisi"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "_Install Updates"
-#~ msgstr "Yeniləmələri _Qur"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
diff -Nru update-manager-17.10.11/po/be.po update-manager-0.156.14.15/po/be.po
--- update-manager-17.10.11/po/be.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/be.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2006.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-04-13 00:57+0000\n"
"Last-Translator: Soltan Dzmitry \n"
"Language-Team: Belarusian \n"
@@ -21,7 +22,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -30,13 +31,13 @@
msgstr[2] "%(size).0f КБ"
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f МБ"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "Сервер для %s"
@@ -44,20 +45,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Галоўны сервер"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Адмысловыя серверы"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "Немагчыма разлічыць запіс sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -65,11 +66,11 @@
"Немагчыма адшукаць ніводнага файла з пакетам, верагодна, гэты дыск не "
"з'яўляецца Ubuntu ці мае іншую архітэктуру."
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "Немагчыма дадаць дыск"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -84,14 +85,14 @@
"Тэкст памылкі:\n"
"\"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Выдаліць пакет, пазначаны як памылковы"
msgstr[1] "Выдаліць пакеты, пазначаныя як памылковыя"
msgstr[2] "Выдаліць пакеты ў кепскім стане"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -113,15 +114,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "Магчыма сервер перагружаны"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Пакеты з памылкамі"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -131,7 +132,7 @@
"перш чым працягваць."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -152,11 +153,11 @@
" * неафіцыйных праграм, якія не пастаўляюцца з Ubuntu\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "Магчыма, гэта часовая праблема. Паспрабуйце паўтарыць пазней."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
@@ -164,16 +165,16 @@
"Калі з прапанаванага нічога не пасуе, калі ласка, адпраўце гэту справаздачу, "
"выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'"
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "Немагчыма падлічыць абнаўленне"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "Памылка аўтэнтыфікацыі некаторых пакетаў"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -183,28 +184,28 @@
"праблемы з сеткай. Вы можаце паспрабаваць паўтарыць дзеяньне пазней. "
"Глядзіце ніжэй спіс неаўтэнтыфікаваных пакетаў."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "Пакет “%s“ пазначаны для выдалення, але ён у чорным спісе выдалення."
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Важны пакет “%s“ пазначаны для выдалення."
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Спроба ўсталёўкі ўнесенай у чорны спіс версіі '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "Немагчыма ўсталяваць \"%s\""
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
@@ -213,11 +214,11 @@
"выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'"
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "Немагчыма вызначыць мета-пакет"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -231,15 +232,15 @@
"Калі ласка, найперш усталюйце адзін з вышэй узгаданых пакетаў з дапамогай "
"synaptic ці apt-get."
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Чытанне кэша"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "Памылка пры праверцы аўтэнтычнасці некаторых пакетаў"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -247,11 +248,11 @@
"Звычайна, гэта азначае, што іншы кіраўнік пакетаў (напрыклад apt-get ці "
"aptitude) ужо працуе. Калі ласка, закройце іншае дастасаванне."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Апгрэйд праз аддаленае падлучэнне не падтрымліваецца"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -264,11 +265,11 @@
"\n"
"Абнаўленне прыпынена. Паспрабуйце без ssh."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "Працягваць выкананне праз SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -284,11 +285,11 @@
"Калі Вы працягнеце, дадатковая служба ssh будзе запушчана на порце «%s».\n"
"Жадаеце працягнуць?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Запуск дадатковай sshd"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -299,7 +300,7 @@
"запушчаная дадатковая служба sshd. Калі нешта здарыцца, з дапамогай ssh Вы "
"зможаце далучыцца да дадзенай службы.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -312,29 +313,29 @@
"можаце адкрыць наступны спосабам:\n"
"«%s» порт."
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Немагчыма абнавіць"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "Абнаўленне ад '%s' да '%s' не падтрымліваецца дадзенай прыладай."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Усталёўка бяспечнага асяроддзя не атрымалася"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "Не атрымалася стварыць бяспечнае асяроддзе."
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Рэжым бяспечнага асяроддзя («пясочніцы»)"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -349,18 +350,18 @@
"Да наступнай перазагрузкі ніякіх зменаў у сістэмным каталогу праводзіцца не "
"будзе."
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"Python усталяваны некарэктна. Калі ласка, выпраўце сімвалічную спасылку \"/"
"usr/bin/python\"."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "Пакет 'debsig-verify' усталяваны"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -370,12 +371,12 @@
"Спачатку выдаліце яго ў Synaptic або з дапамогай 'apt-get remove debsig-"
"verify' і запуьціце абнаўленне ізноў."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr "Немагчыма запісаць у '%s'"
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -386,11 +387,11 @@
"можа працягвацца.\n"
" Калі ласка, пераканайцеся ў наяўнасці доступу да сістэмнага каталога."
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "Загрузіць апошнія абнаўленні з інтэрнэту?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -410,16 +411,16 @@
"усталяваць апошнія абнаўленні як мага хутчэй.\n"
"Калі вы адкажаце «Не», то абнаўленні праз Інтэрнет загружаны ня будуць."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "заблакавана пры абнаўленні да %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "Не знойдзена ніводнага дзейснага люстэрка"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -440,11 +441,11 @@
"Калі ж Вы абярэце «Не», то абнаўленне будзе адменена."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "Згенераваць крыніцы па змаўчанні?"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -456,21 +457,21 @@
"\n"
"Дадаць стандартны запіс для '%s'? Выбар «Не» азначае адмову ад абнаўлення."
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "Інфармацыя аб сховішчы няслушная"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "Зыходнікі ад трэціх бакоў - адключаныя"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -480,14 +481,14 @@
"зможаце іх зноў уключыць пасля абнаўлення з дапамогай утыліты «Крыніцы "
"ўсталёўкі» альбо вашага мэнэджара пакункаў."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "Пакунак у нестабільным стане"
msgstr[1] "Пакункі ў няўстойлівым стане"
msgstr[2] "Пакункаў у наўстойлівым стане"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -510,11 +511,11 @@
"знойдзены адпаведныя архівы. Калі ласка, пераўсталюйце гэтыя пакункі уручную "
"альбо выдаліце іх з сістэмы."
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "Памылка падчас абнаўлення"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -522,13 +523,13 @@
"Пры абнаўленні паўстала праблема. Звычайна гэта бывае выклікана праблемамі ў "
"сетцы. Праверце сеткавыя злучэнні і паспрабуйце яшчэ."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "Бракуе дыскавае прасторы"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -543,21 +544,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "Падлічыць змены"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "Ці жадаеце пачаць абнаўленне?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "Абнаўленне скасавана"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -565,12 +566,12 @@
"Гэта абнаўленне будзе зараз скасавана і адбудзецца аднаўленне зыходнага "
"стану сістэмы. Вы можаце працягнуць гэта абнаўленне пазней."
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "Не атрымалася загрузіць абнаўленні"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -581,27 +582,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "Памылка пры фіксаванні"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "Аднаўленне першапачатковага стану сістэмы"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "Немагчыма ўсталяваць абнаўленні"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -610,7 +611,7 @@
"для нармальнага выкарыстання. Зараз будзе запушчаны працэс аднаўлення (dpkg "
"--configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -621,7 +622,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -629,20 +630,20 @@
"Абнаўленне спыненае. Калі ласка праверце злучэнне з Інтэрнэтам, альбо іншую "
"крыніцу ўсталёўкі і паспрабуйце зноў. "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "Выдаліць састарэлыя пакеты?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "За_хаваць"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "_Выдаліць"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -650,37 +651,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "Неабходныя залежнасці не ўсталяваныя"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Неабходныя залежнасці \"%s\" не ўсталяваныя. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "Праверка мэнэджара пакетаў"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "Збой падрыхтоўкі да абнаўлення"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "Падрыхтоўка да абнаўлення завяршылася няўдала"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -688,69 +689,69 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "Абнаўленне інфармацыі аб сховішчы"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "Дадаванне кампакт-дыска завяршылася няўдала"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "Выбачайце, даданне кампакт-дыска завяршылася няўдала."
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "Некарэктная інфармацыя аб пакеце"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "Атрыманне"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "Абнаўленне"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "Абнаўленне скончана"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Абнаўленне скончана, аднак падчас працэсу абнаўлення здарыліся памылкі."
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "Пошук састарэлых праграм"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "Абнаўленне сістэмы завершана"
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "Частковае абнаўленне завершана."
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms ужываецца"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -760,11 +761,11 @@
"'evms' болей не падтрымліваецца. Калі ласка, зачыніце яе і запусціце "
"абнаўленне зноў."
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -772,9 +773,9 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -782,8 +783,8 @@
"Абнаўленне можа выклікаць зніжэнне якасці эфектаў працоўнага стала і "
"прадукцыйнасці ў гульнях і праграмах, што актыўна выкарыстоўваюць графіку."
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -796,7 +797,7 @@
"\n"
"Працягнуць?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -810,11 +811,11 @@
"\n"
"Працягнуць?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "Няма i686-сумяшчальнага працэсара"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -826,11 +827,11 @@
"архітэктуру i686 і вышэй. Абнавіць вашу сістэму да новай версіі Ubuntu на "
"гэтым кампутары не атрымаецца."
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "Няма працэсара ARMv6"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -842,11 +843,11 @@
"ARMv6 і вышэй. Вашу сістэму немагчыма абнавіць да новага рэлізу Ubuntu з "
"бягучым апаратным забеспячэннем."
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "Служба init недаступна"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -860,16 +861,16 @@
"\n"
"Вы ўпэўнены, што хочаце працягнуць?"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "Абнаўленне ў бяспечным асяроддзі з дапамогай aufs"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
"Выкарыстоўваць дадзены шлях для пошука кампакт-дыска з пакункамі абнаўленняў."
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -877,58 +878,58 @@
"Выкарстоўваць інтэрфэйс. Зараз даступны: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr "Гэты параметр САСТАРЭЎ і не будзе ўлічвацца"
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
"Падрыхтаваць толькі частковае абнаўленне (sources.list ня будзе перазапісаны)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "Адключыць падтрымку экрана GNU"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "Наладзіць каталог з дадзенымі"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Калі ласка, устаўце \"%s\" у прыладу \"%s\""
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "Загрузка скончана"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "Загрузка файла %li з %li на хуткасці %sБайт/с"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "Засталося прыблізна %s"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "Загрузка файла %li з %li"
@@ -938,27 +939,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "Ужыванне зменаў"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "праблемы залежнасьцяў — пакідаем неналаджанымі"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "Немагчыма ўсталяваць \"%s\""
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -971,7 +972,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -982,7 +983,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -990,20 +991,20 @@
"Вы страціце ўсе змены, якія зрабілі ў гэтым файле канфігурацыі, калі "
"заменіце яго новай версіяй."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "Ня знойдзена праграма \"diff\""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "Адбылася крытычная памылка"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -1016,13 +1017,13 @@
"Ваш арыгінальны файл sources.list быў захаваны ў /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "націснута Ctrl-c"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -1031,135 +1032,135 @@
"Вы сапраўды хочаце зрабіць гэта ?"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
"Каб пазбегнуць страты дадзеных, зачыніце ўсе адчыненыя праграмы і дакументы."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "Больш не падтрымліваецца Canonical (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "Усталяванне старой версіі (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "Выдаліць (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "Больш не патрэбны (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "Усталяваць (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "Абнавіць (%s)"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "Змена носьбіта"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "Паказаць адрозненні >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< Схаваць адрозненні"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "Памылка"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "&Скасаваць"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "&Зачыніць"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "Паказаць тэрмінал >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< Схаваць тэрмінал"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "Інфармацыя"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "Дэталі"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "Больш не падтрымліваецца (%s)"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "Выдаліць %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "Выдаліць %s (было ўсталявана аўтаматычна)"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "Усталёўка %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "Абнаўленне %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "Патрабуецца перазагрузка"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "Перагрузіце сістэму для завяршэння абнаўлення"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "Пера_запусціць"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1170,11 +1171,11 @@
"Калі вы перапыніце абнаўленне, сістэма можа працаваць нестабільна. "
"Настойліва рэкамендуем працягваць абнаўленне."
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "Скасаваць абнаўленне?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
@@ -1182,7 +1183,7 @@
msgstr[1] "%li дні"
msgstr[2] "%li дзён"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
@@ -1190,7 +1191,7 @@
msgstr[1] "%li гадзіны"
msgstr[2] "%li гадзін"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
@@ -1198,7 +1199,7 @@
msgstr[1] "%li хвіліны"
msgstr[2] "%li хвілін"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1215,7 +1216,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1229,14 +1230,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1246,34 +1247,32 @@
"злучэнні на хуткасці 56Кбіт."
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "Загрузка працягнецца прыкладна %s на Вашам далучэнні. "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "Падрыхтоўка да абнаўлення"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "Змена крыніц усталёўкі"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "Атрымаць новыя пакеты"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "Усталяваць абнаўленні"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "Ачыстка"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1293,7 +1292,7 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
@@ -1301,7 +1300,7 @@
msgstr[1] "%d пакеты будзе выдалена."
msgstr[2] "%d пакетаў будзе выдалена."
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
@@ -1309,7 +1308,7 @@
msgstr[1] "%d новых пакеты будзе ўсталявана."
msgstr[2] "%d новых пакетаў будзе ўсталявана."
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
@@ -1317,7 +1316,7 @@
msgstr[1] "%d пакеты будзе абноўлена."
msgstr[2] "%d пакетаў будзе абноўлена."
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1328,63 +1327,63 @@
"\n"
"Усяго неабходна загрузіць %s. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr "Для вашае сістэмы няма абнаўленняў. Абнаўленне будзе скасавана."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "Патрабуецца перазагрузка"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "Абнаўленне скончанае і патрабуецца перазагрузка. Перазагрузіцца зараз?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "аўтэнтыфікаваць '%(file)s' замест '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "Не атрымалася запусціць сродак абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
@@ -1392,33 +1391,33 @@
"У праграме абнаўлення, верагодна, памылка. Калі ласка, адпраўце справаздачу, "
"выкарыстоўваючы ў тэрмінале каманду 'ubuntu-bug update-manager'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "Подпіс прылады абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "Прылада абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "Не магу атрымаць"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "Не магу атрымаць абнаўленне. Магчыма, паўстала праблема з сецівам. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "Няўдалая ідэнтыфікацыя"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -1426,13 +1425,13 @@
"Праверка ідэнтыфікацыі абнаўлення не атрымалася. Магчыма, паўстала праблема "
"з сецівам або на серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "Не магу выняць"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1440,13 +1439,13 @@
"Не атрымалася выняць абнаўленне. Магчыма, паўстала праблема з сецівам або на "
"серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "Праверка не атрымалася"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1454,15 +1453,15 @@
"Праверка абнаўлення завяршылася няўдала. Магчыма, паўстала праблема з "
"сецівам або на серверы. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "Не атрымалася запусціць працэс абнаўлення"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -1470,13 +1469,13 @@
"Звычайна паўстае ў сістэме, дзе / tmp змантаваны пад noexec. Калі ласка, "
"перамантуйце без noexec і запусціце абнаўленне зноў."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "Паведамленне аб памылцы «%s»."
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1489,73 +1488,73 @@
"Імя арыгінальнае sources.list быў захаваны ў /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "Абарваць"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "Паніжана:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "Каб працягнуць, націсніце [ENTER]"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "Працягнуць [тН] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "Дэталі [д]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "y"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "н"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "д"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "Больш не падтрымліваецца: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "Выдаліць: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "Усталяваць: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "Абнавіць: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "Працягнуць [Тн] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1622,9 +1621,8 @@
msgstr "Абнавіць дыстрыбутыў"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-#, fuzzy
-msgid "Upgrading Ubuntu to version 12.10"
-msgstr "Абнаўленне Ubuntu да версіі 11.10"
+msgid "Upgrading Ubuntu to version 12.04"
+msgstr "Абнаўленне Ubuntu да версіі 12.04"
#: ../DistUpgrade/DistUpgrade.ui.h:20
msgid " "
@@ -1642,147 +1640,161 @@
msgid "Terminal"
msgstr "Тэрмінал"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "Калі ласка, пачакайце. Гэта можа заняць пэўны час."
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "Абнаўленне завершана"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "Не атрымалася знайсці заўвагі да выпуску"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "Магчыма, сервер перагружаны. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "Не атрымалася загрузіць заўвагі да выпуску"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "Калі ласка, праверце вашае злучэнне з інтэрнэтам."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "Абнаўленне"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "Нататкі да выпуску"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "Загрузка дадатковых файлаў пакетаў ..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "Файл %s з %s на хуткасці %sБ/с"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "Файл %s з %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "Адкрыць спасылку ў браўзары"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "Капіяваць спасылку ў буфер"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Загрузка файла %(current)li з %(total)li з хуткасцю %(speed)s/s"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "Загрузка файла %(current)li з %(total)li"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "Ваш выпуск Ubuntu больш не падтрымліваецца."
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "Інфармацыя аб абнаўленні"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "Усталяваць"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr "Назва"
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "Версія %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr "Не выяўлена сеткавае злучэнне, немагчыма загрузіць спіс змяненняў."
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "Загрузка спісу змяненняў ..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr "С_кінуць усё"
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr "Вылучыць _усе"
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "%(count)s абнаўленне абрана."
+msgstr[1] "%(count)s абнаўленняў абрана."
+msgstr[2] "%(count)s абнаўленняў абрана."
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "%s будзе загружана."
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "Абнаўленне ўжо загружана, але яшчэ не ўсталявана"
-msgstr[1] "Абнаўленні ўжо загружаны, але яшчэ не ўсталяваныя"
-msgstr[2] "Абнаўленьні ўжо запампаваныя, але яшчэ не ўсталяваныя"
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "Загружаны памер невядомы."
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
@@ -1790,7 +1802,7 @@
"Невядома, калі інфармацыя аб пакеце была абноўлена апошнім разам. Калі "
"ласка, націсніце кнопку \"Праверыць\" для абнаўлення гэтай інфармацыі."
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1799,7 +1811,7 @@
"Інфармацыя аб пакетах была абноўлена %(days_ago)s дзён таму.\n"
"Націсніце кнопку «Праверыць» для праверкі новых абнаўленняў праграм."
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
@@ -1807,7 +1819,7 @@
msgstr[1] "Інфармацыя аб пакетах была абноўлена %(days_ago)s дні таму."
msgstr[2] "Інфармацыя аб пакетах была абноўлена %(days_ago)s дзён таму."
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1817,34 +1829,44 @@
msgstr[2] "Інфармацыя аб пакетах была абноўлена %(hours_ago)s гадзінаў таму."
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr "Інфармацыя аб пакеце была абноўлена прыкладна %s хвілін таму."
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr "Інфармацыя аб пакеце была толькі што абноўлена."
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+"Абнаўленні праграм выпраўляюць памылкі, уразлівасці і дадаюць новыя "
+"магчымасці."
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "Магчыма прысутнічаюць абнаўленні праграм для вашага кампутара."
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "Вітаем у Ubuntu"
+
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
-msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1856,7 +1878,7 @@
"выдаліце часовыя пакеты ўсталёвак, выканаўшы ў тэрмінале каманду 'sudo apt-"
"get clean'."
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1864,23 +1886,23 @@
"Для завяршэння ўсталёўкі абнаўленняў неабходна перазапусціць кампутар. Калі "
"ласка, захавайце вынікі вашай працы перад тым, як працягнуць."
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "Чытанне інфармацыі аб пакетах"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "Злучэнне..."
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr "У вас недастаткова прывілеяў для праверкі ці зарузкі абнаўленняў."
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "Не атрымалася атрымаць інфармацыю аб пакунках"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1893,7 +1915,7 @@
"Калі ласка, паведаміце аб гэтай памылцы пакета «update-manager» і ўключыце "
"гэтае паведамленне:\n"
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1905,31 +1927,31 @@
"Калі ласка, паведаміце аб гэтай памылцы пакета 'Мэнэджар абнаўленняў' і "
"ўключыце гэтае паведамленне:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (Новая ўсталёўка)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(Памер: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "З версіі %(old_version)s на %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "Версія %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "Абнаўленьне выпуску зараз немагчымае"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
@@ -1938,21 +1960,21 @@
"Абнаўленне рэлізу цяпер не можа быць выканана, паспрабуйце пазней. Сервер "
"паведаміў: '%s'"
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "Спампоўваецца праграма для абнаўлення дыстрыбутыва"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "Даступны новы выпуск Ubuntu '%s'"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "Пашкоджаны індэкс праграм"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1962,6 +1984,17 @@
"праблему з дапамогай \"Synaptic\" альбо выканаўшы ў тэрмінале \"sudo apt-get "
"install -f\"."
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "Даступны новы выпуск '%s'."
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "Скасаваць"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr "Праверыць наяўнасць абнаўленняў"
@@ -1971,22 +2004,18 @@
msgstr "Усталяваць ўсе даступныя абнаўленні"
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "Скасаваць"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr "Гісторыя зменаў"
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr "Абнаўленні"
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "Фармуецца спіс абнаўленняў"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -2010,21 +2039,21 @@
" * Неафіцыйнымі пакункамі, якія не падтрымліваюцца Ubuntu\n"
" * Натуральнымі зменамі ў папярэдняй версіі Ubuntu"
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "Загрузка спісу змяненняў"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "Іншыя абнаўленні (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
"Гэтае абнаўленне пастаўляецца крыніцай, што не падтрымлівае спісы зменаў."
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -2032,7 +2061,7 @@
"Памылка пры загрузцы спісу змен. \n"
"Калі ласка, спраўдзьце вашае злучэнне з Інтэрнэтам."
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -2045,7 +2074,7 @@
"Даступная версія: %s\n"
"\n"
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -2059,7 +2088,7 @@
"+changelog\n"
"пакуль змены ня будуць даступны альбо паспрабуйце яшчэ раз пазней."
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -2073,52 +2102,43 @@
"+changelog\n"
"пакуль змены ня будуць даступны альбо паспрабуйце яшчэ раз пазней."
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "Не атрымалася вызначыць дыстрыбутыў"
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "Падчас праверкі вашае сістэмы адбылася памылка '%s'"
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "Важныя абнаўленні звязаныя з бяспекай"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "Пажаданыя абнаўленні"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Прапанаваныя абнаўленні"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "Адаптацыі з больш пазнейшых версій (backports)"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "Абнаўленні дыстрыбутыва"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "Іншыя абнаўленні"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "Стартуе Мэнэджар абнаўленняў"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr ""
-"Абнаўленні праграм выпраўляюць памылкі, уразлівасці і дадаюць новыя "
-"магчымасці."
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "_Частковае абнаўленне"
@@ -2189,37 +2209,27 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "Абнаўленні праграмнага забеспячэння"
+msgid "Update Manager"
+msgstr "Мэнэджар абнаўленняў"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Абнаўленні праграмнага забеспячэння"
+msgid "Starting Update Manager"
+msgstr "Запуск Мэнэджара абнаўленняў"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "Аб_навіць"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "абнаўленні"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "Усталяваць"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "Змены"
+msgid "updates"
+msgstr "абнаўленні"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "Апісанне"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "Апісанне абнаўлення"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
@@ -2227,25 +2237,35 @@
"Вы знаходзіцеся ў роўмінгу і з вас можа спаганяцца плата за дадзеныя, якія "
"перадаюцца пры абнаўленні."
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "Вы падлучаны праз бесправадны мадэм."
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
"Бяспечней будзе падлучыць кампутар да крыніцы сілкавання перад пачаткам "
"абнаўлення."
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "_Усталяваць абнаўленні"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "Змены"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr "_Налады..."
+msgid "Description"
+msgstr "Апісанне"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "Усталяваць"
+msgid "Description of update"
+msgstr "Апісанне абнаўлення"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr "_Налады..."
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2268,9 +2288,8 @@
msgstr "Вы адмовіліся ад абнаўлення да новай версіі Ubuntu"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
"Вы можаце абнавіць пазней, адчыніўшы Кіраўнік Абнаўленьняў і націснуўшы на "
@@ -2284,58 +2303,58 @@
msgid "Show and install available updates"
msgstr "Паказаць і ўсталяваць даступныя абнаўленні"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "Паказаць версію і выйсці"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "Тэчка, якая ўтрымлівае файлы дадзеных"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "Праверыць, ці даступны новы рэліз Ubuntu"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Праверка магчымасці абнаўлення да апошняй нестабільнай версіі дыстрыбутыва"
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "Абнаўленне з выкарыстаннем апошняй версіі Мэнэджара абнаўленняў"
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "Не выбіраць картку пры запуску"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "Паспрабаваць запусціць dist-upgrade"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "Не правяраць абнаўленні пад час запуску"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "Пратэставаць абнаўленне ў бяспечным рэжыме"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "Ідзе частковае абнаўленне"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
"Паспрабуйце абнавіцца да самага апошняга выпуска з дапамогай $distro-proposed"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2345,11 +2364,11 @@
"Зараз падтрымліваецца рэгулярнае абнаўленьне для «настольных» і «серверных» "
"сістэм."
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "Запусціць пазначаны інтэрфейс"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2357,11 +2376,11 @@
"Правяраць наяўнасць новай версіі дыстрыбутыва і вярнуць вынік з дапамогай "
"кода выхаду"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2369,121 +2388,138 @@
"Каб атрымаць інфармацыю аб абнаўленні, наведайце:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "Новы выпуск ня знойдзены"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "Даступны новы выпуск '%s'."
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Выканайце «do-release-upgrade», каб абнавіцца да яго."
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Даступнае абнаўленне Ubuntu %(version)s"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Вы адмовіліся ад абнаўлення да Ubuntu %s"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr "Падтрымліваюцца да %s:"
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "Нявыкананы метад: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "Файл на дыску"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".deb пакет"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "Усталяваць адсутнічаючыя пакункі."
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "Неабходна усталяваць пакунак %s."
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".deb пакет"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "%s павінен быць пазначаны як усталяваны ўручную."
+msgid "%i obsolete entries in the status file"
+msgstr "Састарэлы змест %i у файле статусу"
+
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
+msgstr "Састарэлы змест у статусе dpkg"
+
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr "Састарэлы змест станаў dpkg"
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
@@ -2492,51 +2528,73 @@
"kdelibs5-dev. Гэта баґ, аб якім можна пачытаць тут — bugs.launchpad.net, bug "
"#279621"
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
-msgstr "Састарэлы змест %i у файле статусу"
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
-msgstr "Састарэлы змест у статусе dpkg"
-
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
-msgstr "Састарэлы змест станаў dpkg"
+msgid "%s needs to be marked as manually installed."
+msgstr "%s павінен быць пазначаны як усталяваны ўручную."
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
"Выдаліце lilo, калі grub ужо ўсталяваны. (Глядзіце bug #314004 для дэталяў)"
-#~ msgid "Upgrading Ubuntu to version 12.04"
-#~ msgstr "Абнаўленне Ubuntu да версіі 12.04"
-
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "%(count)s абнаўленне абрана."
-#~ msgstr[1] "%(count)s абнаўленняў абрана."
-#~ msgstr[2] "%(count)s абнаўленняў абрана."
-
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
-
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "Вітаем у Ubuntu"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
-#~ msgid "Update Manager"
-#~ msgstr "Мэнэджар абнаўленняў"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
-#~ msgid "Starting Update Manager"
-#~ msgstr "Запуск Мэнэджара абнаўленняў"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "Вы падлучаны праз бесправадны мадэм."
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "_Install Updates"
-#~ msgstr "_Усталяваць абнаўленні"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid "Checking for a new ubuntu release"
#~ msgstr "Праверыць наяўнасьць новага выпуску ubuntu"
@@ -2631,6 +2689,9 @@
#~ msgid "Your system is up-to-date"
#~ msgstr "Ваша сістэма не патрабуе абнаўлення"
+#~ msgid "Upgrading Ubuntu to version 11.10"
+#~ msgstr "Абнаўленне Ubuntu да версіі 11.10"
+
#~ msgid ""
#~ "You will not get any further security fixes or critical updates. Please "
#~ "upgrade to a later version of Ubuntu Linux."
@@ -2693,5 +2754,11 @@
#~ "быць абмежаванай, а таксама можа прывесці да паўстання памылак. Вы "
#~ "сапраўды хочаце працягнуць абнаўленне?"
+#~ msgid "The update has already been downloaded, but not installed"
+#~ msgid_plural "The updates have already been downloaded, but not installed"
+#~ msgstr[0] "Абнаўленне ўжо загружана, але яшчэ не ўсталявана"
+#~ msgstr[1] "Абнаўленні ўжо загружаны, але яшчэ не ўсталяваныя"
+#~ msgstr[2] "Абнаўленьні ўжо запампаваныя, але яшчэ не ўсталяваныя"
+
#~ msgid "%.0f kB"
#~ msgstr "%.0f kB"
diff -Nru update-manager-17.10.11/po/bg.po update-manager-0.156.14.15/po/bg.po
--- update-manager-17.10.11/po/bg.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/bg.po 2017-12-23 05:00:37.000000000 +0000
@@ -4,11 +4,12 @@
# Rostislav "zbrox" Raykov , 2005.
#
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-02-23 19:58+0000\n"
"Last-Translator: Svetoslav Stefanov \n"
"Language-Team: Bulgarian \n"
@@ -21,7 +22,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -29,13 +30,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f МБ"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "Сървър за %s"
@@ -43,20 +44,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "Основен сървър"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "Сървъри по избор"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "Не може да пресметне запис в sources.list"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -64,11 +65,11 @@
"Намирането на програмни пакети не бе успешно. Вероятно това не е диск с "
"Убунту или е с неподходяща архитектура за вашата система?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "Грешка при добавяне на CD"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -84,13 +85,13 @@
"Съобщението за грешка беше:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "Премахване на пакет в лошо състояние"
msgstr[1] "Премахване на пакети в лошо състояние"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -111,15 +112,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "Сървърът може би е претоварен"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "Повредени пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -129,7 +130,7 @@
"продължите."
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -150,11 +151,11 @@
" * Неофициални пакети, които не са предоставени от Убунту\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "Това най-вероятно е временен проблем. Моля, опитайте отново по-късно."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
@@ -162,16 +163,16 @@
"Ако нищо от това не се приложи, тогава моля докладвайте тази грешка "
"използвайки командата 'ubuntu-bug update-manager' във терминал."
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "Не може да бъде изчислено надграждането"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "Грешка при удостоверяването автентичността на някои пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -181,29 +182,29 @@
"да е временен проблем с мрежата. Може би бихте искали да опитате отново по-"
"късно. Вижте по-долу списъка на неудоствоерените пакети."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr ""
"Пакетът '%s' е маркиран за премахване, но е в черния списък за премахване."
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "Важният пакет '%s' е маркиран за премахване."
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "Опит за инсталиране на забранена версия на '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "Не може да се инсталира '%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
@@ -212,11 +213,11 @@
"използвайки 'ubuntu-bug update-manager' във терминал."
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "Не могат да бъдат предположени мета-пакети"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -230,15 +231,15 @@
" Моля, преди да продължите, първо инсталирайте един от тези пакети, като "
"използвате synaptic или apt-get!"
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "Четене от кеша"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "Неуспех при получаване на изключителни права"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -246,11 +247,11 @@
"Това обикновено означава, че е стартирана друга система за управление на "
"пакети (като apt-get или aptitude). Първо спрете тази програма."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "Надграждането през отдалечена връзка не се поддържа"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -264,11 +265,11 @@
"\n"
"Надграждането ще бъде спряно сега. Моля опитайте отново без ssh."
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "Продължаване на работата със SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -285,11 +286,11 @@
"Ако продължите, допълнителен ssh демон ще бъде стартиран на порт '%s'.\n"
"Искате ли да продължите?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Стартиране на допълнителен SSHD"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -300,7 +301,7 @@
"бъде стартиран допълнителен sshd на порт '%s'. Ако нещо се обърка с "
"изпълняващия се ssh, ще можете да се свържете към допълнителния ssh.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -313,29 +314,29 @@
"да отворите порта с например:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Надграждането невъзможно"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "Надграждане от '%s' на '%s' не се поддържа с този инструмент."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Настройката на ограничителен режим е неуспешна"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "Не беше възможно да се създаде среда за ограничителен режим."
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Ограничителен режим"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -345,18 +346,18 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"Инсталацията на Python е повредена. Моля, поправете симболната връзка „/usr/"
"bin/python”!"
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "Пакетът 'debsig-verify' е инсталиран"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -366,12 +367,12 @@
"Моля, премахнете го със synaptic или 'apt-get remove debsig-verify' и после "
"отново изпълнете надграждането."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -379,11 +380,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "Включване на най-новите актуализации от Интернет?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -405,16 +406,16 @@
"\n"
"Ако отговора ви е 'Не', мрежата няма да се използва изобщо."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "забранен при надграждане до %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "Не е открит валиден огледален сървър"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -434,11 +435,11 @@
"Ако натиснете 'Не', няма да се извърши надграждане."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "Генериране на източници по подразбиране?"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -451,21 +452,21 @@
"Да се добавят ли записите по подразбиране за '%s'? Ако натиснете 'Не', няма "
"да се извърши надграждане."
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "Информацията от хранилището е невалидна"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "Забранени са източници от трети страни"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -475,13 +476,13 @@
"да ги разрешите отново след надграждането чрез инструмента „software-"
"properties” или чрез диспечера Ви на пакети."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "Пакет в несъвместимо състояние"
msgstr[1] "Пакети в несъвместимо състояние"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -500,11 +501,11 @@
"не могат да се намерят архиви. Моля, преинсталирайте пакетите ръчно или ги "
"премахнете от системата."
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "Грешка по време на надграждане"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -512,13 +513,13 @@
"Възникна проблем при актуализиране. Това обикновено се дължи на мрежов "
"проблем. Моля, проверете вашата мрежова връзка и опитайте отново."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "Недостатъчно свободно място на диска"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -533,21 +534,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "Пресмятане на промените"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "Желаете ли да започне надграждането?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "Надграждането е отменено"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -555,12 +556,12 @@
"Сега надграждането ще бъде отказано и ще се възстанови оригиналното "
"състояние на системата. Можете да продължите надграждането по-късно."
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "Не могат да бъдат свалени обновленията."
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -571,27 +572,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "Грешка при прехвърляне"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "Възстановяване на първоначалното състояние на системата"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "Не можаха да бъдат инсталирани обновленията"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -599,7 +600,7 @@
"Надграждането бе прекъснато. Системата ви може да е в нестабилно състояние. "
"Сега ще се извърши възстановяване (dpkg --configure -a)."
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -610,7 +611,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -618,20 +619,20 @@
"Надграждането бе прекъснато. Моля, проверете Интернет връзката или "
"инсталационната среда и опитайте отново. "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "Премахване на остарелите пакети?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "_Задържане"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "_Премахване"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -641,37 +642,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "Не е инсталирана изисквана зависимост"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "Изискваната зависимост „%s” не е инсталирана. "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "Проверка на диспечера на пакети"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "Подготовката за надграждането неуспешна"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "Грешка при получаване на изискванията за надграждане"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -679,69 +680,69 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "Актуализиране информацията от хранилището"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "Неуспех при добавянето на cdrom"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "Съжаляваме, добавянето на cdrom не беше успешно."
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "Невалидна информация за пакета"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "Получаване"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "Надграждане"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "Надграждането е завършено"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr ""
"Надграждането беше завършено, но възникнаха грешки по време на този процес."
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "Търсене на остарял софтуер"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "Надграждането на системата завърши."
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "Частичното надграждане завърши."
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms се използва"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -751,11 +752,11 @@
"Софтуерът 'evms' вече не се поддържа. Моля изключете го и изпълнете "
"надграждането отново."
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -763,9 +764,9 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -773,8 +774,8 @@
"Надграждането може да намали ефектите на работния плот и производителността "
"в игрите и други графични програми."
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -788,7 +789,7 @@
"\n"
"Искате ли да продължите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -801,11 +802,11 @@
"\n"
"Искате ли да продължите?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "Не е i686 архитектура"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -817,11 +818,11 @@
"минимална архитектура. Не е възможно да ъпгрейднете своята система към ново "
"издание на Убунту с този хардуер."
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "Няма ARMv6 CPU"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -833,11 +834,11 @@
"възможно да надграждате вашата система с новата версия на Убунту с този "
"хардуер."
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "Няма достъпен init"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -851,16 +852,16 @@
"изисква се, първо, обновяване на настройката на Вашата виртуална машина.\n"
"Сигурни ли сте, че искате да продължите?"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "Sandbox надграждане с помощта на aufs"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr ""
"Ползване на зададения път за търсене на CD дискове с надграждаеми пакети"
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -868,58 +869,58 @@
"Ползване на фронтенд. Текущо налични:\n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr "*НЕПРЕПОРЪЧИТЕЛНО* тази опция ще бъде игнорирана"
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr ""
"Извършване само на частично надграждане (без презаписване на sources.list)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "Изключване поддръжката на GNU screen"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "Задаване на datadir"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Моля, поставете диск \"%s\" в устройство \"%s\""
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "Изтеглянето е завършено"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "Изтегляне на файл %li от %li с %sB/с"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "Остават около %s"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "Изтегляне на файл %li от %li"
@@ -929,27 +930,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "Прилагане на промените"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "проблеми със зависимости - остава не конфигуриран"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "Не можеше да бъде инсталиран \"%s\""
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -961,7 +962,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -972,7 +973,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -980,20 +981,20 @@
"Ще изгубите всички промени, които сте направили в този конфигурационен файл "
"ако изберете да го замените с по-нова версия."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "Командата \"diff\" не бе намерена"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "Възникна фатална грешка"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -1006,13 +1007,13 @@
"Оригиналният файл sources.list бе запазен в /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "Ctrl-c натиснат"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -1021,137 +1022,137 @@
"състояние. Сигурни ли сте, че искате да направите това?"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr ""
"За да предодвратите загуба на данни, затворете всички отворени приложения и "
"документи."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "Вече не се поддържа от Каноникал. (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "Подграждане (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "Премахнете (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "Вече не е необходим (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "Инсталирайте (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "Надграждане (%s)"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "Смяна на носител"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "Показване на разлики >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< Скриване на разлики"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "Грешка"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "&Отказ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "&Затваряне"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "Показване на терминал >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< Скриване на терминал"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "Информация"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "Детайли"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "Вече не се поддържа %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "Премахване на %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "Премахване (на автоматично инсталиран) %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "Инсталиране на %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "Надграждане на %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "Нужно е рестартиране"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr ""
"Рестратирайте системата, за да завършите надграждането"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "_Рестартирай сега"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1163,32 +1164,32 @@
"Ако откажете надграждането системата може да остане в състояние, в което е "
"неизползваема. Силно ви препоръчваме да подължите надграждането."
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "Отмяна на надграждането?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "%li ден"
msgstr[1] "%li дни"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "%li час"
msgstr[1] "%li часа"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "%li минута"
msgstr[1] "%li минути"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1204,7 +1205,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1218,14 +1219,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1234,34 +1235,32 @@
"Това изтегляне ще отнеме около %s с 1Mbit DSL връзка и около %s с 56k модем."
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "Това изтегляне ще отнеме около %s с вашата връзка. "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "Подготовка за надграждане"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "Получаване на нови софтуерни канали"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "Получаване на нови пакети"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "Инсталиране на надгражданията"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "Почистване"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1278,28 +1277,28 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "%d пакет ще бъде премахнат."
msgstr[1] "%d пакети ще бъдат премахнати."
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "%d нов пакет ще бъде инсталиран."
msgstr[1] "%d нови пакети ще бъдат инталирани."
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "%d пакет ще бъде надграден."
msgstr[1] "%d нови пакети ще бъдат надградени."
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1310,28 +1309,28 @@
"\n"
"Ще трябва да бъдат изтеглени общо %s. "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
@@ -1339,36 +1338,36 @@
"Няма налични надграждания за вашата система. Надграждането ще бъде "
"прекратено."
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "Нужно е рестартиране"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "Надграждането е завършено и има нужда от рестарт. Рестартиране сега?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "Не може да бъде стартирана помощната програма за надграждане."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
@@ -1376,35 +1375,35 @@
"Това е най-вероятно грешка в инструмента за ъпгрейд. Моля докладвайте тази "
"грешка използвайки командата 'ubuntu-bug update-manager'."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "Подпис на помощната програма за надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "Помощна програма за надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "Грешка при доставянето"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr ""
"Доставянето на надграждането бе неуспешно. Възможно е да има проблем с "
"мрежата. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "Идентификацията неуспешна"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
@@ -1412,13 +1411,13 @@
"Идентификацията на надграждането е неуспешна. Възможно е да има проблем с "
"мрежата или сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "Грешка при извличането"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1426,13 +1425,13 @@
"Извличането на надграждането бе неуспешно. Възможно е да има проблем с "
"мрежата или сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "Проверката е неуспешна"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
@@ -1440,15 +1439,15 @@
"Проверката на надграждането се провали. Възможно е да има проблем с мрежата "
"или със сървъра. "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "Не може да се изпълни надграждане"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -1456,13 +1455,13 @@
"Това обикновенно е причинено от система, където /tmp е монтиран noexec. Моля "
"ремонтирайте без noexec и стартирайте ъпгрейда отново."
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "Съобщението с грешка е '%s'."
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1475,73 +1474,73 @@
"Оригиналният файл sources.list бе запазен в /etc/apt/sources.list."
"distUpgrade."
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "Прекратяване"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "Понижен:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "За да продължите моля натиснете [ENTER]"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "Продъжаване [yN] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "Детайли [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "Y"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "n"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "d"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "Вече не се поддържа: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "Премахване на %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "Инсталиране: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "Надграждане на %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "Продължаване [Yn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1608,9 +1607,8 @@
msgstr "Надграждане на дистрибуцията"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-#, fuzzy
-msgid "Upgrading Ubuntu to version 12.10"
-msgstr "Актуализиране на Убунту до версия 11.10"
+msgid "Upgrading Ubuntu to version 12.04"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
msgid " "
@@ -1628,147 +1626,161 @@
msgid "Terminal"
msgstr "Терминал"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "Моля, изчакайте! Това може да отнеме известно време."
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "Актуализацията е завършена"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "Не бяха открити бележки към изданието"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "Сървърът може да е претоварен. "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "Не можеше да бъдат свалени бележките към изданието"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "Моля, проверете Интернет връзката си!"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "Надграждане"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "Бележки към изданието"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "Изтегляне на допълнителни пакетни файлове..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "Файл %s от %s с %sB/с"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "Файл %s от %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "Отваряне на връзката в браузър"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "Копиране на връзката в клипборда"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "Смъкване на файл %(current)li от %(total)li при %(speed)s/сек"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "Изтегляне на файл %(current)li от %(total)li"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "Вашата версия на Убунту вече не се поддържа."
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "Информация за надграждане"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "Инсталиране"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "Версия %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
"Не е засечена мрежова връзка. Не можете да изтеглите файла с промените."
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "Изтегляне на списъка с промени..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr "_Премахване на избора от всички"
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr "Избери_Всичко"
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "%(count)s актуализация е избрано."
+msgstr[1] "%(count)s актуализации са избрани."
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "%s ще бъде изтеглено."
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "Актуализацията вече е свалена, но не е инсталирана."
-msgstr[1] "Актуализациите вече са свалени, но не са инсталирани."
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "Неизвестен размер за изтегляне"
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
@@ -1776,7 +1788,7 @@
"Не е известно кога последно е актуализирана пакетната информация. Моля, "
"натиснете \"Провери\" бутона, за да актуализирате информацията."
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1785,14 +1797,14 @@
"Информацията за пакетите беше обновена преди %(days_ago)s дни.\n"
"Натиснете бутона 'Проверка', за да проверите за софтуерни обновления."
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] "Пакетът информация бе последно обновен преди %(days_ago)s ден."
msgstr[1] "Пакетът информация бе последно обновен преди %(days_ago)s дена."
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1802,34 +1814,44 @@
"Информацията за пакета последно е обновена преди %(hours_ago)s часа."
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr "Пакетната информация беше актуализирана преди около %s минути."
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr "Пакетната информация беше току що актуализирана."
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+"Софтуерните актуализации поправят грешки, премахват уязвими места в "
+"сигурността и предлагат нови възможности."
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "Може да има актуализации за вашия компютър."
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "Добре дошли в Убунту"
+
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
-msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1840,7 +1862,7 @@
"освободете поне %s място на диск '%s'. Изпразнете вашето кошче и премахнете "
"временните пакети от инсталации с командата 'sudo apt-get clean'."
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1848,25 +1870,25 @@
"За да завърши инсталирането, компютъра трябва да се рестартира. Преди да "
"продължите, моля, запазете вашата работа."
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "Прочитане на информация за пакет"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "Свързване..."
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr ""
"Възможно е да не можете да проверите за актуализации или изтегляне на нови "
"такива."
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "Невъзможно инициирането на информацията за пакета"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1879,7 +1901,7 @@
"Моля, докладвайте това като бъг в пакета 'update-manager' и включете "
"следното съобщение с грешка:\n"
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1891,31 +1913,31 @@
"Моля, докладвайте това като бъг в пакета 'update-manager' и включете "
"следното съобщение с грешка:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (Нова инсталация)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(Размер: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "От версия %(old_version)s към %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "Версия %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "Надграждане към ново издание не е възможно в момента"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
@@ -1924,21 +1946,21 @@
"Надграждането към ново издание понастоящем не може да се извърши, моля "
"опитайте по-късно. Сървърът върна: \"%s\""
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "Сваляне на инструмента за награждане на версията"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "Налично е ново издание на Убунту - '%s'"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "Индексът на софтуера е повреден"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1948,6 +1970,17 @@
"ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-"
"get install -f\" в терминален прозорец, за да поправите този проблем!"
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "Достъпно е ново издание на '%s'."
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "Отказ"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr "Провери за актуализации"
@@ -1957,22 +1990,18 @@
msgstr "Инсталирай всички възможни актуализации"
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "Отказ"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "Изграждане на списък с актуализации"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1996,20 +2025,20 @@
" * Неофициални пакети, които не са предоставени от Убунту\n"
" * Нормални промени в предварителна версия на Убунту"
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "Изтегляне на отчет с промените"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "Други актуализации (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr "Тази актуализация не идва от източник, който поддържа промени."
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -2017,7 +2046,7 @@
"Неуспех при изтегляне на списъка с промени. \n"
"Моля, проверете Интернет връзката си."
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -2030,7 +2059,7 @@
"Възможна версия: %s\n"
"\n"
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -2043,7 +2072,7 @@
"Моля, използвайте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"докато промените станат достъпни или опитайте отново по-късно."
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -2056,52 +2085,43 @@
"Моля, използвайте http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
"докато промените станат достъпни или опитайте отново по-късно."
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "Неуспешен опит за откриване на дистрибуцията"
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "Възникна грешка '%s' докато се проверяваше каква система използвате."
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "Важни актуализации за сигурността"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "Препоръчителни актуализации"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Предложени актуализации"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "Състарени версии"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "Актуализации на дистрибуцията"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "Други актуализации"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "Стартиране на Диспечера на актуализации"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr ""
-"Софтуерните актуализации поправят грешки, премахват уязвими места в "
-"сигурността и предлагат нови възможности."
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "_Частично надграждане"
@@ -2175,37 +2195,27 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "Обновления на програмите"
+msgid "Update Manager"
+msgstr "Диспечер на актуализациите"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "Обновления на програмите"
+msgid "Starting Update Manager"
+msgstr "Стартиране на диспечера за актуализациите"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "_Надграждане"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "актуализации"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "Инсталиране"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "Промени"
+msgid "updates"
+msgstr "актуализации"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "Описание"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "Описание на актуализацията"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
@@ -2213,24 +2223,34 @@
"Вие сте свързани през роуминг и може да бъдете таксувани за данните, "
"изразходвани за това обновление."
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "Вие сте свързани чрез безжичен модем"
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr ""
"Преди да започне актуализирането по-добре да свържете захранващия адаптер."
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "_Инсталиране на актуализациите"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "Промени"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr "_Настройки..."
+msgid "Description"
+msgstr "Описание"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "Инсталиране"
+msgid "Description of update"
+msgstr "Описание на актуализацията"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr "_Настройки..."
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2253,9 +2273,8 @@
msgstr "Вие сте отхвърлили надграждането до нова версия на Убунту"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
"Можете да надградите по-късно като отворите Диспечера за Надграждане и "
@@ -2269,59 +2288,59 @@
msgid "Show and install available updates"
msgstr "Показване и инсталация на наличните актуализации"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "Показване на версията и изход"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "Папка, която съдържа файловете с данни"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "Проверка дали има по-ново издание на Убунту"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Проверка дали е възможно надграждане до последното издание в разработка"
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "Надграждане с предложената най-нова весрия"
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "Да не се фокусира на карта при стартиране"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "Опит за пускане на dist-upgrade"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "Да не се проверява за обновления при пускане"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "Тестване на надграждане в ограничителен режим aufs припокриване"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "Протичане на частично надграждане"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr ""
"Опит за надграждане до най-новата версия с помощта на програма за "
"надграждане от $distro-proposed"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2331,11 +2350,11 @@
"Текущо се поддържат 'работен плот' за редовно актуализиране на настолни "
"системи и 'сървър' за сървърни системи."
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "Стартиране на определения фронтенд"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2343,11 +2362,11 @@
"Проверка само ако нова дистрибуция е налична и доклаване на резултата чрез "
"exit код"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2355,121 +2374,138 @@
"За повече информация, моля посетете:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "Не е намерена нова дистрибуция"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "Достъпно е ново издание на '%s'."
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "Изпълнете 'do-release-upgrade', за да го надградите."
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Убунту %(version)s налична за надграждане"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Вие сте отказали надграждането до Убунту %s"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "Неимплементиран метод: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "Файл на диск"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".deb пакет"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "Инсталиране на липсващ пакет."
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "Пакетът %s не трябва да се инсталира."
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".deb пакет"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "%s трябва да се маркира като ръчно инсталиран."
+msgid "%i obsolete entries in the status file"
+msgstr "%i остарели записа във файла за състояние"
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
+msgid "Obsolete entries in dpkg status"
+msgstr "Остарели записи в състоянието на dpkg"
+
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
+msgid "Obsolete dpkg status entries"
+msgstr "Остарели записи в състоянието на dpkg"
+
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
msgid ""
"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
"installed. See bugs.launchpad.net, bug #279621 for details."
@@ -2478,48 +2514,74 @@
"инсталира и kdelibs5-dev. Вижте bugs.launchpad.net, bug #279621 за повече "
"информация."
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
#, python-format
-msgid "%i obsolete entries in the status file"
-msgstr "%i остарели записа във файла за състояние"
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
-msgid "Obsolete entries in dpkg status"
-msgstr "Остарели записи в състоянието на dpkg"
-
-#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
-msgid "Obsolete dpkg status entries"
-msgstr "Остарели записи в състоянието на dpkg"
+msgid "%s needs to be marked as manually installed."
+msgstr "%s трябва да се маркира като ръчно инсталиран."
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
"Премахване на lilo докато и grub е инсталиран.(Вижте грешка #314004 за "
"подробности.)"
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "%(count)s актуализация е избрано."
-#~ msgstr[1] "%(count)s актуализации са избрани."
-
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
-
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "Добре дошли в Убунту"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
-#~ msgid "Update Manager"
-#~ msgstr "Диспечер на актуализациите"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
-#~ msgid "Starting Update Manager"
-#~ msgstr "Стартиране на диспечера за актуализациите"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "Вие сте свързани чрез безжичен модем"
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "_Install Updates"
-#~ msgstr "_Инсталиране на актуализациите"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid "Checking for a new ubuntu release"
#~ msgstr "Проверка за нова версия на Убунту"
@@ -2560,6 +2622,11 @@
#~ msgid "There are no updates to install"
#~ msgstr "Няма актуализации за инсталиране."
+#~ msgid "The update has already been downloaded, but not installed"
+#~ msgid_plural "The updates have already been downloaded, but not installed"
+#~ msgstr[0] "Актуализацията вече е свалена, но не е инсталирана."
+#~ msgstr[1] "Актуализациите вече са свалени, но не са инсталирани."
+
#~ msgid ""
#~ "You will not get any further security fixes or critical updates. Please "
#~ "upgrade to a later version of Ubuntu Linux."
@@ -2638,6 +2705,9 @@
#~ msgid "1 kB"
#~ msgstr "1 кБ"
+#~ msgid "Upgrading Ubuntu to version 11.10"
+#~ msgstr "Актуализиране на Убунту до версия 11.10"
+
#~ msgid ""
#~ "These software updates have been issued since this version of Ubuntu was "
#~ "released. If you don't want to install them now, choose \"Update Manager"
diff -Nru update-manager-17.10.11/po/bn.po update-manager-0.156.14.15/po/bn.po
--- update-manager-17.10.11/po/bn.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/bn.po 2017-12-23 05:00:37.000000000 +0000
@@ -7,11 +7,12 @@
# Ayesha Akhtar , 2012.
# Mahay Alam Khan , 2012.
# Robin Mehdee , 2012.
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: shotwell-0.7.2\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-04-01 06:13+0000\n"
"Last-Translator: Robin Mehdee \n"
"Language-Team: Bengali \n"
@@ -26,7 +27,7 @@
"X-Poedit-Language: Bengali\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -34,13 +35,13 @@
msgstr[1] "%(size).0f kB"
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f মেগাবাইট"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "%s-এর জন্য সার্ভার"
@@ -48,20 +49,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "প্রধান সার্ভার"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "কাস্টম সার্ভারসমূহ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "sources.list ভুক্তি গননা করা সম্ভব নয়"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -69,11 +70,11 @@
"কোন প্যাকেজ ফাইল পাওয়া যায়নি, সম্ভবত এটি উবুন্টু ডিস্ক নয়, নাকি এটি ভুল "
"আর্কিটেকচারের?"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "সিডি যোগ করা সম্ভব হয়নি"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -88,13 +89,13 @@
"ত্রুটির বার্তাটি হল:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "খারাপ অবস্থায় থাকা প্যাকেজ সরাও"
msgstr[1] "খারাপ অবস্থায় থাকা প্যাকেজগুলো সরাও"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -113,15 +114,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "সার্ভারে সম্ভবত অত্যাধিক চাপ পড়েছে"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "ভাঙা প্যাকেজসমূহ"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -130,7 +131,7 @@
"ঠিক করা সম্ভব না। দয়া করে সিনাপটিক বা apt-get ব্যবহার করে ঠিক করে অগ্রসর হোন।"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -149,11 +150,11 @@
"*আনঅফিসিয়াল সফটওয়্যার প্যাকেজ চালানোর জন্য যা উবুন্টুর নয়।\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "এটি হয়তো একটি অস্থায়ী সমস্যা, অনুগ্রহ করে পরবর্তীতে আবার চেষ্টা করুন।"
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
@@ -161,16 +162,16 @@
"যদি এটির কোনটি প্রয়োগ করা না হয়, তখন অনুগ্রহ করে টার্মিনালে কমান্ড 'ubuntu-bug "
"update-manager' ব্যবহার করে এই বাগ প্রতিবেদন দিন।"
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "আপগ্রেডের পরিমাণ নির্ণয় করা যাচ্ছে না।"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "কিছু প্যাকেজের পরিচয় প্রমাণে ত্রুটি হয়েছে"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -180,7 +181,7 @@
"আপনি পরবর্তীতে আবার চেষ্টা করতে পারেন। পরিচয় অপ্রমাণিত প্যাকেজের তালিকার জন্য "
"নিচে দেখুন।"
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
@@ -188,22 +189,22 @@
"'%s' প্যাকেজটিকে অপসারনের জন্য চিহ্নিত করা হয়েছে কিন্তু এটি অপসারনের জন্য কাল "
"তালিকা ভুক্ত।"
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "গুরুত্বপূর্ণ প্যাকেজ '%s' মুছে ফেলার জন্য চিহ্নিত করা হয়েছে।"
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "কালো তালিকাভুক্ত সংস্করন '%s' ইনস্টলের চেষ্টা করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "'%s' ইন্সটল করা যাচ্ছে না"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
@@ -212,11 +213,11 @@
"manager' ব্যবহার করে এটিকে বাগ হিসেবে প্রতিবেদন দিন।"
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "meta-package অনুমান করা যাচ্ছ না"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -230,15 +231,15 @@
" অনুগ্রহ করে প্রথমে উপরোল্লিখিত প্যাকেজগুলি synaptic কিংবা apt-get ব্যবহার করে "
"ইন্সটল করুন।"
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "cache পড়া হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "exclusive লক পাওয়া যায়নি"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -246,11 +247,11 @@
"এইটি সাধারণত বুঝায় যে অন্য একটি package management application (apt-get অথবা "
"aptitude . .) ইতিমধ্যে চলছে। অনুগ্রহ করে ঔ অ্যাপলিকেশন বন্ধ করুন প্রথম।"
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "দূরবর্তী সংযোগের মধ্যদিয়ে আপগ্রেড করা সমর্থিত নয়"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -264,11 +265,11 @@
"\n"
"আপগ্রেড এখন বাতিল করা হবে। অনুগ্রহ করে ssh ছাড়া চেষ্টা করুন।"
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "SSH এর অধীনে এগিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -284,11 +285,11 @@
"আপনি যদি চালিয়ে যান, '%s' পোর্টে একটি অতিরিক্ত ssh ডিমন আরম্ভ হবে।\n"
"আপনি কি চালিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "অতিরিক্ত sshd শুরু করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -298,7 +299,7 @@
"আপগ্রেড ব্যর্থ হলে পুনরুদ্ধার সহজ করার জন্য, '%s' পোর্টে অতিরিক্ত একটি sshd আরম্ভ হবে। "
"ssh চালানোর সময় কোন সমস্যা দেখা দিলেও আপনি এটির সাথে সংযোগ করতে পারবেন।\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -311,29 +312,29 @@
"খুলতে পারেন:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "আপডেট করা সম্ভব নয়"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "'%s' হতে '%s' এ আপগ্রেড এই টুল দ্বারা সমর্থিত নয়।"
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Sandbox সেটআপ ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "স্যান্ডবক্স এনভায়রনমেন্ট তৈরি করা সম্ভব হয়নি।"
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Sandbox মোড"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -348,17 +349,17 @@
"*No* এখন থেকে সিস্টেম ডিরেক্টরির লিখিত পরিবর্তন হবে যতক্ষন না পরবর্তী পুনরায় বুট "
"স্থায়ী করা হবে।"
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"আপনার python ইনস্টল ত্রুটিপূর্ণ। অনুগ্রহ করে '/usr/bin/python' সিমলিংকটি ঠিক করুন।"
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "'debsig-verify' প্যাকেজটি ইন্সটল করা হয়েছে"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -368,12 +369,12 @@
"অনুগ্রহ করে synaptic বা 'apt-get remove debsig-verify' ব্যবহার করে অপসারন করুন "
"এরপর আপগ্রেড আবার চালান।"
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr "'%s' তে লেখা যাবেনা"
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -383,11 +384,11 @@
"আপনার সিস্টেমে সিস্টেম ডিরেক্টরি '%s' লেখা সম্ভব নয়। উন্নীতকরণ চালানো যাবেনা।\n"
"অনুগ্রহ করে নিশ্চিত করুন সিস্টেম ডিরেক্টরি লিখনযোগ্য।"
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "ইন্টারনেট থেকে সর্বশেষ হালনাগাদ অন্তর্ভূক্ত করতে চান?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -407,16 +408,16 @@
"সর্বশেষ হালনাগাদসমূহ ইনস্টল করতে হবে।\n"
"আপনি এখানে 'না' বললে, কোথাও নেটওয়ার্ক ব্যবহার করা হবে না।"
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "%s তে আপগ্রেডে নিষ্ক্রিয়"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "কোন সঠিক মিরর পাওয়া যায় নি"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -436,12 +437,12 @@
"'না' নির্বাচন করা হলে আপগ্রেড বাতিল হয়ে যাবে।"
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "ডিফল্ট sources তৈরি করে?"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -454,11 +455,11 @@
" '%s' এর জন্য পূর্বনির্ধারিত এন্ট্রিগুলো যোগ করে দেয়া উচিৎ? 'না' অপশন নির্বাচন করলে "
"হালনাগাদকরণ প্রক্রিয়া বাতিল হয়ে যাবে।"
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "রিপোজিটরির তথ্য সঠিক নয়"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
@@ -466,12 +467,12 @@
"উন্নীতকরণ রিপোজিটরী তথ্য অকার্যকর ফাইলে পরিণত করা হয়েছে তাই বাগ প্রতিবেদন করার "
"প্রক্রিয়া শুরু করা হচ্ছে।"
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -481,13 +482,13 @@
"'সফট্ওয়্যার-প্রপার্টিজ' টুল এর সাহায্যে আপগ্রেড করে আপনি সেগুলোকে পুনরায় সক্রিয় করতে "
"পারবেন।"
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "অসঙ্গতিপূর্ন অবস্থায় প্যাকেজ"
msgstr[1] "অসঙ্গতিপূর্ন অবস্থায় প্যাকেজ"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -506,11 +507,11 @@
"কোনো আর্কাইভ পাওয়া যায়নি। অনুগ্রহ করে প্যাকেজ পুনরায় ইনস্টল করুন বা সিস্টেম থেকে "
"ম্যানুয়ালি অপসারন করুন।"
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "আপগ্রেড করার সময় সমস্যা"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -518,13 +519,13 @@
"হালনাগাদ করার সময় একটি সমস্যা হয়েছে। সম্ভবত এটি কোনো নেটওয়ার্ক সমস্যা, অনুগ্রহ করে "
"আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।"
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -538,21 +539,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "পরিবর্তন হিসাব করা হচ্ছে"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "আপনি কি আপগ্রেড শুরু করতে চান?"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "আপগ্রেড বাতিল করা হয়েছে"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -560,12 +561,12 @@
"এখন আপগ্রেড বাতিল হয়ে যাবে এবং মূল সিস্টেম স্টের পুনরূদ্ধার হবে। আপনি পরে যে কোনো "
"সময়ে আপগ্রেড বন্ধ করে দিতে পারেন।"
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "আপগ্রেড ডাউনলোড করা যায় নি"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -575,28 +576,28 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "প্রেরণ করার সময় সমস্যা"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "সিস্টেমটি রিস্টার্ট করছি"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "আপগ্রেড ইন্সটল করা যায় নি"
# snigdha
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -604,7 +605,7 @@
"আপগ্রেড বন্ধ করে দেয়া হয়েছে। সিস্টেমটি এখন ব্যবহার করা নাও যেতে পারে। এখন "
"পুনরূদ্ধারকরণ প্রক্রিয়া চলতে থাকবে (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -621,7 +622,7 @@
"upgrade/ to বাগ প্রতিবেদনে।\n"
"%s"
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -629,21 +630,21 @@
"আপগ্রেড প্রত্যাখ্যান করা হয়েছে। অনুগ্রহ করে ইন্টারনেট সংযোগ বা ইনস্টলেশন মিডিয়া "
"পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন। "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "রাখো (_K)"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "সরাও (_স)"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -653,28 +654,28 @@
# snigdha
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী ইন্সটল করা হয়নি"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "প্রয়োজনীয় ডিপেন্ডেন্সী '%s' ইন্সটল করা হয়নি। "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "আপগ্রেডের প্রস্তুতি ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
@@ -683,11 +684,11 @@
"প্রক্রিয়া শুরু হয়েছে"
# prb-snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "আপগ্রেডের জন্য প্রয়োজনীয় তথ্য পেতে ব্যার্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -699,70 +700,70 @@
"\n"
"উপরন্তু, বাগ প্রতিবেদন করার প্রক্রিয়া শুরু করা হচ্ছে।"
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "সিডি রোম যোগ করতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "দুঃখিত, সিডি রোম সফল হয়নি।"
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "ভুল প্যাকেজ তথ্য"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "টেনে আনা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "আপগ্রেড করা হচ্ছে"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "হালনাগাদ সম্পন্ন হয়েছে"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "আপগ্রেড সম্পন্ন কিন্তু আপগ্রেড প্রসেসের সময় ত্রুটি ঘটে।"
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "সিস্টেম আপগ্রেড সম্পন্ন।"
# snigdha
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "আংশিক আপগ্রেড সম্পন্ন হয়েছে।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms ব্যবহার করা হচ্ছে"
# snigdha
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -772,12 +773,12 @@
"সফট্ওয়্যার এখন আর সমর্থন করে না, তাই অনুগ্রহ করে এটি বন্ধ করুন এবং আপগ্রেড সম্পন্ন হয়ে "
"গেলে তা চালু করুন।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
"আপনার গ্রাফিক্স হার্ডওয়্যার উবুন্টু ১২.০৪ (LTS) এ সম্ভবত পুরোপুরি ভাবে সমর্থন করবে না।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -789,9 +790,9 @@
"Bugs/UpdateManagerWarningForI8xx আপনি কি উন্নীতকরণ করতে চান?"
# snigdha
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -800,8 +801,8 @@
"ও কার্যকারীতা কিছুটা কমে যাবে।"
# snigdha
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -815,7 +816,7 @@
"\n"
" আপনি কি চালিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -828,11 +829,11 @@
"\n"
" আপনি কি চালিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "কোনো i686 CPU নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -843,11 +844,11 @@
"প্যাকেজ সর্বনিম্ন i686 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে আপনার "
"সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "কোনো ARMv6 CPU নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -858,11 +859,11 @@
"সব প্যাকেজ সর্বনিম্ন ARMv6 আর্কিটেকচারে নির্মাণ করা হয়েছে। এই হার্ডওয়্যার সহকারে "
"আপনার সিস্টেমকে নতুন উবুন্টু সংস্করণে আপগ্রেড করা সম্ভব নয়।"
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "কোনো init নেই"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -877,17 +878,17 @@
"\n"
"আপনি কি নিশ্চিত আপনি এগিয়ে যেতে চান?"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "aufs ব্যবহার করে স্যান্ডবক্স আপগ্রেড করা হবে"
# snigdha
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr "আপগ্রেডেকৃত প্যাকেজসহ cdrom খুঁজে বের করতে দিয়ে দেয়া পাথ ব্যবহার করুন"
# snigdha
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -895,51 +896,51 @@
"ফ্রন্টেন্ড ব্যবহার করুন। বর্তমানে পাওয়া যাচ্ছে: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr "*অবলোপ* এই অপশনটি উপেক্ষা করা হবে"
# snigdha
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr "শুধুমাত্র আংশিক আপগ্রেড কাজ করে ( কোনো উৎস তালিকা পুনর্লিিখত হয় না)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "GNU স্ক্রিন সাপোর্ট নিষ্ক্রিয়"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "datadir নির্ধারণ"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "দয়া করে '%s' ড্রাইভে '%s' প্রবেশ করান"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "টেনে আনা সম্পূর্ণ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "ফাইল আনা হচ্ছে %li এর %li %sB/s এ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "%s বাকি আছে"
@@ -947,7 +948,7 @@
# prb
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "%li এর %li ফাইল নিয়ে আসা হয়"
@@ -957,7 +958,7 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "পরিবর্তনগুলো প্রয়োগ করছি"
@@ -965,13 +966,13 @@
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "ডিপেন্ডেন্সী সমস্যা - আনকনফিগার হিসাবে রয়েছে"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "'%s' ইন্সটল করা যায় নি"
@@ -979,7 +980,7 @@
# snigdha
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -992,7 +993,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -1004,7 +1005,7 @@
# snigdha
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -1012,21 +1013,21 @@
"আপনি যদি নতুন সংস্করণ দ্বারা এটি প্রতিস্থাপন করেন তবে কনফিগারেশন ফাইলে কোনো "
"পরিবর্তন করে থাকলে তা চলে যাবে।"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "'diff' কমান্ডটি পাওয়া যায় নি"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে"
# snigdha
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -1038,14 +1039,14 @@
"করুন। আপগ্রেড বন্ধ আছে।\n"
"আপনার মূল উৎস তালিকা /etc/apt/sources.list.distUpgrade এ সংরক্ষিত আছে।"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "Ctrl-c চাপা হয়েছে"
# snigdha
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -1054,137 +1055,137 @@
"আপনি কি নিশ্চিত যে আপনি এমন করতে চান?"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "ক্যানোনিক্যাল দ্বারা আর সমর্থিত নয় (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "ডাউনগ্রেড (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "(%s) অপসারণ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "আর প্রয়োজন নেই (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "(%s) ইন্সটল"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "(%s) আপগ্রেড"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "মিডিয়া পরিবর্তন"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "পার্থক্য প্রদর্শন >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< পার্থক্য আড়াল করা"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "ত্রুটি"
# confused..coz here & seems not a shortcut
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "ও বাতিল"
# confused..coz here & seems not a shortcut
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "ও বন্ধ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "টার্মিনাল প্রদর্শন >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< টার্মিনাল আড়াল করা"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "তথ্য"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "বিস্তারিত"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "আর সমর্থিত নয় %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "%s অপসারণ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "%s অপসারণ (যা স্বয়ংক্রিয় ভাবে ইনস্টল করা হয়েছিল)"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "%s ইন্সটল"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "%s আপগ্রেড"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "পুনরায় শুরু করা প্রয়োজন"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "আপগ্রেড সম্পন্ন করতে সিস্টেমটি রিস্টার্ট করুন"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "এক্ষুনি রিস্টার্ট (_R)"
# snigdha
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1196,32 +1197,32 @@
"আপগ্রেড বন্ধ করলে সিস্টেম অকার্যকর হয়ে পড়বে। আপনাকে অবশ্যই আপগ্রেড চালিয়ে যেতে বলা "
"হচ্ছে।"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "আপগ্রেড বাতিল করা হবে কি?"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "%li দিন"
msgstr[1] "%li দিন"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "%li ঘন্টা"
msgstr[1] "%li ঘন্টা"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "%li মিনিট"
msgstr[1] "%li মিনিট"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1237,7 +1238,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1251,7 +1252,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
@@ -1259,7 +1260,7 @@
# snigdha
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1270,34 +1271,32 @@
# snigdha
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "আপনার যে সংযোগটি আছে তাতে এই ডাউনলোডটি সম্পন্ন হতে %s সময় নিবে। "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "আপগ্রেড প্রস্তুত করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "নতুন সফটওয়্যার চ্যানেল গ্রহন করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "নতুন প্যাকেজ গ্রহন করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "আপগ্রেড ইনস্টল করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "পরিস্কার করছি"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1315,7 +1314,7 @@
# snigdha
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
@@ -1323,7 +1322,7 @@
msgstr[1] "%d প্যাকেজসমূহ অপসারিত হতে যাচ্ছে।"
# snigdha
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
@@ -1331,7 +1330,7 @@
msgstr[1] "%d নতুন প্যাকেজসমূহ ইন্সটল করা হবে।"
# snigdha
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
@@ -1339,7 +1338,7 @@
msgstr[1] "%d প্যাকেজসমূহ আপগ্রেড করা হবে।"
# snigdha
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1350,7 +1349,7 @@
"\n"
"আপনাকে সম্পূর্ণ %s ডাউনলোড করতে হবে। "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
@@ -1358,7 +1357,7 @@
"আপগ্রেড ইন্সটল করতে বেশ কয়েক ঘন্টা লাগতে পারে। ডাউনলোড শেষ হওয়ার পর আপনি এটিকে "
"থামাতে পারবেন না।"
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
@@ -1366,53 +1365,53 @@
"উন্নীতকরণ আনয়ন এবং ইনস্টল করতে কয়েক ঘন্টা সময় লাগতে পারে। একবার ডাউনলোড সমাপ্ত "
"হলে, প্রক্রিয়া বাতিল করা যাবেনা।"
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr "প্যাকেজগুলো অপসরণ করতে বেশ কিছু ঘন্টা লাগতে পারে। "
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr "এই কম্পিউটারের সফটওয়্যার হালনাগাদকৃত।"
# snigdha
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr ""
"আপনার সিস্টেমের জন্য কোনো আপগ্রেড পাওয়া যাচ্ছে না। এখন আপগ্রেডটি বাতিল করা হবে।"
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "রিবুট করা প্রয়োজন"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "আপগ্রেডটি সম্পন্ন এবং রিবুট করা প্রয়োজন। আপনি কি এক্ষুনি তা করতে চান?"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr "প্রমাণীকরণ '%(file)s' বিনিময়ে '%(signature)s' "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr "'%s' নিষ্কর্ষ করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "আপগ্রেড টুলটি চালানো যায় নি"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
@@ -1420,75 +1419,75 @@
"এটি সম্ভবত উন্নীত করণ টুলের একটি বাগ। অনুগ্রহ করে কমান্ড 'ubuntu-bug update-"
"manager' ব্যবহার করে এটিকে বাগ হিসেবে প্রতিবেদন দিন।"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "আপগ্রেড টুল স্বাক্ষর"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "আপগ্রেড টুল"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "আনতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "আপগ্রেডটি আনতে ব্যর্থ। নেটওয়ার্কে কোন সমস্যা থাকতে পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "অনমোদন প্রক্রিয়া ব্যর্থ"
# snigdha
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr ""
"আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা হতে পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "এক্সট্রাক্ট করতে ব্যর্থ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "আপগ্রেডটি এক্সট্রাক্ট করতে ব্যর্থ। নেটওয়ার্ক অথবা সার্ভারে সমস্যা থাকতে পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "যাচাই ব্যর্থ"
# snigdha
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr ""
"আপগ্রেড পরীক্ষা করা ব্যর্থ হয়েছে। নেটওয়ার্ক বা সার্ভারে কোনো সমস্যা থাকতে পারে। "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "আপগ্রেড চালানো যায় নি"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
@@ -1496,14 +1495,14 @@
"এটি সাধারণত সিস্টেম দিয়ে সংঘটিত হয়েছে যেখানে /tmp mounted noexec। অনুগ্রহ করে "
"noexec ছাড়া পুনরায় মাউন্ট করুন এবং উন্নীত করণ আবার চালান।"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "ত্রুটি বার্তাটি হল '%s'।"
# snigdha
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1515,74 +1514,74 @@
"আপগ্রেডটি বন্ধ আছে।\n"
"আপনার মূল উৎস তালিকা /etc/apt/sources.list.distUpgrade এ সংরক্ষিত আছে।"
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "প্রত্যাখ্যান করা হচ্ছে"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "নীচে নামানো:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "চালিয়ে যেতে অনুগ্রহ করে [ENTER] চাপুন"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "এগিয়ে যাওয়া [yN] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "বিস্তারিত [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "হ্যাঁ"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "না"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "বিস্তা"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "আর সমর্থিত নয়: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "অপসারণ: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "ইনস্টল: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "আপগ্রেড: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "এগিয়ে যাওয়া [Yn] "
# snigdha
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1651,9 +1650,8 @@
msgstr "ডিস্ট্রিবিউশন আপগ্রেড"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-#, fuzzy
-msgid "Upgrading Ubuntu to version 12.10"
-msgstr "উবুন্টু সংস্করণ ১১.১০ তে উন্নীত করা হচ্ছে"
+msgid "Upgrading Ubuntu to version 12.04"
+msgstr "সংস্করণ ১২.০৪ এ উবুন্টু উন্নীত করা হচ্ছে"
#: ../DistUpgrade/DistUpgrade.ui.h:20
msgid " "
@@ -1671,85 +1669,86 @@
msgid "Terminal"
msgstr "টার্মিন্যাল"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "আপডেট সম্পন্ন"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "রিলিজ নোট পাওয়া যায় নি"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "সার্ভারটি মনে হয় ব্যস্ত। "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "রিলিজ নোট ডাউনলোড করা যায় নি"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "আপগ্রেড"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "রিলিজ নোট"
# snigdha
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "অতিরিক্ত প্যাকেজ ফাইলগুলো ডাউনলোড করা হচ্ছে..."
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "%sB/s এ ফাইল %s এর %s"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "ফাইল %s এর %s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "ব্রাউজারে লিংক খুলুন"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "ক্লিপবোর্ডে লিংক অনুলিপি"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr "%(total)li এর %(current)li ডাউনলোড করা হচ্ছে %(speed)s/s এ"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "%(total)li এর %(current)li ডাউনলোড করা হচ্ছে"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "আপনার উবুন্টু রিলিজ এখন আর সমর্থিত নয়।"
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
@@ -1757,52 +1756,58 @@
"আপনি আগামীতে আর কখনও নিরাপত্তার সংশোধন অথবা সংকটপূর্ণ হালনাগাদ পাবেন না। অনুগ্রহ "
"করে উবুন্টুর একটি পরবর্তী সংস্করণে হালনাগাদ করুন।"
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "আপগ্রেড তথ্য"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "ইনস্টল"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr "নাম"
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "ভার্সন %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr ""
"নেটওয়ার্ক সংযোগ পাওয়া যায়নি, আপনি কোনো চেঞ্জলগ তথ্য ডাউনলোড করতে পারেন না।"
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছে..."
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr "সব নির্বাচিত গুলো এখন অনির্বাচন করুন (_D)"
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr "সব নির্বাচন করুন (_S)"
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "%(count)s আপডেট নির্বাচিত হয়েছে।"
+msgstr[1] "%(count)s আপডেট নির্বাচিত হয়েছে।"
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "%s ডাউনলোড করা হবে।"
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
msgstr[0] "হালনাগাদ ইতোমধ্যে ডাউনলোড করা হয়েছে, কিন্তু ইন্সটল করা হয়নি।"
msgstr[1] "হালনাগাদ ইতোমধ্যে ডাউনলোড করা হয়েছে, কিন্তু ইন্সটল করা হয়নি।"
@@ -1810,11 +1815,18 @@
msgid "There are no updates to install."
msgstr "ইনস্টল করতে কোনো হালনাগাদ নেই।"
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "অজানা পরিমান ডাউনলোড।"
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
@@ -1822,7 +1834,7 @@
"এটি অজ্ঞাত যখন প্যাকেজ তথ্য সর্বশেষ হালনাগাদ করা হয়েছে। অনুগ্রহ করে তথ্য হালনাগাদ "
"করতে 'পরীক্ষা' বোতাম ক্লিক করুন।"
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1832,7 +1844,7 @@
"নতুন সফ্টওয়্যার সম্পর্কিত হালনাগাদের জন্য নিচের 'পরীক্ষা করুন' বোতামে চাপুন।"
# snigdha
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
@@ -1840,7 +1852,7 @@
msgstr[1] "%(days_ago)s দিন আগে প্যাকেজ তথ্য শেষবার আপডেট করা হয়েছিল।"
# snigdha
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1849,35 +1861,44 @@
msgstr[1] "%(hours_ago)s ঘন্টা আগে প্যাকেজ তথ্য শেষবার আপডেট করা হয়েছিল।"
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr "প্যাকেজ তথ্য সর্বশেষ হালনাগাদ করা হয়েছে %s মিনিট আগে।"
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr "প্যাকেজ তথ্য মাত্র হালনাগাদ করা হয়েছে।"
-#: ../UpdateManager/UpdateManager.py:689
+# prb
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr "সফ্টওয়্যার আপডেট করার ফলে ভুলগুলো সংশোধিত হয়,"
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "আপনার কম্পিউটারে সফ্টওয়্যার আপডেট পাওয়া যেতে পারে।"
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
-msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
-msgstr ""
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "উবুন্টুতে স্বাগতম"
-#: ../UpdateManager/UpdateManager.py:700
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
-msgstr ""
+"These software updates have been issued since this version of Ubuntu was "
+"released."
+msgstr "এই সংস্করণ অবমুক্ত হওয়ার পর থেকে এই সকল সফটওয়্যার হালনাগাদ প্রদত্ত হয়ে আসছে।"
+
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
+msgstr "এই কম্পিউটারের জন্য সফটওয়্যার হালনাগাদকরণ অব্যবহৃত।"
# snigdha
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1890,7 +1911,7 @@
"অস্থায়ী প্যাকেজগুলো ফেলে দিন।"
# snigdha
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1898,25 +1919,25 @@
"আপডেট ইনস্টল শেষ হলে কম্পিউটার রিস্টার্ট দেয়া দরকার। রিস্টার্ট করার আগে আপনার "
"কাজগুলো সংরক্ষণ করে নিন।"
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "প্যাকেজ বিষয়ক তথ্য পড়ছে"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "সংযুক্ত করা হচ্ছে ..."
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr "আপনি কোনো হালনাগাদ পরীক্ষা বা নতুন কোনো হালনাগাদ ডাউনলোড কতে পারবেন না।"
# snigdha
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "প্যাকেজ তথ্য চালু করা যাচ্ছে না"
# snigdha
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1930,7 +1951,7 @@
"বার্তাটি যোগ করে দিন:\n"
# snigdha
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1942,31 +1963,31 @@
"'আপডেট ম্যানেজার' প্যাকেজ সম্পর্কে বাগটি রিপোর্ট করুন এবং ভুল সম্পর্কিত নিম্নোক্ত "
"বার্তাটি যোগ করে দিন:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (নতুন ইনস্টল)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(আকার: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "সংস্করণ %(old_version)s থেকে %(new_version)s"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "সংস্করণ %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "এখন রিলিজ উন্নীত করা সম্ভব নয়"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
@@ -1975,23 +1996,23 @@
"বর্তমানে রিলিজ আপগ্রেড সমভব নয়, অনুগ্রহ করে একটু পর আবার চেষ্টা করুন। সার্ভারের "
"প্রতিবেদন: '%s'"
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "রিলিজ আপগ্রেড টুল ডাউনলোড করা হচ্ছে"
# snighda
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "নতুন উবুন্টু রিলিজ '%s' পাওয়া যাচ্ছে"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট"
# snigdha
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -2001,6 +2022,17 @@
"\"সিন্যাপটিক\" প্যাকেজ ম্যানেজার ব্যবহার করুন বা টার্মিনালে \"sudo apt-get install "
"-f\" চালিয়ে দেখুন।"
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "নতুন রিলিজ '%s' বিদ্যমান।"
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "বাতিল"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr "হালনাগাদের জন্য পরীক্ষা করুন"
@@ -2010,23 +2042,19 @@
msgstr "সব বিদ্যমান হালনাগাদ ইনস্টল করুন"
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "বাতিল"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr "পরিবর্তন"
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr "হালনাগাদ"
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "হালনাগাদ তালিকা প্রস্তুত করা হচ্ছে"
# prb
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -2050,21 +2078,21 @@
" * Unofficial software packages not provided by Ubuntu\n"
" * Normal changes of a pre-release version of Ubuntu"
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "changelog ডাউনলোড করা হচ্ছে"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "অন্যান্য হালনাগাদ (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr "এই হালনাগাদ উৎস থেকে আসে না যা পরিবর্তনে লগ সমর্থন করে।"
# snigdha
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -2072,7 +2100,7 @@
"পরিবর্তনসমূহের তালিকা ডাউনলোড করা ব্যার্থ হয়েছে। \n"
"অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।"
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -2086,7 +2114,7 @@
"\n"
# prb
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -2101,7 +2129,7 @@
" ব্যবহার করুন এবং পরে আবার চেষ্টা করুন।"
# snigdha
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -2115,54 +2143,46 @@
"ubuntu/+source/%s/%s/+changelog\n"
" ব্যবহার করুন এবং পরে আবার চেষ্টা করুন।"
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "ডিস্ট্রিবিউশন সনাক্ত করতে ব্যর্থ"
# snigdha
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr ""
"আপনি কোন সিস্টেম ব্যবহার করছেন তা পরীক্ষা করার সময় একটি ত্রুটি '%s' সংগঠিত হয়।"
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "প্রয়োজনীয় নিরাপত্তা হালনাগাদ"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "সুপারিশকৃত হালনাগাদ"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "পরামর্শিত হালনাগাদ"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "ব্যাকপোর্ট"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "ডিস্ট্রিবিউশন হালনাগাদ"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "অন্যান্য হালনাগাদ"
# snigdha
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "আপডেট ম্যানেজার চালু করা হচ্ছে"
-# prb
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr "সফ্টওয়্যার আপডেট করার ফলে ভুলগুলো সংশোধিত হয়,"
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "আংশিক আপগ্রেড (_P)"
@@ -2238,37 +2258,27 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "সফ্টওয়্যার আপডেট"
+msgid "Update Manager"
+msgstr "আপডেট ম্যানেজার"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "সফ্টওয়্যার আপডেট"
+msgid "Starting Update Manager"
+msgstr "আপডেট ম্যানেজার শুরু করা হচ্ছে"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "আপগ্রেড (_p)"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "আপডেটসমূহ"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "ইনস্টল"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "পরিবর্তন"
+msgid "updates"
+msgstr "আপডেটসমূহ"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "বর্ননা"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "হালনাগাদের বর্ণনা"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
@@ -2276,23 +2286,33 @@
"আপনি রোমিং ব্যবহার করে সংযুক্ত এবং হালনাগাদের জন্য যে ডাটা ব্যবহৃত হয় তার জন্য টাকা "
"খরচ হতে পারে।"
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "আপনি ওয়ারলেস মোডেম দিয়ে সংযুক্ত।"
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr "হালনাগাদ করার আগে কম্পিউটার AC পাওয়ারে সংযুক্ত করে নেয়া নিরাপদ।"
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "আপডেট ইন্সটল করো (_I)"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "পরিবর্তন"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr "সেটিং (_S)..."
+msgid "Description"
+msgstr "বর্ননা"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "ইনস্টল"
+msgid "Description of update"
+msgstr "হালনাগাদের বর্ণনা"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr "সেটিং (_S)..."
# snigdha
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
@@ -2318,9 +2338,8 @@
# snigdha
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr ""
"আপগ্রেড ম্যানেজারে \"আপগ্রেড\" ক্লিক করে আপনি পরেও আপগ্রেড করে নিতে পারবেন।"
@@ -2333,62 +2352,62 @@
msgid "Show and install available updates"
msgstr "উপস্হিত আপডেট গুলো প্রদর্শন এবং ইন্সটল করো"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "সংস্করণ প্রদর্শন এবং প্রস্থান"
# snigdha
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "যে ডিরেক্টরীতে ডাটা ফাইল থাকে"
# snigdha
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "নতুন উবুন্টু রিলিজ পাওয়া যাচ্ছে কিনা তা পরীক্ষা করুন"
# snigdha
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr "সর্বশেষ ডেভেল রিলিজ আপগ্রেড করা সম্ভব কিনা তা পরীক্ষা করে দেখুন"
# snigdha
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "রিলিজ আপগ্রেডারের প্রস্তাবিত সর্বশেষ সংস্করণের সাহায্যে আপগ্রেড করুন"
# snigdha
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "শুরুতেই মানচিত্রের দিকে মনযোগ দিবেন না"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "dist-upgrade চালানোর চেষ্টা"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "শুরু করার সময় হালনাগাদ পরীক্ষা করা যাবে না।"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "স্যান্ডবক্স aufs ওভারলে দিয়ে আপগ্রেড পরীক্ষা করা"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "আংশিক আপগ্রেড চালানো হচ্ছে"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr "পরিবর্তণের পরিবর্তে প্যাকেজের বর্ণনা প্রদর্শন করুন"
# snigdha
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "$distro-প্রস্তাবিত থেকে আপগ্রেডারের সাহায্যে সর্বশেষ রিলিজে আপগ্রেড করুন"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2398,11 +2417,11 @@
"বর্তমানে ডেস্কটপ সিস্টেমের নিয়মিত আপগ্রেডের জন্য 'desktop' এবং সার্ভার সিস্টেমের "
"জন্য 'server'।"
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "উল্লেখিত ফ্রন্টএন্ড চালনা"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2410,11 +2429,11 @@
"নতুন কোনো ডিস্ট্রিবিউশন রিলিজ বিদ্যমান কি না পরীক্ষা করুন এবং exit কোডের মাধ্যে "
"রিপোর্ট করুন"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr "নতুন উবুন্টু রিলিজের জন্য খোঁজ নেয়া হচ্ছে"
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2422,68 +2441,68 @@
"তথ্য আপগ্রেডের জন্য, অনুগ্রহ করে দেখুন:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "নতুন কোন সংস্করণ পাওয়া যায় নি"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "নতুন রিলিজ '%s' বিদ্যমান।"
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "আপগ্রেড করতে 'do-release-upgrade' চালান।"
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "উবুন্টু %(version)s আপগ্রেড বিদ্যমান"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "আপনি উবুন্টু %s তে আপগ্রেড করতে চেয়েছেন"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr "ডিবাগ আউটপুট সংযুক্ত করুন"
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr "এই মেশিনের অসমর্থিত প্যাকেজ প্রদর্শন করুন"
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr "এই মেশিনের সমর্থিত প্যাকেজ প্রদর্শন করুন"
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr "তাদের অবস্থার সাথে সব প্যাকেজ প্রদর্শন করুন"
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr "তালিকার সব প্যাকেজ প্রদর্শন করুন"
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr "'%s' এর অবস্থার সারাংশ সমর্থন:"
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) সমর্থিত যতক্ষণ না %(time)s"
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) যা পারেনা/ডাউনলোডের যোগ্য নেই"
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr "আপনার %(num)s প্যাকেজ (%(শতকরা).1f%%) যা অসমর্থিত"
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
@@ -2491,122 +2510,153 @@
"সচল --প্রদর্শন করুন-অসমর্থিত, --প্রদর্শন করুন-সমর্থিত অথবা --প্রদর্শন করুন-সব আরও "
"বিস্তারিত দেখতে"
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr "আর ডাউনলোডের যোগ্য নেই:"
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr "অসমর্থিত: "
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr "%s পর্যন্ত সমর্থিত:"
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr "অসমর্থিত"
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "অবাস্তবায়িত মেথড: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "ডিস্কে একটি ফাইল"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".deb প্যাকেজ"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "অনুপস্থিত প্যাকেজ ইনস্টল।"
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "%s প্যাকেজ ইনস্টল করা প্রয়োজন।"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".deb প্যাকেজ"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "%s কে ম্যানুয়ালী ইনস্টলের জন্য চিহ্নিত করা প্রয়োজন।"
-
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
-msgid ""
-"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
-"installed. See bugs.launchpad.net, bug #279621 for details."
-msgstr ""
-"আপগ্রেড করার সময়, যদি kdelibs4-dev ইনস্টল করা হয়, তবে kdelibs5-dev ইনস্টল করা "
-"প্রয়োজন। বিস্তারিত জানতে bugs.launchpad.net, bug #279621 দেখুন।"
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
msgid "%i obsolete entries in the status file"
msgstr "স্ট্যাটাস ফাইলে %i অবসোলেট এন্ট্রি"
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
msgid "Obsolete entries in dpkg status"
msgstr "dpkg স্ট্যাটাসে অবসোলেট এন্ট্রি"
#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
msgid "Obsolete dpkg status entries"
msgstr "অবসোলেট dpkg স্ট্যাটাস এন্ট্রি"
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
+msgid ""
+"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
+"installed. See bugs.launchpad.net, bug #279621 for details."
+msgstr ""
+"আপগ্রেড করার সময়, যদি kdelibs4-dev ইনস্টল করা হয়, তবে kdelibs5-dev ইনস্টল করা "
+"প্রয়োজন। বিস্তারিত জানতে bugs.launchpad.net, bug #279621 দেখুন।"
+
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
+#, python-format
+msgid "%s needs to be marked as manually installed."
+msgstr "%s কে ম্যানুয়ালী ইনস্টলের জন্য চিহ্নিত করা প্রয়োজন।"
+
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
msgstr ""
"lilo অপসারন করা হয়েছে grub ইনস্টল করা হয়েছে। (বিস্তারিতের জন্য বাগ #314004 "
"দেখুন।)"
-#~ msgid ""
-#~ "After your package information was updated the essential package '%s' can "
-#~ "not be found anymore so a bug reporting process is being started."
-#~ msgstr ""
-#~ "আপনার প্যাকেজের তথ্য হালনাগাদের পরে গুরুত্বপূর্ণ প্যাকেজ '%s' আর খুঁজে পাওয়া যায়নি "
-#~ "তাই বাগ প্রতিবেদন করার প্রক্রিয়া শুরু হচ্ছে।"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
-#~ msgid "Upgrading Ubuntu to version 12.04"
-#~ msgstr "সংস্করণ ১২.০৪ এ উবুন্টু উন্নীত করা হচ্ছে"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "%(count)s আপডেট নির্বাচিত হয়েছে।"
-#~ msgstr[1] "%(count)s আপডেট নির্বাচিত হয়েছে।"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "উবুন্টুতে স্বাগতম"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid ""
-#~ "These software updates have been issued since this version of Ubuntu was "
-#~ "released."
+#~ "After your package information was updated the essential package '%s' can "
+#~ "not be found anymore so a bug reporting process is being started."
#~ msgstr ""
-#~ "এই সংস্করণ অবমুক্ত হওয়ার পর থেকে এই সকল সফটওয়্যার হালনাগাদ প্রদত্ত হয়ে আসছে।"
-
-#~ msgid "Software updates are available for this computer."
-#~ msgstr "এই কম্পিউটারের জন্য সফটওয়্যার হালনাগাদকরণ অব্যবহৃত।"
-
-#~ msgid "Update Manager"
-#~ msgstr "আপডেট ম্যানেজার"
-
-#~ msgid "Starting Update Manager"
-#~ msgstr "আপডেট ম্যানেজার শুরু করা হচ্ছে"
-
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "আপনি ওয়ারলেস মোডেম দিয়ে সংযুক্ত।"
-
-#~ msgid "_Install Updates"
-#~ msgstr "আপডেট ইন্সটল করো (_I)"
+#~ "আপনার প্যাকেজের তথ্য হালনাগাদের পরে গুরুত্বপূর্ণ প্যাকেজ '%s' আর খুঁজে পাওয়া যায়নি "
+#~ "তাই বাগ প্রতিবেদন করার প্রক্রিয়া শুরু হচ্ছে।"
#~ msgid "Your system is up-to-date"
#~ msgstr "আপনার সিস্টেম আপ-টু-ডেট"
@@ -2751,6 +2801,9 @@
#~ "আপনার ইনটেল গ্রাফিক্স হার্ডওয়্যারের জন্য উবুন্টু ১১.০৪ সমর্থন সীমিত এবং উন্নীত করার "
#~ "পরে আপনি সমস্যার সম্মুখীন হতে পারেন। আপনি কি উন্নীত করণ চালিয়ে যেতে চান?"
+#~ msgid "Upgrading Ubuntu to version 11.10"
+#~ msgstr "উবুন্টু সংস্করণ ১১.১০ তে উন্নীত করা হচ্ছে"
+
#~ msgid ""
#~ "These software updates have been issued since this version of Ubuntu was "
#~ "released. If you don't want to install them now, choose \"Update Manager"
diff -Nru update-manager-17.10.11/po/bo.po update-manager-0.156.14.15/po/bo.po
--- update-manager-17.10.11/po/bo.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/bo.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2011.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2011-12-06 06:39+0000\n"
"Last-Translator: Tennom \n"
"Language-Team: Tibetan \n"
@@ -20,7 +21,7 @@
"X-Generator: Launchpad (build 15099)\n"
#. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:433 ../UpdateManager/Core/utils.py:433
+#: ../DistUpgrade/utils.py:399 ../UpdateManager/Core/utils.py:399
#, python-format
msgid "%(size).0f kB"
msgid_plural "%(size).0f kB"
@@ -28,13 +29,13 @@
msgstr[1] ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:436 ../UpdateManager/Core/utils.py:436
+#: ../DistUpgrade/utils.py:402 ../UpdateManager/Core/utils.py:402
#, python-format
msgid "%.1f MB"
msgstr "%.1f MB"
#. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:436
+#: ../DistUpgrade/distro.py:211 ../DistUpgrade/distro.py:442
#, python-format
msgid "Server for %s"
msgstr "%s ཡི་ཞབས་ཞུ་བ"
@@ -42,20 +43,20 @@
#. More than one server is used. Since we don't handle this case
#. in the user interface we set "custom servers" to true and
#. append a list of all used servers
-#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230
-#: ../DistUpgrade/distro.py:246
+#: ../DistUpgrade/distro.py:229 ../DistUpgrade/distro.py:235
+#: ../DistUpgrade/distro.py:251
msgid "Main server"
msgstr "ཞབས་ཞུ་བ་གཙོ་བོ"
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:255
msgid "Custom servers"
msgstr "རང་བཟོས་ཞབས་ཞུ་བ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:142
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
msgid "Could not calculate sources.list entry"
msgstr "གཏེར་མཛོད་གྲངས་ཐོ་བརྩི་མི་ཐུབ"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:251
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
msgid ""
"Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
"wrong architecture?"
@@ -63,11 +64,11 @@
"ཡིག་ཆ་ཐུམ་བུ་གནས་སྟོན་ཐུབ་མི་འདུག འདི་ཕལ་ཆེར་མ་ལག་Ubuntu་མཛོད་སྡེར་རེད་མི་འདུག་ཡང་ན་སྒྲིག་བཟོ་ "
"ཡང་དག་པ་རེད་མི་འདུག"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:294
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
msgid "Failed to add the CD"
msgstr "་་CD་་འོད་སྡེར་ནང་ཚན་ཁ་སྣོན་ཐུབ་མ་བྱུང་།"
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:295
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -82,12 +83,12 @@
"ནོར་འཁྲུལ་ཡི་གེ་ནི། \n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeCache.py:151
+#: ../DistUpgrade/DistUpgradeCache.py:147
msgid "Remove package in bad state"
msgid_plural "Remove packages in bad state"
msgstr[0] "སྐྱོན་ཅན་གྱི་ཐུམ་བུ་བསུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:150
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -103,15 +104,15 @@
#. FIXME: not ideal error message, but we just reuse a
#. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:255
+#: ../DistUpgrade/DistUpgradeCache.py:248
msgid "The server may be overloaded"
msgstr "ཕལ་ཆེར་དྲ་ཞབས་ཞུ་བ་འདིར་ཁུར་པོ་ལྗིད་དྲག་འདུག"
-#: ../DistUpgrade/DistUpgradeCache.py:368
+#: ../DistUpgrade/DistUpgradeCache.py:361
msgid "Broken packages"
msgstr "སྐྱོན་ཤོར་བའི་ཐུམ་བུ"
-#: ../DistUpgrade/DistUpgradeCache.py:369
+#: ../DistUpgrade/DistUpgradeCache.py:362
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."
@@ -120,7 +121,7 @@
"synaptic་འམ་ཡང་ན་apt-get་བེད་སྤྱོད་གཏོང་ནས་བཟོ་བཅོས་བྱེད་རོགས"
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:693
+#: ../DistUpgrade/DistUpgradeCache.py:679
#, python-format
msgid ""
"An unresolvable problem occurred while calculating the upgrade:\n"
@@ -140,26 +141,26 @@
" * མ་ལག་Ubuntu་ཀྱིས་མཁོ་སྤྲོད་མ་བྱས་པའི་གཞུང་བཟོས་མཉེན་ཆས་ཐུམ་བུ་མིན་པ\n"
"\n"
-#: ../DistUpgrade/DistUpgradeCache.py:703
+#: ../DistUpgrade/DistUpgradeCache.py:689
msgid "This is most likely a transient problem, please try again later."
msgstr "This is most likely a transient problem. Please try again later."
-#: ../DistUpgrade/DistUpgradeCache.py:706
+#: ../DistUpgrade/DistUpgradeCache.py:692
msgid ""
"If none of this applies, then please report this bug using the command "
"'ubuntu-bug update-manager' in a terminal."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:711
-#: ../UpdateManager/UpdateManager.py:1031
+#: ../DistUpgrade/DistUpgradeCache.py:697
+#: ../UpdateManager/UpdateManager.py:1037
msgid "Could not calculate the upgrade"
msgstr "རིམ་སྤོར་རྩིས་འདངས་རྒྱག་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:748
msgid "Error authenticating some packages"
msgstr "ཐུམ་བུ་འགའ་ངོས་འཛིན་བྱེད་པ་ནོར་འཁྲུལ་"
-#: ../DistUpgrade/DistUpgradeCache.py:763
+#: ../DistUpgrade/DistUpgradeCache.py:749
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 "
@@ -169,39 +170,39 @@
"network problem. You may want to try again later. See below for a list of "
"unauthenticated packages."
-#: ../DistUpgrade/DistUpgradeCache.py:783
+#: ../DistUpgrade/DistUpgradeCache.py:769
#, python-format
msgid ""
"The package '%s' is marked for removal but it is in the removal blacklist."
msgstr "རྟགས་'%s'འདི་འཁོད་ཡོད་པ་ཚང་མ་བསུབ་དགོས་ཀྱང་འདི་བསུབ་རྒྱུའི་དེབ་ཐོ་ནང་དུ་མི་འདུག"
-#: ../DistUpgrade/DistUpgradeCache.py:787
+#: ../DistUpgrade/DistUpgradeCache.py:773
#, python-format
msgid "The essential package '%s' is marked for removal."
msgstr "གལ་ཆེན་ཐུམ་བུ'%s' འདིར་བསུབ་དགོས་པའི་རྟགས་འཁོད་འདུག"
-#: ../DistUpgrade/DistUpgradeCache.py:796
+#: ../DistUpgrade/DistUpgradeCache.py:782
#, python-format
msgid "Trying to install blacklisted version '%s'"
msgstr "རྟགས་ངན་ཅན་པར་གཞི་'%s་སྒྲིག་འཇུག་ཚོད་ལྟ་བཞིན་པ'"
-#: ../DistUpgrade/DistUpgradeCache.py:914
+#: ../DistUpgrade/DistUpgradeCache.py:900
#, python-format
msgid "Can't install '%s'"
msgstr "'%s'སྒྲིག་འཇུག་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:915
+#: ../DistUpgrade/DistUpgradeCache.py:901
msgid ""
"It was impossible to install a required package. Please report this as a bug "
"using 'ubuntu-bug update-manager' in a terminal."
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:926
+#: ../DistUpgrade/DistUpgradeCache.py:912
msgid "Can't guess meta-package"
msgstr "meta-package་ཚོད་དཔགས་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeCache.py:927
+#: ../DistUpgrade/DistUpgradeCache.py:913
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
"desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -214,15 +215,15 @@
"བྱེད་པ་འགྲུབ་མི་སྲིད \n"
"མདུན་སྐྱོད་མ་བྱས་གོང་synaptic་དང་ཡང་ན་ apt-get་བེད་སྤྱོད་ནས་གོང་གི་ཐུམ་བུ་ཞིག་སྒྲིག་འཇུག་བྱེད་རོགས"
-#: ../DistUpgrade/DistUpgradeController.py:114
+#: ../DistUpgrade/DistUpgradeController.py:100
msgid "Reading cache"
msgstr "དྲ་ཤུལ་ཀློག་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:223
+#: ../DistUpgrade/DistUpgradeController.py:209
msgid "Unable to get exclusive lock"
msgstr "གཅིག་འགྱུར་གྱི་ཟྭ་མ་ཐོབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:224
+#: ../DistUpgrade/DistUpgradeController.py:210
msgid ""
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
@@ -230,11 +231,11 @@
"This usually means that another package management application (like apt-get "
"or aptitude) already running. Please close that application first."
-#: ../DistUpgrade/DistUpgradeController.py:257
+#: ../DistUpgrade/DistUpgradeController.py:243
msgid "Upgrading over remote connection not supported"
msgstr "རྒྱང་འབྲེལ་སྦྲེལ་མཐུད་རིམ་སྤོར་བྱེད་པ་རྒྱབ་སྐྱོར་མེད"
-#: ../DistUpgrade/DistUpgradeController.py:258
+#: ../DistUpgrade/DistUpgradeController.py:244
msgid ""
"You are running the upgrade over a remote ssh connection with a frontend "
"that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -247,11 +248,11 @@
"\n"
"རིམ་སྤོར་འདི་ད་ལྟ་མཚམས་བཅད་རྒྱུ་ཡིན་པ་དང་sshམ་སྤྱད་པ་ཚོད་ལྟ་བྱེད་རོགས"
-#: ../DistUpgrade/DistUpgradeController.py:272
+#: ../DistUpgrade/DistUpgradeController.py:258
msgid "Continue running under SSH?"
msgstr "SSH?"
-#: ../DistUpgrade/DistUpgradeController.py:273
+#: ../DistUpgrade/DistUpgradeController.py:259
#, python-format
msgid ""
"This session appears to be running under ssh. It is not recommended to "
@@ -268,11 +269,11 @@
"If you continue, an additional ssh daemon will be started at port '%s'.\n"
"Do you want to continue?"
-#: ../DistUpgrade/DistUpgradeController.py:287
+#: ../DistUpgrade/DistUpgradeController.py:273
msgid "Starting additional sshd"
msgstr "Starting additional sshd"
-#: ../DistUpgrade/DistUpgradeController.py:288
+#: ../DistUpgrade/DistUpgradeController.py:274
#, python-format
msgid ""
"To make recovery in case of failure easier, an additional sshd will be "
@@ -283,7 +284,7 @@
"started on port '%s'. If anything goes wrong with the running ssh, you can "
"still connect to the additional one.\n"
-#: ../DistUpgrade/DistUpgradeController.py:296
+#: ../DistUpgrade/DistUpgradeController.py:282
#, python-format
msgid ""
"If you run a firewall, you may need to temporarily open this port. As this "
@@ -295,29 +296,29 @@
"འགུལ་གྱིས་བཟོས་མེད། ཁྱོད་ཀྱིས་འདི་སྤྱད་ནས་མཐུད་སྣེ་ཁ་འབྱེད་ཆོག་པ། དཔེར་ན:\n"
"'%s'"
-#: ../DistUpgrade/DistUpgradeController.py:368
-#: ../DistUpgrade/DistUpgradeController.py:413
+#: ../DistUpgrade/DistUpgradeController.py:354
+#: ../DistUpgrade/DistUpgradeController.py:399
msgid "Can not upgrade"
msgstr "Cannot upgrade"
-#: ../DistUpgrade/DistUpgradeController.py:369
+#: ../DistUpgrade/DistUpgradeController.py:355
#, python-format
msgid "An upgrade from '%s' to '%s' is not supported with this tool."
msgstr "An upgrade from '%s' to '%s' is not supported with this tool."
-#: ../DistUpgrade/DistUpgradeController.py:378
+#: ../DistUpgrade/DistUpgradeController.py:364
msgid "Sandbox setup failed"
msgstr "Sandbox setup failed"
-#: ../DistUpgrade/DistUpgradeController.py:379
+#: ../DistUpgrade/DistUpgradeController.py:365
msgid "It was not possible to create the sandbox environment."
msgstr "It was not possible to create the sandbox environment."
-#: ../DistUpgrade/DistUpgradeController.py:385
+#: ../DistUpgrade/DistUpgradeController.py:371
msgid "Sandbox mode"
msgstr "Sandbox mode"
-#: ../DistUpgrade/DistUpgradeController.py:386
+#: ../DistUpgrade/DistUpgradeController.py:372
#, python-format
msgid ""
"This upgrade is running in sandbox (test) mode. All changes are written to "
@@ -327,17 +328,17 @@
"are permanent."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:414
+#: ../DistUpgrade/DistUpgradeController.py:400
msgid ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
msgstr ""
"Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:426
msgid "Package 'debsig-verify' is installed"
msgstr "Package 'debsig-verify' is installed"
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:427
msgid ""
"The upgrade can not continue with that package installed.\n"
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -347,12 +348,12 @@
"Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
"run the upgrade again."
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:439
#, python-format
msgid "Can not write to '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:454
+#: ../DistUpgrade/DistUpgradeController.py:440
#, python-format
msgid ""
"Its not possible to write to the system directory '%s' on your system. The "
@@ -360,11 +361,11 @@
"Please make sure that the system directory is writable."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:465
+#: ../DistUpgrade/DistUpgradeController.py:451
msgid "Include latest updates from the Internet?"
msgstr "Include latest updates from the Internet?"
-#: ../DistUpgrade/DistUpgradeController.py:466
+#: ../DistUpgrade/DistUpgradeController.py:452
msgid ""
"The upgrade system can use the internet to automatically download the latest "
"updates and install them during the upgrade. If you have a network "
@@ -384,16 +385,16 @@
"latest updates soon after upgrading.\n"
"If you answer 'no' here, the network is not used at all."
-#: ../DistUpgrade/DistUpgradeController.py:686
+#: ../DistUpgrade/DistUpgradeController.py:672
#, python-format
msgid "disabled on upgrade to %s"
msgstr "disabled on upgrade to %s"
-#: ../DistUpgrade/DistUpgradeController.py:713
+#: ../DistUpgrade/DistUpgradeController.py:699
msgid "No valid mirror found"
msgstr "No valid mirror found"
-#: ../DistUpgrade/DistUpgradeController.py:714
+#: ../DistUpgrade/DistUpgradeController.py:700
#, python-format
msgid ""
"While scanning your repository information no mirror entry for the upgrade "
@@ -413,11 +414,11 @@
"If you select 'No' the upgrade will cancel."
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:734
+#: ../DistUpgrade/DistUpgradeController.py:720
msgid "Generate default sources?"
msgstr "Generate default sources?"
-#: ../DistUpgrade/DistUpgradeController.py:735
+#: ../DistUpgrade/DistUpgradeController.py:721
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -430,21 +431,21 @@
"Should default entries for '%s' be added? If you select 'No', the upgrade "
"will cancel."
-#: ../DistUpgrade/DistUpgradeController.py:770
+#: ../DistUpgrade/DistUpgradeController.py:756
msgid "Repository information invalid"
msgstr "གསོག་མཛོད་ཆ་འཕྲིན་ཕན་ནུས་མེད་པ"
-#: ../DistUpgrade/DistUpgradeController.py:771
+#: ../DistUpgrade/DistUpgradeController.py:757
msgid ""
"Upgrading the repository information resulted in a invalid file so a bug "
"reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:778
+#: ../DistUpgrade/DistUpgradeController.py:764
msgid "Third party sources disabled"
msgstr "གཉེར་མཁན་གསུམ་པའི་འབྱུང་ཁུངས་ནུས་མེད་སྒྱུར"
-#: ../DistUpgrade/DistUpgradeController.py:779
+#: ../DistUpgrade/DistUpgradeController.py:765
msgid ""
"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or your "
@@ -454,12 +455,12 @@
"enable them after the upgrade with the 'software-properties' tool or your "
"package manager."
-#: ../DistUpgrade/DistUpgradeController.py:819
+#: ../DistUpgrade/DistUpgradeController.py:805
msgid "Package in inconsistent state"
msgid_plural "Packages in inconsistent state"
msgstr[0] "འཐུམ་སྒྲིལ་མཉམ་སྒྲིལ་མིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:822
+#: ../DistUpgrade/DistUpgradeController.py:808
#, python-format
msgid ""
"The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -473,11 +474,11 @@
"'%s' འཐུམ་སྒྲིལ་ནི་མཉམ་དུ་སྦྲེལ་མི་འདུག་པས་ཡང་བསྐྱར་སྒྲིག་འཇུག་གནང་རོགས། ཡིནའང་སྒྲིག་འཇུག་ཡིག་ཚགས་ཀྱང་"
"རྙེད་མི་འདུག་པས་འཐུམ་སྒྲིལ་ལག་པས་སྒྲིག་འཇུག་བཤིགས་པའམ་མ་ལག་ཐོག་ནས་འདོར་དགོས"
-#: ../DistUpgrade/DistUpgradeController.py:870
+#: ../DistUpgrade/DistUpgradeController.py:856
msgid "Error during update"
msgstr "གསར་སྒྱུར་གྱི་ནོར་འཁྲུལ"
-#: ../DistUpgrade/DistUpgradeController.py:871
+#: ../DistUpgrade/DistUpgradeController.py:857
msgid ""
"A problem occurred during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
@@ -485,13 +486,13 @@
"གསར་སྒྱུར་སྐབས་ནོར་འཁྲུལ་བྱུང་བ། ནམ་རྒྱུན་འདི་ནི་དྲ་བའི་གནོད་སྐྱོན་ཡིན་པས་ problem, please check "
"your network connection and retry."
-#. print("on_button_install_clicked")
-#: ../DistUpgrade/DistUpgradeController.py:880
-#: ../UpdateManager/UpdateManager.py:757
+#. print "on_button_install_clicked"
+#: ../DistUpgrade/DistUpgradeController.py:866
+#: ../UpdateManager/UpdateManager.py:755
msgid "Not enough free disk space"
msgstr "བླུགས་སྡེར་འདངས་བ་མེད་པ"
-#: ../DistUpgrade/DistUpgradeController.py:881
+#: ../DistUpgrade/DistUpgradeController.py:867
#, python-format
msgid ""
"The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -505,21 +506,21 @@
#. calc the dist-upgrade and see if the removals are ok/expected
#. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:910
-#: ../DistUpgrade/DistUpgradeController.py:1692
+#: ../DistUpgrade/DistUpgradeController.py:896
+#: ../DistUpgrade/DistUpgradeController.py:1677
msgid "Calculating the changes"
msgstr "བཟོ་བཅོས་འདི་བརྩི་འདངས་རྒྱག་བཞིན་པ"
#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:942
+#: ../DistUpgrade/DistUpgradeController.py:928
msgid "Do you want to start the upgrade?"
msgstr "རིམ་སྤོར་འགོ་འཛུགས་དགོས་སམ"
-#: ../DistUpgrade/DistUpgradeController.py:1008
+#: ../DistUpgrade/DistUpgradeController.py:994
msgid "Upgrade canceled"
msgstr "རིམ་སྤོར་རྩིས་མེད་གཏོང"
-#: ../DistUpgrade/DistUpgradeController.py:1009
+#: ../DistUpgrade/DistUpgradeController.py:995
msgid ""
"The upgrade will cancel now and the original system state will be restored. "
"You can resume the upgrade at a later time."
@@ -527,12 +528,12 @@
"རིམ་སྤོར་རྩིས་མེད་གཏོང་ནས་མ་ལག་ཐོག་མའི་གནས་སྟངས་བསྐྱར་གསོས་བྱེད་རྒྱུ ཁྱོད་ཀྱིས་རྗེས་སུ་རིམ་སྤོར་དེ་མི་མཐུད་"
"ཐུབ"
-#: ../DistUpgrade/DistUpgradeController.py:1015
-#: ../DistUpgrade/DistUpgradeController.py:1149
+#: ../DistUpgrade/DistUpgradeController.py:1001
+#: ../DistUpgrade/DistUpgradeController.py:1135
msgid "Could not download the upgrades"
msgstr "རིམ་སྤོར་ལེན་འཇུག་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1016
+#: ../DistUpgrade/DistUpgradeController.py:1002
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. All files downloaded so far have been kept."
@@ -540,27 +541,27 @@
#. FIXME: strings are not good, but we are in string freeze
#. currently
-#: ../DistUpgrade/DistUpgradeController.py:1100
-#: ../DistUpgrade/DistUpgradeController.py:1137
-#: ../DistUpgrade/DistUpgradeController.py:1242
+#: ../DistUpgrade/DistUpgradeController.py:1086
+#: ../DistUpgrade/DistUpgradeController.py:1123
+#: ../DistUpgrade/DistUpgradeController.py:1228
msgid "Error during commit"
msgstr "ངོས་འཛིན་སྐབས་སྐྱོན་བྱུང་བ"
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1102
-#: ../DistUpgrade/DistUpgradeController.py:1139
-#: ../DistUpgrade/DistUpgradeController.py:1281
+#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1125
+#: ../DistUpgrade/DistUpgradeController.py:1267
msgid "Restoring original system state"
msgstr "མ་ལག་ཐོག་མའི་གནས་སྟངས་བསྐྱར་གསོ་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1103
-#: ../DistUpgrade/DistUpgradeController.py:1118
-#: ../DistUpgrade/DistUpgradeController.py:1140
+#: ../DistUpgrade/DistUpgradeController.py:1089
+#: ../DistUpgrade/DistUpgradeController.py:1104
+#: ../DistUpgrade/DistUpgradeController.py:1126
msgid "Could not install the upgrades"
msgstr "རིམ་སྤོར་སྒྲིག་འཇུག་མི་ཐུབ་པ"
#. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1108
+#: ../DistUpgrade/DistUpgradeController.py:1094
msgid ""
"The upgrade has aborted. Your system could be in an unusable state. A "
"recovery will run now (dpkg --configure -a)."
@@ -568,7 +569,7 @@
"རིམ་སྤོར་ཆད་སོང་། ཁྱོད་ཀྱི་མ་ལག་དེ་སྤྱོད་མི་རུང་བའི་གནས་ལ་ལྷུང་འགྲོ་ཉེན་ཆེ། ད་ལྟ་སྐྱོན་གསོ་བྱེད་ཞིག་འཁོར་"
"སྐྱོད་བྱེད་པ (dpkg --configure -a)"
-#: ../DistUpgrade/DistUpgradeController.py:1113
+#: ../DistUpgrade/DistUpgradeController.py:1099
#, python-format
msgid ""
"\n"
@@ -579,7 +580,7 @@
"%s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1150
+#: ../DistUpgrade/DistUpgradeController.py:1136
msgid ""
"The upgrade has aborted. Please check your Internet connection or "
"installation media and try again. "
@@ -587,20 +588,20 @@
"གསར་སྒྱུར་དེ་ཆད་སོང་། ཁྱོད་ཀྱི་དྲ་བ་སྦྲེལ་མཐུད་དང་ཡང་ན་སྒྲིག་འཇུག་འཇུག་ཟམ་ལ་ཞིབ་བཤེར་བྱས་ནས་ཡང་བསྐྱར་"
"ཚོད་ལྟ་བྱེད་རོགས "
-#: ../DistUpgrade/DistUpgradeController.py:1230
+#: ../DistUpgrade/DistUpgradeController.py:1216
msgid "Remove obsolete packages?"
msgstr "དུས་ཡོལ་འཐུམ་སྒྲིལ་བསུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
#: ../DistUpgrade/DistUpgrade.ui.h:8
msgid "_Keep"
msgstr "ཉར་འཇོག_K"
-#: ../DistUpgrade/DistUpgradeController.py:1231
+#: ../DistUpgrade/DistUpgradeController.py:1217
msgid "_Remove"
msgstr "བསུབ་པ_R"
-#: ../DistUpgrade/DistUpgradeController.py:1243
+#: ../DistUpgrade/DistUpgradeController.py:1229
msgid ""
"A problem occurred during the clean-up. Please see the below message for "
"more information. "
@@ -608,37 +609,37 @@
#. FIXME: instead of error out, fetch and install it
#. here
-#: ../DistUpgrade/DistUpgradeController.py:1319
+#: ../DistUpgrade/DistUpgradeController.py:1305
msgid "Required depends is not installed"
msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་སྒྲིག་འཇུག་བྱས་མི་འདུག"
-#: ../DistUpgrade/DistUpgradeController.py:1320
+#: ../DistUpgrade/DistUpgradeController.py:1306
#, python-format
msgid "The required dependency '%s' is not installed. "
msgstr "དགོས་མཁོའི་ཞོལ་གཏོགས་'%s' སྒྲིག་འཇུག་མི་འདུག "
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1588
-#: ../DistUpgrade/DistUpgradeController.py:1653
+#: ../DistUpgrade/DistUpgradeController.py:1573
+#: ../DistUpgrade/DistUpgradeController.py:1638
msgid "Checking package manager"
msgstr "འཐུམ་སྒྲིལ་དོ་དམ་པ་ཞིབ་བཤེར་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1593
+#: ../DistUpgrade/DistUpgradeController.py:1578
msgid "Preparing the upgrade failed"
msgstr "ལེགས་འགྲུབ་མ་ཐུབ་པའི་རིམ་སྤོར་ལ་གྲ་སྒྲིག་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1579
msgid ""
"Preparing the system for the upgrade failed so a bug reporting process is "
"being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1608
+#: ../DistUpgrade/DistUpgradeController.py:1593
msgid "Getting upgrade prerequisites failed"
msgstr "སྔོན་འགྲོའི་ཆ་རྐྱེན་ཐོབ་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1609
+#: ../DistUpgrade/DistUpgradeController.py:1594
msgid ""
"The system was unable to get the prerequisites for the upgrade. The upgrade "
"will abort now and restore the original system state.\n"
@@ -646,68 +647,68 @@
"Additionally, a bug reporting process is being started."
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1637
+#: ../DistUpgrade/DistUpgradeController.py:1622
msgid "Updating repository information"
msgstr "གསོག་མཛོད་གྱི་གནས་ཚུལ་གསར་སྒྱུར་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1644
+#: ../DistUpgrade/DistUpgradeController.py:1629
msgid "Failed to add the cdrom"
msgstr "་་CD་་འོད་སྡེར་བཀོལ་ཆས་ཁ་སྣོན་མ་ཐུབ"
-#: ../DistUpgrade/DistUpgradeController.py:1645
+#: ../DistUpgrade/DistUpgradeController.py:1630
msgid "Sorry, adding the cdrom was not successful."
msgstr "དགོངས་དག འོད་སྡེར་འཇུག་གནས་སྣོན་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1673
+#: ../DistUpgrade/DistUpgradeController.py:1658
msgid "Invalid package information"
msgstr "འཐུམ་སྒྲིལ་གནས་ཚུལ་ཕན་ནུས་མེད་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1674
+#: ../DistUpgrade/DistUpgradeController.py:1659
msgid "After updating your package "
msgstr ""
-#: ../DistUpgrade/DistUpgradeController.py:1698
-#: ../DistUpgrade/DistUpgradeController.py:1750
+#: ../DistUpgrade/DistUpgradeController.py:1683
+#: ../DistUpgrade/DistUpgradeController.py:1736
msgid "Fetching"
msgstr "ལེན་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1704
-#: ../DistUpgrade/DistUpgradeController.py:1754
+#: ../DistUpgrade/DistUpgradeController.py:1689
+#: ../DistUpgrade/DistUpgradeController.py:1740
msgid "Upgrading"
msgstr "རིམ་སྤོར་བཞིན་པ"
#. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1756
-#: ../DistUpgrade/DistUpgradeController.py:1763
-#: ../DistUpgrade/DistUpgradeController.py:1774
+#: ../DistUpgrade/DistUpgradeController.py:1694
+#: ../DistUpgrade/DistUpgradeController.py:1742
+#: ../DistUpgrade/DistUpgradeController.py:1749
+#: ../DistUpgrade/DistUpgradeController.py:1760
msgid "Upgrade complete"
msgstr "རིམ་སྤོར་ལེགས་འགྲུབ"
-#: ../DistUpgrade/DistUpgradeController.py:1710
-#: ../DistUpgrade/DistUpgradeController.py:1757
-#: ../DistUpgrade/DistUpgradeController.py:1764
+#: ../DistUpgrade/DistUpgradeController.py:1695
+#: ../DistUpgrade/DistUpgradeController.py:1743
+#: ../DistUpgrade/DistUpgradeController.py:1750
msgid ""
"The upgrade has completed but there were errors during the upgrade process."
msgstr "རིམ་སྤོར་ལེགས་འགྲུབ་ཚར་ནའང་རིམ་སྤོར་སྐྱོད་བཞིན་པའི་སྐབས་ནོར་འཁྲུལ་ཞིག་འདུག"
-#: ../DistUpgrade/DistUpgradeController.py:1717
+#: ../DistUpgrade/DistUpgradeController.py:1702
msgid "Searching for obsolete software"
msgstr "དུས་ཡོལ་གྱི་མཉེན་ཆས་འཚོལ་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1711
msgid "System upgrade is complete."
msgstr "མ་ལག་རིམ་སྤོར་ལེགས་འགྲུབ་ཚར"
-#: ../DistUpgrade/DistUpgradeController.py:1775
+#: ../DistUpgrade/DistUpgradeController.py:1761
msgid "The partial upgrade was completed."
msgstr "ཆ་ཤས་རིམ་སྤོར་ཞིག་ལེགས་འགྲུབ་ཚར"
-#: ../DistUpgrade/DistUpgradeQuirks.py:204
+#: ../DistUpgrade/DistUpgradeQuirks.py:202
msgid "evms in use"
msgstr "evms་སྤྱོད་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:205
+#: ../DistUpgrade/DistUpgradeQuirks.py:203
msgid ""
"Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
"software is no longer supported, please switch it off and run the upgrade "
@@ -716,11 +717,11 @@
"ཁྱོད་ཀྱི་མ་ལག་གིས་/proc/mounts་ནང་གི'evms'འཇུག་སྣོད་དོ་དམ་ཆས་སྤྱོད་པ 'evms' ལ་རམ་འདེགས་མེད་"
"པས་འདིར་གློག་སྒོ་བརྒྱབ་ནས་རིམ་སྤོར་ཞིག་ཡང་བསྐྱར་བྱེད་དགོས"
-#: ../DistUpgrade/DistUpgradeQuirks.py:502
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
msgid "Your graphics hardware may not be fully supported in Ubuntu 12.04 LTS."
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:504
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
msgid ""
"The support in Ubuntu 12.04 LTS for your Intel graphics hardware is limited "
"and you may encounter problems after the upgrade. For more information see "
@@ -728,9 +729,9 @@
"continue with the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeQuirks.py:526
-#: ../DistUpgrade/DistUpgradeQuirks.py:554
-#: ../DistUpgrade/DistUpgradeQuirks.py:581
+#: ../DistUpgrade/DistUpgradeQuirks.py:520
+#: ../DistUpgrade/DistUpgradeQuirks.py:548
+#: ../DistUpgrade/DistUpgradeQuirks.py:575
msgid ""
"Upgrading may reduce desktop effects, and performance in games and other "
"graphically intensive programs."
@@ -738,8 +739,8 @@
"རིམ་སྤོར་གྱིས་མདུན་ངོས་ཀྱི་རྣམ་པ་དང་རྩེད་རིགས་ཀྱི་འགྲོ་སྟངས། པར་རིས་མང་པོ་ཡོད་པའི་བྱ་རིམ་ལ་འགྱུར་ལྡོག་ཡོད་"
"ཉེན་ཆེཨ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
+#: ../DistUpgrade/DistUpgradeQuirks.py:524
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
msgid ""
"This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
"version of this driver is available that works with your video card in "
@@ -752,7 +753,7 @@
"\n"
"ཁྱོད་ཀྱིས་མུ་མཐུད་འདོད་དམ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:579
msgid ""
"This computer is currently using the AMD 'fglrx' graphics driver. No version "
"of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -765,11 +766,11 @@
"\n"
"ཁྱོད་ཀྱིས་མུ་མཐུད་དགོས་སམ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:615
+#: ../DistUpgrade/DistUpgradeQuirks.py:609
msgid "No i686 CPU"
msgstr "i686 CPU་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:616
+#: ../DistUpgrade/DistUpgradeQuirks.py:610
msgid ""
"Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
"extension. All packages were built with optimizations requiring i686 as the "
@@ -781,11 +782,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:652
+#: ../DistUpgrade/DistUpgradeQuirks.py:646
msgid "No ARMv6 CPU"
msgstr "ARMv6 CPU་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:653
+#: ../DistUpgrade/DistUpgradeQuirks.py:647
msgid ""
"Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
"packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -797,11 +798,11 @@
"minimal architecture. It is not possible to upgrade your system to a new "
"Ubuntu release with this hardware."
-#: ../DistUpgrade/DistUpgradeQuirks.py:673
+#: ../DistUpgrade/DistUpgradeQuirks.py:667
msgid "No init available"
msgstr "init ་མེད་པ"
-#: ../DistUpgrade/DistUpgradeQuirks.py:674
+#: ../DistUpgrade/DistUpgradeQuirks.py:668
msgid ""
"Your system appears to be a virtualised environment without an init daemon, "
"e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -817,15 +818,15 @@
"\n"
"Are you sure you want to continue?"
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:63
msgid "Sandbox upgrade using aufs"
msgstr "aufs་བེད་སྤྱོད་ནསSandbox རིམ་སྤོར་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeMain.py:67
+#: ../DistUpgrade/DistUpgradeMain.py:65
msgid "Use the given path to search for a cdrom with upgradable packages"
msgstr "རྒྱུད་ཁོངས་དེ་སྤྱོད་ནས་རིམ་སྤོར་ཐུམ་བུ་ཡོད་པའི་འོད་སྡེར་སྒུལ་སྐྱོད་པ་འཚོལ་བཤེར་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeMain.py:73
+#: ../DistUpgrade/DistUpgradeMain.py:71
msgid ""
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -833,57 +834,57 @@
"Use frontend. Currently available: \n"
"DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
-#: ../DistUpgrade/DistUpgradeMain.py:76
+#: ../DistUpgrade/DistUpgradeMain.py:74
msgid "*DEPRECATED* this option will be ignored"
msgstr ""
-#: ../DistUpgrade/DistUpgradeMain.py:79
+#: ../DistUpgrade/DistUpgradeMain.py:77
msgid "Perform a partial upgrade only (no sources.list rewriting)"
msgstr "རིམ་སྤོར་དུམ་བུ་ཞིག་ཁོ་ན་བྱེད་པ (འབྱུང་ཁུངས་ཐོ་འགོད་བསྐྱར་འབྲི་མི་བྱེད་པ)"
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:80
msgid "Disable GNU screen support"
msgstr "GNUའཆར་ངོས་རམ་འདེགས་ནུས་མེད་བསྒྱུར"
-#: ../DistUpgrade/DistUpgradeMain.py:84
+#: ../DistUpgrade/DistUpgradeMain.py:82
msgid "Set datadir"
msgstr "datadir་སྒྲིག་འཛུགས་བྱེད་པ"
-#. print("mediaChange %s %s" % (medium, drive))
+#. print "mediaChange %s %s" % (medium, drive)
#: ../DistUpgrade/DistUpgradeViewGtk.py:114
#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:195
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:155
+#: ../DistUpgrade/DistUpgradeViewKDE.py:193
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "སྒུལ་ཆས་'%2s'ནང་དུ་'%1s'འཇུག་རོགས"
#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:209
+#: ../DistUpgrade/DistUpgradeViewKDE.py:207
msgid "Fetching is complete"
msgstr "ལེན་འཇུག་ལེགས་འགྲུབ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:146
#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:222
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
#, python-format
msgid "Fetching file %li of %li at %sB/s"
msgstr "ཡིག་ཆ་ %2li ནང་ནས་ %1li ཚད་ %s B/s ཐོག་ལེན་འཇུག་བྱེད་བཞིན་པ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:296
+#: ../DistUpgrade/DistUpgradeViewGtk.py:295
#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:309
-#: ../DistUpgrade/DistUpgradeViewKDE.py:223
-#: ../DistUpgrade/DistUpgradeViewKDE.py:371
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:307
+#: ../DistUpgrade/DistUpgradeViewKDE.py:221
+#: ../DistUpgrade/DistUpgradeViewKDE.py:365
#, python-format
msgid "About %s remaining"
msgstr "ཕལ་ཆེར་ %s ་ལྷགས་ཡོད"
#: ../DistUpgrade/DistUpgradeViewGtk.py:152
#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:223
#, python-format
msgid "Fetching file %li of %li"
msgstr "ཡིག་ཆ་ %2li ནང་ནས་ %1li ལེན་འཇུག་བཞིན་པ"
@@ -893,27 +894,27 @@
#. -> longer term, move this code into python-apt
#: ../DistUpgrade/DistUpgradeViewGtk.py:183
#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:262
+#: ../DistUpgrade/DistUpgradeViewKDE.py:257
msgid "Applying changes"
msgstr "བཟོ་བཅོས་འདོན་བཞིན་པ"
#. we do not report followup errors from earlier failures
#: ../DistUpgrade/DistUpgradeViewGtk.py:208
#: ../DistUpgrade/DistUpgradeViewGtk3.py:212
-#: ../DistUpgrade/DistUpgradeViewKDE.py:275
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
msgid "dependency problems - leaving unconfigured"
msgstr "འཁོར་གཏོགས་སྐོར་སྐྱོན - སྒྲིག་བཟོ་མེད་པ་སྐྱུར་ཡོད་པ"
#: ../DistUpgrade/DistUpgradeViewGtk.py:213
#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:277
+#: ../DistUpgrade/DistUpgradeViewKDE.py:272
#, python-format
msgid "Could not install '%s'"
msgstr "Could not install '%s'"
#: ../DistUpgrade/DistUpgradeViewGtk.py:214
#: ../DistUpgrade/DistUpgradeViewGtk3.py:218
-#: ../DistUpgrade/DistUpgradeViewKDE.py:278
+#: ../DistUpgrade/DistUpgradeViewKDE.py:273
#, python-format
msgid ""
"The upgrade will continue but the '%s' package may not be in a working "
@@ -925,7 +926,7 @@
#. self.expander.set_expanded(True)
#: ../DistUpgrade/DistUpgradeViewGtk.py:231
#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:299
+#: ../DistUpgrade/DistUpgradeViewKDE.py:294
#, python-format
msgid ""
"Replace the customized configuration file\n"
@@ -936,7 +937,7 @@
#: ../DistUpgrade/DistUpgradeViewGtk.py:232
#: ../DistUpgrade/DistUpgradeViewGtk3.py:236
-#: ../DistUpgrade/DistUpgradeViewKDE.py:300
+#: ../DistUpgrade/DistUpgradeViewKDE.py:295
msgid ""
"You will lose any changes you have made to this configuration file if you "
"choose to replace it with a newer version."
@@ -944,20 +945,20 @@
"ཁྱོད་ཀྱིས་གལ་སྲིད་སྒྲིག་བཟོ་ཡིག་ཆ་དེ་པར་གཞི་གསར་པ་ཞིག་གིས་ཚབས་བཅུག་ན་ དེ་སྔར་དེའི་ཐོག་སྒྲིག་བཟོ་བྱས་པ་"
"རྣམས་བཀླགས་འགྲོའོ།"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:251
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:256
-#: ../DistUpgrade/DistUpgradeViewKDE.py:323
+#: ../DistUpgrade/DistUpgradeViewGtk.py:250
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:254
+#: ../DistUpgrade/DistUpgradeViewKDE.py:317
msgid "The 'diff' command was not found"
msgstr "'diff'བཀའ་བརྡ་མ་རྙེད་པ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:464
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:477
-#: ../DistUpgrade/DistUpgradeViewText.py:92
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:475
+#: ../DistUpgrade/DistUpgradeViewText.py:90
msgid "A fatal error occurred"
msgstr "ནོར་འཁྲུལ་ཚབས་ཆེན་ཞིག་བྱུང་བ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:465
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:478
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:476
msgid ""
"Please report this as a bug (if you haven't already) and include the files /"
"var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your "
@@ -969,13 +970,13 @@
"འགྲོའོ།\n"
"ཁྱོད་ཀྱི་ཐོག་མའི་འབྱུང་ཁུངས་མིང་ཐོ /etc/apt/sources.list.distUpgrade་གསོག་འཇོག་བྱས་ཡོད།"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:495
+#: ../DistUpgrade/DistUpgradeViewGtk.py:481
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:493
msgid "Ctrl-c pressed"
msgstr "Ctrl-c ་གནོན་བྱུང་།"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:483
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:496
+#: ../DistUpgrade/DistUpgradeViewGtk.py:482
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:494
msgid ""
"This will abort the operation and may leave the system in a broken state. "
"Are you sure you want to do that?"
@@ -983,134 +984,134 @@
"འདིས་བྱ་འགུལ་འདི་མཚམས་གཅོད་པ་དང་མ་ལག་ལའང་སྐྱོན་གཏོང་ངེས་ཡིན།ཁྱོད་ཀྱིས་འདི་བྱེད་པར་གཏན་ཁེལ་ཡིན་ནམ།"
#. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:631
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:629
+#: ../DistUpgrade/DistUpgradeViewGtk.py:630
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:627
msgid "To prevent data loss close all open applications and documents."
msgstr "ཆ་འཕྲིན་གྲངས་མི་བརླགས་པའི་ཆེད་དུ་ཉེར་སྤྱོད་དང་ཡིག་གེ་ཡོངས་རྫོགས་སྒོ་རྒྱག་དགོས"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:645
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
+#: ../DistUpgrade/DistUpgradeViewGtk.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:641
#, python-format
msgid "No longer supported by Canonical (%s)"
msgstr "Canonical (%s)ཡིས་རམ་འདེགས་མི་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:646
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
+#: ../DistUpgrade/DistUpgradeViewGtk.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:642
#, python-format
msgid "Downgrade (%s)"
msgstr "རིམ་ཆགས (%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:647
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
+#: ../DistUpgrade/DistUpgradeViewGtk.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:643
#, python-format
msgid "Remove (%s)"
msgstr "(%s)འདོར་བ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:648
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
+#: ../DistUpgrade/DistUpgradeViewGtk.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:644
#, python-format
msgid "No longer needed (%s)"
msgstr "འདི་མི་དགོས་པ(%s)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:649
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:647
+#: ../DistUpgrade/DistUpgradeViewGtk.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:645
#, python-format
msgid "Install (%s)"
msgstr "(%s)སྒྲིག་འཇུག་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:650
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:648
+#: ../DistUpgrade/DistUpgradeViewGtk.py:649
+#: ../DistUpgrade/DistUpgradeViewGtk3.py:646
#, python-format
msgid "Upgrade (%s)"
msgstr "(%s)་རིམ་སྤོར"
#. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:196
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:157
+#: ../DistUpgrade/DistUpgradeViewKDE.py:194
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
msgid "Media Change"
msgstr "འཇུག་ཟམ་བརྗེ་བ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:335
+#: ../DistUpgrade/DistUpgradeViewKDE.py:329
msgid "Show Difference >>>"
msgstr "ཁྱད་པར་མངོན་པ>>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:338
+#: ../DistUpgrade/DistUpgradeViewKDE.py:332
msgid "<<< Hide Difference"
msgstr "<<< ཁྱད་པར་སྐུངས་པ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:554
+#: ../DistUpgrade/DistUpgradeViewKDE.py:547
msgid "Error"
msgstr "ནོར་འཁྲུལ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:568
+#: ../DistUpgrade/DistUpgradeViewKDE.py:559
msgid "&Cancel"
msgstr "རྩིས་མེད་གཏོང་ &C"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:572
-#: ../DistUpgrade/DistUpgradeViewKDE.py:813
+#: ../DistUpgrade/DistUpgradeViewKDE.py:561
+#: ../DistUpgrade/DistUpgradeViewKDE.py:803
msgid "&Close"
msgstr "སྒོ་རྒྱག་ &C"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:618
+#: ../DistUpgrade/DistUpgradeViewKDE.py:607
msgid "Show Terminal >>>"
msgstr "འཇུག་སྒོ་སྟོན་པ >>>"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:621
+#: ../DistUpgrade/DistUpgradeViewKDE.py:610
msgid "<<< Hide Terminal"
msgstr "<<< འཇུག་སྒོ་སྐུངས་པ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:701
+#: ../DistUpgrade/DistUpgradeViewKDE.py:690
msgid "Information"
msgstr "གནས་ཚུལ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:751
-#: ../DistUpgrade/DistUpgradeViewKDE.py:796
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:741
+#: ../DistUpgrade/DistUpgradeViewKDE.py:786
+#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:7
msgid "Details"
msgstr "ཞིབ་ཕྲ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:777
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
#, python-format
msgid "No longer supported %s"
msgstr "འདི་ལ་རམ་འདེགས་མི་བྱེད་པ %s"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:779
+#: ../DistUpgrade/DistUpgradeViewKDE.py:769
#, python-format
msgid "Remove %s"
msgstr "%s་འདོར་བ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:781
-#: ../DistUpgrade/DistUpgradeViewText.py:182
+#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewText.py:179
#, python-format
msgid "Remove (was auto installed) %s"
msgstr "%s་འདོར་བ (རང་འགུལ་སྒྲིག་འཇུག་བྱས་པ)"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:783
+#: ../DistUpgrade/DistUpgradeViewKDE.py:773
#, python-format
msgid "Install %s"
msgstr "%s་སྒྲིག་འཇུག་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
#, python-format
msgid "Upgrade %s"
msgstr "%s་རིམ་སྤོར"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
-#: ../DistUpgrade/DistUpgradeViewText.py:230
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewText.py:227
msgid "Restart required"
msgstr "འགོ་བསྐྱར་འཛུགས་དགོས་པ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:809
+#: ../DistUpgrade/DistUpgradeViewKDE.py:799
msgid "Restart the system to complete the upgrade"
msgstr "་མ་ལག་འགོ་བསྐྱར་འཛུགས་བྱས་ནས་རིམ་སྤོར་ལེགས་འགྲུབ་བྱེད་པ"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:812 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:14
+#: ../data/gtkbuilder/UpdateManager.ui.h:27
msgid "_Restart Now"
msgstr "ད་ལྟ་འགོ་བསྐྱར་འཛུགས_R"
#. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:830
+#: ../DistUpgrade/DistUpgradeViewKDE.py:820
msgid ""
"Cancel the running upgrade?\n"
"\n"
@@ -1121,29 +1122,29 @@
"\n"
"རིམ་སྤོར་རྩིས་མེད་གཏོང་ན་མ་ལག་སྤྱོད་མི་རུང་བ་འགྱུར་ཉེན་ཡོད་པས་རིམ་སྤོར་ མུ་མཐུད་ན་དགའ་ངོས་ཡིན"
-#: ../DistUpgrade/DistUpgradeViewKDE.py:834
+#: ../DistUpgrade/DistUpgradeViewKDE.py:824
msgid "Cancel Upgrade?"
msgstr "རིམ་སྤོར་རྩིས་མེད་གཏོང་དགོས་སམ"
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:59
#, python-format
msgid "%li day"
msgid_plural "%li days"
msgstr[0] "ཉིན་%li"
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:61
#, python-format
msgid "%li hour"
msgid_plural "%li hours"
msgstr[0] "ཆུ་ཚོད་%li"
-#: ../DistUpgrade/DistUpgradeView.py:65
+#: ../DistUpgrade/DistUpgradeView.py:63
#, python-format
msgid "%li minute"
msgid_plural "%li minutes"
msgstr[0] "སྐར་མ་%li"
-#: ../DistUpgrade/DistUpgradeView.py:66
+#: ../DistUpgrade/DistUpgradeView.py:64
#, python-format
msgid "%li second"
msgid_plural "%li seconds"
@@ -1158,7 +1159,7 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:82
+#: ../DistUpgrade/DistUpgradeView.py:80
#, python-format
msgid "%(str_days)s %(str_hours)s"
msgstr "%(str_days)s %(str_hours)s"
@@ -1172,14 +1173,14 @@
#. plural form
#.
#. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:100
+#: ../DistUpgrade/DistUpgradeView.py:98
#, python-format
msgid "%(str_hours)s %(str_minutes)s"
msgstr "%(str_hours)s %(str_minutes)s"
#. 56 kbit
#. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:149
#, python-format
msgid ""
"This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1188,34 +1189,32 @@
"ལེན་འཇུག་འདི་ལ་ས་ཡ་ཚིག་1་ཅན་DSL སྦྲེལ་མཐུད་དང་56k ་དྲ་འཇུག་སྣེ%s་ཅན་ཚད་ཀྱིས་ དུས་ཚོད་%s་དགོས།"
#. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:155
+#: ../DistUpgrade/DistUpgradeView.py:153
#, python-format
msgid "This download will take about %s with your connection. "
msgstr "ཁྱོད་ཀྱི་སྦྲེལ་མཐུད་ཀྱིས་ལེན་འཇུག་འདི་བྱེད་པར་དུས་ཚོད་ %s་དགོས "
-#. Declare these translatable strings from the .ui files here so that
-#. xgettext picks them up.
-#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:21
msgid "Preparing to upgrade"
msgstr "རིམ་སྤོར་གྲལ་སྒྲིག་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeView.py:260
+#: ../DistUpgrade/DistUpgradeView.py:256
msgid "Getting new software channels"
msgstr "མཉེན་ཆས་རྩ་འཛུགས་གསར་བ་འདོན་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeView.py:261 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:23
msgid "Getting new packages"
msgstr "ཐུམ་བུ་གསར་བ་འདོན་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeView.py:262 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:26
msgid "Installing the upgrades"
msgstr "རིམ་སྤོར་སྒྲིག་འཇུག་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeView.py:263 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:25
msgid "Cleaning up"
msgstr "གཙང་དག་བཟོ་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeView.py:348
+#: ../DistUpgrade/DistUpgradeView.py:344
#, python-format
msgid ""
"%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1229,25 +1228,25 @@
#. FIXME: make those two separate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:357
+#: ../DistUpgrade/DistUpgradeView.py:353
#, python-format
msgid "%d package is going to be removed."
msgid_plural "%d packages are going to be removed."
msgstr[0] "ཐུམ་བུ་%d་བསུབ་འགྲོ་ངེས།"
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:358
#, python-format
msgid "%d new package is going to be installed."
msgid_plural "%d new packages are going to be installed."
msgstr[0] "ཐུམ་སྒྲིལ་གསར་བ་%d་སྒྲིག་འཇུག་བྱེད་ངེས"
-#: ../DistUpgrade/DistUpgradeView.py:368
+#: ../DistUpgrade/DistUpgradeView.py:364
#, python-format
msgid "%d package is going to be upgraded."
msgid_plural "%d packages are going to be upgraded."
msgstr[0] "ཐུམ་སྒྲིལ་གསར་བ་%d་རིམ་སྤོར་བྱེད་ངེས"
-#: ../DistUpgrade/DistUpgradeView.py:373
+#: ../DistUpgrade/DistUpgradeView.py:369
#, python-format
msgid ""
"\n"
@@ -1258,145 +1257,145 @@
"\n"
"ཁྱོད་ཀྱིས་ཁྱོན་བསྡོམས་ལེན་འཇུག་དགོས་པའི་ཚད %s "
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:374
msgid ""
"Installing the upgrade can take several hours. Once the download has "
"finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:382
+#: ../DistUpgrade/DistUpgradeView.py:378
msgid ""
"Fetching and installing the upgrade can take several hours. Once the "
"download has finished, the process cannot be canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:387
+#: ../DistUpgrade/DistUpgradeView.py:383
msgid "Removing the packages can take several hours. "
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:392 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:680
msgid "The software on this computer is up to date."
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:393
+#: ../DistUpgrade/DistUpgradeView.py:389
msgid ""
"There are no upgrades available for your system. The upgrade will now be "
"canceled."
msgstr "ཁྱོད་ཀྱི་མ་ལག་ལ་རིམ་སྤོར་མེད་པས་རིམ་སྤོར་འདི་ད་ལྟ་རྩིས་མེད་གཏོང་རྒྱུ་ཡིན"
-#: ../DistUpgrade/DistUpgradeView.py:406
+#: ../DistUpgrade/DistUpgradeView.py:402
msgid "Reboot required"
msgstr "འགོ་བསྐྱར་འཛུགས་དགོས་པ"
-#: ../DistUpgrade/DistUpgradeView.py:407
+#: ../DistUpgrade/DistUpgradeView.py:403
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr "རིམ་སྤོར་མཇུག་རྫོགས་ཚར་བ་དང་འགོ་བསྐྱར་འཛུགས་དགོས་པ། ད་ལྟ་འདི་བྱེད་དགོས་པ་ཡིན་ནམ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:72
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:72
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:70
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70
#, python-format
msgid "authenticate '%(file)s' against '%(signature)s' "
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:110
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110
#, python-format
msgid "extracting '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:151
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:151
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid "Could not run the upgrade tool"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས་འཁོར་སྐྱོད་བྱེད་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:152
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:152
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
msgid ""
"This is most likely a bug in the upgrade tool. Please report it as a bug "
"using the command 'ubuntu-bug update-manager'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:227
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:227
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
msgid "Upgrade tool signature"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས་གྱི་ས་ཡིག"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
msgid "Upgrade tool"
msgstr "རིམ་སྤོར་སྤྱོད་ཆས"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:268
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:268
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
msgid "Failed to fetch"
msgstr "ལེན་འཇུག་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:269
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:269
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
msgid "Fetching the upgrade failed. There may be a network problem. "
msgstr "རིམ་སྤོར་ལེན་འཇུག་མ་ཐུབ་པ། འདི་ནི་དྲ་བའི་གནོད་སྐྱོན་ཞིག་ཕལ་ཆེར་རེད "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
msgid "Authentication failed"
msgstr "བདེན་དཔངས་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:274
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:274
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
msgid ""
"Authenticating the upgrade failed. There may be a problem with the network "
"or with the server. "
msgstr "རིམ་སྤོར་བདེན་དཔངས་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
msgid "Failed to extract"
msgstr "ཕྱིར་རུ་འདོན་མི་ཐུབ་"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
msgid ""
"Extracting the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "རིམ་སྤོར་ཕྱིར་རུ་འདོན་མི་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
msgid "Verification failed"
msgstr "ར་སྤྲོད་མ་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
msgid ""
"Verifying the upgrade failed. There may be a problem with the network or "
"with the server. "
msgstr "རིམ་སྤོར་ར་སྤྲོད་མ་ཐུབ་པ། འདི་ཕལ་ཆེར་དྲ་བའམ་དྲ་བ་ཞབས་ཞུ་བའི་སྐྱོན་ཡིན་ངེས "
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:300
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:306
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:300
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:306
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
msgid "Can not run the upgrade"
msgstr "རིམ་སྤོར་འཁོར་སྐྱོད་མི་ཐུབ་པ"
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:301
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:301
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:280
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280
msgid ""
"This usually is caused by a system where /tmp is mounted noexec. Please "
"remount without noexec and run the upgrade again."
msgstr ""
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:307
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:307
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
#, python-format
msgid "The error message is '%s'."
msgstr "ནོར་འཁྲུལ་བརྡ་འཕྲིན་ '%s'"
-#: ../DistUpgrade/DistUpgradeViewText.py:93
+#: ../DistUpgrade/DistUpgradeViewText.py:91
msgid ""
"Please report this as a bug and include the files /var/log/dist-upgrade/main."
"log and /var/log/dist-upgrade/apt.log in your report. The upgrade has "
@@ -1407,73 +1406,73 @@
"log མཉམ་དུ་ཡར་ཞུ་སྤྲོད་རོགས། རིམ་སྤོར་འདི་འདོར་ཚར་བ\n"
"ཁྱོད་ཀྱི་ཐོག་མའི་འབྱུང་ཁུངས་མིང་ཐོ་ནི /etc/apt/sources.list.distUpgrade གསོག་འཇོག་ཡོད་པ"
-#: ../DistUpgrade/DistUpgradeViewText.py:117
+#: ../DistUpgrade/DistUpgradeViewText.py:115
msgid "Aborting"
msgstr "བར་གཅོད་བཞིན་པ"
-#: ../DistUpgrade/DistUpgradeViewText.py:122
+#: ../DistUpgrade/DistUpgradeViewText.py:120
msgid "Demoted:\n"
msgstr "རིམ་ཆགས་ཟིན་པ:\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:129
+#: ../DistUpgrade/DistUpgradeViewText.py:127
msgid "To continue please press [ENTER]"
msgstr "མུ་མཐུད་དགོས་ན [ENTER]མནན་རོགས"
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:200
msgid "Continue [yN] "
msgstr "མུ་མཐུད་པ་[ཡིན/མིན] "
-#: ../DistUpgrade/DistUpgradeViewText.py:157
-#: ../DistUpgrade/DistUpgradeViewText.py:196
+#: ../DistUpgrade/DistUpgradeViewText.py:155
+#: ../DistUpgrade/DistUpgradeViewText.py:193
msgid "Details [d]"
msgstr "ཞིབ་ཕྲ [d]"
#. TRANSLATORS: the "y" is "yes"
#. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:206
+#: ../DistUpgrade/DistUpgradeViewText.py:159
+#: ../DistUpgrade/DistUpgradeViewText.py:203
msgid "y"
msgstr "ཡིན"
#. TRANSLATORS: the "n" is "no"
#. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:165
-#: ../DistUpgrade/DistUpgradeViewText.py:213
+#: ../DistUpgrade/DistUpgradeViewText.py:162
+#: ../DistUpgrade/DistUpgradeViewText.py:210
msgid "n"
msgstr "མིན"
#. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:168
+#: ../DistUpgrade/DistUpgradeViewText.py:165
msgid "d"
msgstr "ཞིབ་ཕྲ"
-#: ../DistUpgrade/DistUpgradeViewText.py:173
+#: ../DistUpgrade/DistUpgradeViewText.py:170
#, python-format
msgid "No longer supported: %s\n"
msgstr "རམ་འདེགས་མེད་པ: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:178
+#: ../DistUpgrade/DistUpgradeViewText.py:175
#, python-format
msgid "Remove: %s\n"
msgstr "བསུབ་པ: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:188
+#: ../DistUpgrade/DistUpgradeViewText.py:185
#, python-format
msgid "Install: %s\n"
msgstr "སྒྲིག་འཇུག: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:190
#, python-format
msgid "Upgrade: %s\n"
msgstr "རིམ་སྤོར: %s\n"
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:207
msgid "Continue [Yn] "
msgstr "མུ་མཐུད་ [Yn] "
-#: ../DistUpgrade/DistUpgradeViewText.py:231
+#: ../DistUpgrade/DistUpgradeViewText.py:228
msgid ""
"To finish the upgrade, a restart is required.\n"
"If you select 'y' the system will be restarted."
@@ -1540,7 +1539,7 @@
msgstr "འགྲེམ་སྤེལ་རིམ་སྤོར"
#: ../DistUpgrade/DistUpgrade.ui.h:19
-msgid "Upgrading Ubuntu to version 12.10"
+msgid "Upgrading Ubuntu to version 12.04"
msgstr ""
#: ../DistUpgrade/DistUpgrade.ui.h:20
@@ -1559,152 +1558,166 @@
msgid "Terminal"
msgstr "Terminal"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:64
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
msgid "Please wait, this can take some time."
msgstr "འདིར་ཡུད་ཙམ་འགོར་ཉེན་ཆེ་བས་ཉིད་ཀྱིས་སྒུག་རོགས"
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:66
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
msgid "Update is complete"
msgstr "གསར་སྒྱུར་ལེགས་འགྲུབ་ཚར"
-#: ../UpdateManager/DistUpgradeFetcher.py:114
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
+#: ../UpdateManager/DistUpgradeFetcher.py:108
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
msgid "Could not find the release notes"
msgstr "པར་བསྐྲུན་གསལ་བཤད་རྙེད་མི་འདུག"
-#: ../UpdateManager/DistUpgradeFetcher.py:115
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:110
+#: ../UpdateManager/DistUpgradeFetcher.py:109
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
msgid "The server may be overloaded. "
msgstr "དྲ་བ་ཞབས་ཞུ་བ་ལ་ཁུར་པོ་ལྗི་དྲགས་པ "
-#: ../UpdateManager/DistUpgradeFetcher.py:125
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:114
+#: ../UpdateManager/DistUpgradeFetcher.py:119
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
msgid "Could not download the release notes"
msgstr "པར་བསྐྲུན་གསལ་བཤད་གེན་འཇུག་མི་ཐུབ"
-#: ../UpdateManager/DistUpgradeFetcher.py:126
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:115
+#: ../UpdateManager/DistUpgradeFetcher.py:120
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
msgid "Please check your internet connection."
msgstr "ཁྱོད་ཀྱི་དྲ་བ་སྦྲེལ་མཐུད་ལ་ལྟ་ཞིབ་བྱེད་རོགས"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:68
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:91
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
+#: ../UpdateManager/UpdateManager.py:1257
msgid "Upgrade"
msgstr "རིམ་སྤོར"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:95
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
#: ../data/gtkbuilder/UpdateManager.ui.h:20
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
msgid "Release Notes"
msgstr "པར་བསྐྲུན་གསལ་བཤད"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:134
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
msgid "Downloading additional package files..."
msgstr "ཐུམ་བུ་ཡིག་ཆ་ཁ་སྣོན་དུ་ལེན་འཇུག་བཞིན་པ་་་"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
#, python-format
msgid "File %s of %s at %sB/s"
msgstr "ཡིག་ཆ་ %2s ་ནང་གི་ %1s ་ཚད་ %s ཚིག་/སྐར་ཆ"
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
#, python-format
msgid "File %s of %s"
msgstr "ཡིག་ཆ་ %2s ནང་གི་ %1s"
-#: ../UpdateManager/ChangelogViewer.py:75
+#: ../UpdateManager/ChangelogViewer.py:73
msgid "Open Link in Browser"
msgstr "ལྟ་བཤེར་བའི་ནང་དུ་སྦྲེལ་མཐུད་ཁ་འབྱེད"
-#: ../UpdateManager/ChangelogViewer.py:78
+#: ../UpdateManager/ChangelogViewer.py:76
msgid "Copy Link to Clipboard"
msgstr "དྲས་པང་ཐོག་ཏུ་སྦྲེལ་མཐུད་འདྲ་བཤུ"
-#: ../UpdateManager/GtkProgress.py:162
+#: ../UpdateManager/GtkProgress.py:159
#, python-format
msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
msgstr ""
"ཁྱོན་ཡོངས་%(total)li་ནང་ནས་ཡིག་ཆ་%(current)li་ལེན་འཇུག་བཞིན་པ་ ་ཚད %(speed)s/སྐར་ཆ"
-#: ../UpdateManager/GtkProgress.py:167
+#: ../UpdateManager/GtkProgress.py:164
#, python-format
msgid "Downloading file %(current)li of %(total)li"
msgstr "ཁྱོན་ཡོངས་%(total)li་ནང་ནས་ཡིག་ཆ་%(current)li་ལེན་འཇུག་བཞིན་པ་"
-#: ../UpdateManager/UpdateManager.py:106 ../do-release-upgrade:100
+#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:95
msgid "Your Ubuntu release is not supported anymore."
msgstr "ཁྱོད་ཀྱི་Ubuntu པར་གཞི་འདིར་རྒྱབ་སྐྱོར་མེད་པ།"
-#: ../UpdateManager/UpdateManager.py:107
+#: ../UpdateManager/UpdateManager.py:106
msgid ""
"You will not get any further security fixes or critical updates. Please "
"upgrade to a later version of Ubuntu."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:115
+#: ../UpdateManager/UpdateManager.py:114
msgid "Upgrade information"
msgstr "རིམ་སྤོར་གནས་ཚུལ"
-#: ../UpdateManager/UpdateManager.py:233
-#: ../UpdateManagerText/UpdateManagerText.py:35
+#: ../UpdateManager/UpdateManager.py:231
+#: ../UpdateManagerText/UpdateManagerText.py:32
msgid "Install"
msgstr "སྒྲིག་འཇུག"
-#: ../UpdateManager/UpdateManager.py:235
+#: ../UpdateManager/UpdateManager.py:233
msgid "Name"
msgstr ""
#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:395
+#: ../UpdateManager/UpdateManager.py:393
#, python-format
msgid "Version %s: \n"
msgstr "པར་གཞི་ %s: \n"
-#: ../UpdateManager/UpdateManager.py:453
+#: ../UpdateManager/UpdateManager.py:450
msgid ""
"No network connection detected, you can not download changelog information."
msgstr "དྲ་བའི་སྦྲེལ་མཐུད་རྙེད་མ་ཐུབ ཁྱོད་ཀྱིས་བཟོས་བཅོས་ཐོ་འགོད་སྐོར་ལེན་འཇུག་མི་ཐུབ"
-#: ../UpdateManager/UpdateManager.py:463
+#: ../UpdateManager/UpdateManager.py:458
msgid "Downloading list of changes..."
msgstr "བཟོ་བཅོས་ཁག་ཅིག་ལེན་འཇུག་བཞིན་པ་་་"
-#: ../UpdateManager/UpdateManager.py:507
+#: ../UpdateManager/UpdateManager.py:502
msgid "_Deselect All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:513
+#: ../UpdateManager/UpdateManager.py:508
msgid "Select _All"
msgstr ""
+#: ../UpdateManager/UpdateManager.py:568
+#, python-format
+msgid "%(count)s update has been selected."
+msgid_plural "%(count)s updates have been selected."
+msgstr[0] "གསར་སྒྱུར་དགོས་པ་%(count)s བདམས་ཟིན་པ"
+
#: ../UpdateManager/UpdateManager.py:572
#, python-format
msgid "%s will be downloaded."
msgstr "%s ལེན་འཇུག་བྱེད་པ"
#: ../UpdateManager/UpdateManager.py:584
-#, fuzzy
-msgid "The update has already been downloaded."
-msgid_plural "The updates have already been downloaded."
-msgstr[0] "གདམ་ཟིན་པའི་ཐུམ་བུ་གསར་སྒྱུར་རྣམས་མ་ལག་འདིའི་ཐོག་ལེན་འཇུག་དང་སྒྲིག་འཇུག་བྱས་ཚར"
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
#: ../UpdateManager/UpdateManager.py:589
msgid "There are no updates to install."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:598
+#. TRANSLATORS: this allows to switch the order of the count of
+#. updates and the download size string (if needed)
+#: ../UpdateManager/UpdateManager.py:595
+#, python-format
+msgid "%(count_str)s %(download_str)s"
+msgstr "%(count_str)s %(download_str)s"
+
+#: ../UpdateManager/UpdateManager.py:602
msgid "Unknown download size."
msgstr "ལེན་འཇུག་གི་ཆེ་ཆུང་ཚད་མི་ཤེས"
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:628
msgid ""
"It is unknown when the package information was updated last. Please click "
"the 'Check' button to update the information."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:634
#, python-format
msgid ""
"The package information was last updated %(days_ago)s days ago.\n"
@@ -1713,13 +1726,13 @@
"ཐུམ་བུ་འདི་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་པ་ནི་ཉིན་%(days_ago)s འགོར་སོང་།\n"
"འོག་གི་ལྟ་བཤེར་མཐེབ་ལ་མནན་ནས་མཉེན་ཆས་གསར་སྒྱུར་ལྟ་བཤེར་བྱེད་དགོས"
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:639
#, python-format
msgid "The package information was last updated %(days_ago)s day ago."
msgid_plural "The package information was last updated %(days_ago)s days ago."
msgstr[0] "ཐུམ་བུ་སྐོར་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་ནས་ཉིན་ %(days_ago)s འགོར་སོང་།"
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:643
#, python-format
msgid "The package information was last updated %(hours_ago)s hour ago."
msgid_plural ""
@@ -1727,34 +1740,43 @@
msgstr[0] "ཐུམ་བུ་སྐོར་ཐེངས་རྗེས་མའི་གསར་སྒྱུར་བྱས་ནས་ཆུ་ཚོད་ %(hours_ago)s འགོར་སོང་།"
#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:648 ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:652
#, python-format
msgid "The package information was last updated about %s minutes ago."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:654
msgid "The package information was just updated."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:674
+#: ../data/gtkbuilder/UpdateManager.ui.h:2
+msgid ""
+"Software updates correct errors, eliminate security vulnerabilities and "
+"provide new features."
+msgstr ""
+"མཉེན་ཆས་གསར་སྒྱུར་བྱས་ན་ནོར་འཁྲུལ་དག་བཅོས་བཟོ་བ་དང་བདེ་སྲུང་ཉེན་ཁ་འདོར་བ། ཁྱད་ནུས་གསར་བ་སྟེར་བ"
+
+#: ../UpdateManager/UpdateManager.py:693
msgid "Software updates may be available for your computer."
msgstr "རྩིས་འཁོར་འདི་ལ་མཉེན་ཆས་གསར་སྒྱུར་བྱེད་རྒྱུ་ཡོད་སྲིད"
-#: ../UpdateManager/UpdateManager.py:697
-#, python-format
+#: ../UpdateManager/UpdateManager.py:701
+msgid "Welcome to Ubuntu"
+msgstr "Ubuntu མ་ལག་གིས་དགའ་བསུ་ཞུ"
+
+#: ../UpdateManager/UpdateManager.py:702
msgid ""
-"Updated software has been issued since %s was released. Do you want to "
-"install it now?"
+"These software updates have been issued since this version of Ubuntu was "
+"released."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:700
-msgid ""
-"Updated software is available for this computer. Do you want to install it "
-"now?"
+#: ../UpdateManager/UpdateManager.py:705
+msgid "Software updates are available for this computer."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:758
+#: ../UpdateManager/UpdateManager.py:756
#, python-format
msgid ""
"The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1765,7 +1787,7 @@
"བླུགས་སྡེར་སྟོང་བ་%s ་བཟོ་རོགས། འདིར་གད་སྙིགས་བཤོ་བ་དང་'sudo apt-get clean'སྤྱོད་ནས་ སྔོན་གྱི་"
"སྒྲིག་འཇུག་གི་གནས་སྐབས་ཐུམ་བུ་བསུབ་ཆོག"
-#: ../UpdateManager/UpdateManager.py:783
+#: ../UpdateManager/UpdateManager.py:781
msgid ""
"The computer needs to restart to finish installing updates. Please save your "
"work before continuing."
@@ -1773,23 +1795,23 @@
"རིམ་སྤོར་སྒྲིག་འཇུག་ལེགས་འགྲུབ་ཀྱི་ཆེད་དུ་རྩིས་འཁོར་འགོ་བསྐྱར་འཛུགས་དགོས་པ། ཁྱོད་ཀྱི་ལས་ཀ་གསོག་འཇོག་བྱས་"
"ནས་ནུ་མཐུད"
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:845
msgid "Reading package information"
msgstr "ཐུམ་བུ་ཀློག་བཞིན་པ"
-#: ../UpdateManager/UpdateManager.py:862
+#: ../UpdateManager/UpdateManager.py:863
msgid "Connecting..."
msgstr "མཐུད་བཞིན་པ་་་"
-#: ../UpdateManager/UpdateManager.py:879
+#: ../UpdateManager/UpdateManager.py:880
msgid "You may not be able to check for updates or download new updates."
msgstr "ཁྱོད་ཀྱིས་ཕལ་ཆེར་གསར་སྒྱུར་གསར་པར་འཚོར་ཞིབ་དང་གསར་སྒྱུར་མི་ཐུབ"
-#: ../UpdateManager/UpdateManager.py:1002
+#: ../UpdateManager/UpdateManager.py:1008
msgid "Could not initialize the package information"
msgstr "ཐུམ་བུ་སྐོར་འགོ་སློང་མི་ཐུམ་པ"
-#: ../UpdateManager/UpdateManager.py:1003
+#: ../UpdateManager/UpdateManager.py:1009
msgid ""
"An unresolvable problem occurred while initializing the package "
"information.\n"
@@ -1800,7 +1822,7 @@
"ཐུམ་བུ་སྐོར་འགོ་སློང་བའི་སྐབས་བསྐྱར་གསོ་མི་ཐུབ་པའི་སྐྱོན་བྱུང་བ། \n"
"ནོར་འཁྲུལ་འདི་དང་གཤམ་གྱི་ནོར་འཁྲུལ་ཡིག་གེ་མཉམ་དུ་་གསར་སྒྱུར་དོ་དམ་པ་ལ་ཡར་ཞུ་ སྤྲོད་རོགས:\n"
-#: ../UpdateManager/UpdateManager.py:1032
+#: ../UpdateManager/UpdateManager.py:1038
msgid ""
"An unresolvable problem occurred while calculating the upgrade.\n"
"\n"
@@ -1811,31 +1833,31 @@
"\n"
"ནོར་འཁྲུལ་འདི་དང་གཤམ་གྱི་ནོར་འཁྲུལ་ཡིག་གེ་མཉམ་དུ་་གསར་སྒྱུར་དོ་དམ་པ་ལ་ཡར་ཞུ་ སྤྲོད་རོགས:"
-#: ../UpdateManager/UpdateManager.py:1056
+#: ../UpdateManager/UpdateManager.py:1063
msgid " (New install)"
msgstr " (སྒྲིག་འཇུག་གསར་པ)"
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1063
+#: ../UpdateManager/UpdateManager.py:1070
#, python-format
msgid "(Size: %s)"
msgstr "(ཆེ་ཆུང: %s)"
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:1072
#, python-format
msgid "From version %(old_version)s to %(new_version)s"
msgstr "པར་གཞི་%(old_version)s ནས་ %(new_version)s་སྒྱུར་བ"
-#: ../UpdateManager/UpdateManager.py:1071
+#: ../UpdateManager/UpdateManager.py:1076
#, python-format
msgid "Version %s"
msgstr "པར་གཞི་ %s"
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:112
+#: ../UpdateManager/UpdateManager.py:1110 ../do-release-upgrade:107
msgid "Release upgrade not possible right now"
msgstr "ད་ལྟ་འགྲེམས་སྤེལ་གསར་པའི་རིམ་སྤོར་བྱེད་མི་ཐུབ"
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:113
+#: ../UpdateManager/UpdateManager.py:1111 ../do-release-upgrade:108
#, c-format, python-format
msgid ""
"The release upgrade can not be performed currently, please try again later. "
@@ -1844,21 +1866,21 @@
"འགྲེམས་སྤེལ་གསར་པའི་རིམ་སྤོར་ད་ལྟ་སྒྲུབ་མི་ཐུབ རྗེས་སུ་ཡང་བསྐྱར་ཚོད་ལྟ་གནོང་རོགས ཞབས་ཞུ་བས་ཡར་ཞུ། "
"'%s'"
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:126
+#: ../UpdateManager/UpdateManager.py:1113 ../check-new-release-gtk:115
msgid "Downloading the release upgrade tool"
msgstr "རིམ་སྤོར་འགྲེམས་སྤེལ་སྤྱོད་ཆས་ལེན་འཇུག་བཞིན་པ"
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:1120
#, python-format
msgid "New Ubuntu release '%s' is available"
msgstr "Ubuntu་མ་ལག་འགྲེམས་སྤེལ་གསར་པ་ '%s' སྤྱོད་རུང་བ"
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:1159
msgid "Software index is broken"
msgstr "མཉེན་ཆས་ཟུར་རྟགས་འཕྲོ་བརླགས་ཚར་འདུག"
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:1160
msgid ""
"It is impossible to install or remove any software. Please use the package "
"manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -1868,6 +1890,17 @@
"པའམ་terminal་་སྒོ་འཇུག་་ནང་དུ་ \"sudo apt-get install -f\" འཇུག་ནས་ གནས་ཚུལ་འདི་བཟོ་"
"བཅོས་བྱེད་རོགས།"
+#: ../UpdateManager/UpdateManager.py:1222
+#: ../UpdateManager/UpdateManager.py:1255
+#, fuzzy
+msgid "New hardware support is available"
+msgstr "འགྲེམ་སྤེལ་གསར་པ་'%s' སྤྱོད་རུང་བ"
+
+#: ../UpdateManager/UpdateManager.py:1256
+#: ../UpdateManagerText/UpdateManagerText.py:31
+msgid "Cancel"
+msgstr "རྩིས་མེད་གཏོང"
+
#: ../UpdateManager/UnitySupport.py:57
msgid "Check for Updates"
msgstr ""
@@ -1877,22 +1910,18 @@
msgstr ""
#: ../UpdateManagerText/UpdateManagerText.py:34
-msgid "Cancel"
-msgstr "རྩིས་མེད་གཏོང"
-
-#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Changelog"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:40
+#: ../UpdateManagerText/UpdateManagerText.py:37
msgid "Updates"
msgstr ""
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:50
msgid "Building Updates List"
msgstr "གསར་སྒྱུར་མིང་ཐོ་བཟོ་བཞིན་པ"
-#: ../UpdateManagerText/UpdateManagerText.py:56
+#: ../UpdateManagerText/UpdateManagerText.py:53
msgid ""
"\n"
"A normal upgrade can not be calculated, please run: \n"
@@ -1916,20 +1945,20 @@
" * Ubuntu་མ་ལག་དཔོན་ས་ནས་ཐོབ་པའི་མཉེན་ཆས་མིན་པ\n"
" * Ubuntu་མ་ལག་གི་འགྲེམས་སྤེལ་སྔོན་མའི་རྒྱུན་ལྡན་བཟོ་བཅོས་ཡིན་པ"
-#: ../UpdateManagerText/UpdateManagerText.py:125
+#: ../UpdateManagerText/UpdateManagerText.py:122
msgid "Downloading changelog"
msgstr "བཟོ་བཅོས་ཟིན་ཐོ་ལེན་འཇུག་བཞིན་པ"
-#: ../UpdateManager/Core/MyCache.py:147
+#: ../UpdateManager/Core/MyCache.py:138
#, python-format
msgid "Other updates (%s)"
msgstr "གསར་སྒྱུར་གཞན་པ (%s)"
-#: ../UpdateManager/Core/MyCache.py:325
+#: ../UpdateManager/Core/MyCache.py:316
msgid "This update does not come from a source that supports changelogs."
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:331 ../UpdateManager/Core/MyCache.py:359
+#: ../UpdateManager/Core/MyCache.py:322 ../UpdateManager/Core/MyCache.py:350
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
@@ -1937,7 +1966,7 @@
"བཟོ་བཅོས་ཐོ་འགོད་ལེན་འཇུག་མ་ཐུབ་པ།\n"
"དྲ་བ་སྦྲེལ་མཐུད་ལ་བརྟག་བཤེར་བྱེད་རོགས།"
-#: ../UpdateManager/Core/MyCache.py:338
+#: ../UpdateManager/Core/MyCache.py:329
#, python-format
msgid ""
"Changes for the versions:\n"
@@ -1946,7 +1975,7 @@
"\n"
msgstr ""
-#: ../UpdateManager/Core/MyCache.py:348
+#: ../UpdateManager/Core/MyCache.py:339
#, python-format
msgid ""
"The changelog does not contain any relevant changes.\n"
@@ -1960,7 +1989,7 @@
"+changelog\n"
"སྤྱོད་པའམ་གཞུགས་ནས་ཚོད་ལྟ་བྱེད་རོགས"
-#: ../UpdateManager/Core/MyCache.py:353
+#: ../UpdateManager/Core/MyCache.py:344
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -1974,51 +2003,43 @@
"+changelog\n"
"སྤྱོད་པའམ་གཞུགས་ནས་ཚོད་ལྟ་བྱེད་རོགས"
-#: ../UpdateManager/Core/UpdateList.py:51
+#: ../UpdateManager/Core/UpdateList.py:49
msgid "Failed to detect distribution"
msgstr "འགྲེམ་སྤེལ་བཙལ་མ་ཐུབ་པ"
-#: ../UpdateManager/Core/UpdateList.py:52
+#: ../UpdateManager/Core/UpdateList.py:50
#, python-format
msgid "A error '%s' occurred while checking what system you are using."
msgstr "མ་ལག་གང་ཞིག་སྤྱོད་བཞིན་པར་རྟག་བཤེར་སྐབས་ནོར་འཁྲུལ་ '%s' བྱུང་བ།"
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:61
msgid "Important security updates"
msgstr "བདེ་འཇགས་གསར་སྒྱུར་རྩ་ཆེན"
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:62
msgid "Recommended updates"
msgstr "མཚམས་སྦྱོར་གསར་སྒྱུར"
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:63
msgid "Proposed updates"
msgstr "Proposed updates"
-#: ../UpdateManager/Core/UpdateList.py:66
+#: ../UpdateManager/Core/UpdateList.py:64
msgid "Backports"
msgstr "Backports"
-#: ../UpdateManager/Core/UpdateList.py:67
+#: ../UpdateManager/Core/UpdateList.py:65
msgid "Distribution updates"
msgstr "འགྲེམས་སྤེལ་གསར་སྒྱུར"
-#: ../UpdateManager/Core/UpdateList.py:72
+#: ../UpdateManager/Core/UpdateList.py:70
msgid "Other updates"
msgstr "གསར་སྒྱུར་གཞན་པ"
#: ../data/gtkbuilder/UpdateManager.ui.h:1
-#, fuzzy
-msgid "Starting Software Updater"
+msgid "Starting Update Manager"
msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་བཞིན་པ"
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
-msgid ""
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
-msgstr ""
-"མཉེན་ཆས་གསར་སྒྱུར་བྱས་ན་ནོར་འཁྲུལ་དག་བཅོས་བཟོ་བ་དང་བདེ་སྲུང་ཉེན་ཁ་འདོར་བ། ཁྱད་ནུས་གསར་བ་སྟེར་བ"
-
#: ../data/gtkbuilder/UpdateManager.ui.h:3
msgid "_Partial Upgrade"
msgstr "རིམ་སྤོར་དུམ་བུ_P"
@@ -2088,60 +2109,60 @@
#: ../data/gtkbuilder/UpdateManager.ui.h:23
#: ../data/update-manager.desktop.in.h:1
-#, fuzzy
-msgid "Software Updater"
-msgstr "མཉེན་ཆས་རིམ་སྤོར"
+msgid "Update Manager"
+msgstr "གསར་སྒྱུར་དོ་དམ་པ"
#: ../data/gtkbuilder/UpdateManager.ui.h:24
-#, fuzzy
-msgid "Starting Software Updater"
-msgstr "མཉེན་ཆས་རིམ་སྤོར"
+msgid "Starting Update Manager"
+msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་པ"
#: ../data/gtkbuilder/UpdateManager.ui.h:25
msgid "U_pgrade"
msgstr "རིམ་སྤོར_p"
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
-msgid "updates"
-msgstr "རིམ་སྤོར"
+#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#, fuzzy
+msgid "I_nstall"
+msgstr "སྒྲིག་འཇུག"
#: ../data/gtkbuilder/UpdateManager.ui.h:28
-msgid "Changes"
-msgstr "བཟོ་བཅོས"
+msgid "updates"
+msgstr "རིམ་སྤོར"
#: ../data/gtkbuilder/UpdateManager.ui.h:29
-msgid "Description"
-msgstr "གསལ་བཤད"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:30
-#, fuzzy
-msgid "Details of updates"
-msgstr "གསར་སྒྱུར་གསལ་བཤད"
-
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid ""
"You are connected via roaming and may be charged for the data consumed by "
"this update."
msgstr ""
"ཁྱོད་ཀྱིས་རྒྱ་བསྐྱེད་དྲ་བ་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག་པས་གསར་སྒྱུར་གྱི་རིན་འབབ་ཆ་འཕྲིན་གྲངས་ཚད་ལ་བསྟུན་སྲིད"
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
-msgid ""
-"You may want to wait until you’re not using a mobile broadband connection."
-msgstr ""
+#: ../data/gtkbuilder/UpdateManager.ui.h:30
+msgid "You are connected via a wireless modem."
+msgstr "ཁྱོད་ཀྱིས་སྐུད་མེད་མཐུན་སྒྲིག་ཆས་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག"
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/gtkbuilder/UpdateManager.ui.h:31
msgid "It’s safer to connect the computer to AC power before updating."
msgstr "གསར་སྒྱུར་མ་བྱས་སྔོན་རྩིས་འཁོར་ACགློག་ཁུངས་དང་མཐུད་ན་བཟང"
+#: ../data/gtkbuilder/UpdateManager.ui.h:32
+msgid "_Install Updates"
+msgstr "རིམ་སྤོར་སྒྲིག་འཇུག_I"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:33
+msgid "Changes"
+msgstr "བཟོ་བཅོས"
+
#: ../data/gtkbuilder/UpdateManager.ui.h:34
-msgid "_Settings..."
-msgstr ""
+msgid "Description"
+msgstr "གསལ་བཤད"
#: ../data/gtkbuilder/UpdateManager.ui.h:35
-#, fuzzy
-msgid "_Install Now"
-msgstr "སྒྲིག་འཇུག"
+msgid "Description of update"
+msgstr "གསར་སྒྱུར་གསལ་བཤད"
+
+#: ../data/gtkbuilder/UpdateManager.ui.h:36
+msgid "_Settings..."
+msgstr ""
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
msgid "A new version of Ubuntu is available. Would you like to upgrade?"
@@ -2164,9 +2185,8 @@
msgstr "ཁྱོད་ཀྱིས་Ubuntuགསར་པར་རིམ་སྤོར་བྱེད་པར་འདོར་ཚར"
#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
-#, fuzzy
msgid ""
-"You can upgrade at a later time by opening Software Updater and click on "
+"You can upgrade at a later time by opening Update Manager and click on "
"\"Upgrade\"."
msgstr "རྗེས་སུ་རིམ་སྤོར་དགོས་ན་གསར་སྒྱུར་དོ་དམ་པ་ཁ་ཕྱེ་ནས་\"རིམ་སྤོར་\"ལ་རྡེབ་གནོན་བྱེད་དགོས་"
@@ -2178,58 +2198,58 @@
msgid "Show and install available updates"
msgstr "རིམ་སྤོར་སྤྱོད་རུང་རྣམས་མངོན་པ་དང་སྒྲིག་འཇུག་བྱེད"
-#: ../update-manager:66 ../update-manager-text:55 ../do-release-upgrade:51
+#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46
msgid "Show version and exit"
msgstr "པར་གཞི་མངོན་ནས་ཕྱིར་འདོན"
-#: ../update-manager:69
+#: ../update-manager:64
msgid "Directory that contains the data files"
msgstr "Directory that contains the data filesཆ་འཕྲིན་གྲངས་ཡིག་ཆའི་འཇུག་སྣོད"
-#: ../update-manager:72
+#: ../update-manager:67
msgid "Check if a new Ubuntu release is available"
msgstr "Ubuntu་འགྲེལ་སྤེལ་གསར་པ་ལྟ་བཤེར་བྱེད་པ"
-#: ../update-manager:75 ../do-release-upgrade:54 ../check-new-release-gtk:186
+#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182
msgid "Check if upgrading to the latest devel release is possible"
msgstr ""
"Check if upgrading to the latest devel release is possibleཐེངས་རྗེས་མའི་འགྲེམ་སྤེལ་ལ་"
"རིམ་སྤོར་ཐུབ་མིན་རྟགས་བཤེར"
-#: ../update-manager:79
+#: ../update-manager:74
msgid "Upgrade using the latest proposed version of the release upgrader"
msgstr "པར་གཞི་རིམ་སྤོར་བའི་ཐེངས་རྗེས་མའི་པར་གཞི་བེད་སྤྱོད་ནས་རིམ་སྤོར་བྱེད་པ"
-#: ../update-manager:86
+#: ../update-manager:81
msgid "Do not focus on map when starting"
msgstr "སྒོ་འབྱེད་པ་དང་ས་ཁྲ་གཙོ་འཛིན་མི་བྱེད་པ"
-#: ../update-manager:89
+#: ../update-manager:84
msgid "Try to run a dist-upgrade"
msgstr "dist-རིམ་སྤོར་འཁོར་སྐྱོད་ཚོད་ལྟ་བྱེད་པ"
-#: ../update-manager:92
+#: ../update-manager:87
msgid "Do not check for updates when starting"
msgstr "འགོ་འཛུགས་པ་དང་གསར་སྒྱུར་ལྟ་བཤེར་བྱེད་མི་དགོས"
-#: ../update-manager:96 ../do-release-upgrade:70
+#: ../update-manager:91 ../do-release-upgrade:65
msgid "Test upgrade with a sandbox aufs overlay"
msgstr "sandbox aufs ཕྱི་རིམ་ཞིག་གིས་རིམ་སྤོར་ཚོད་ལྟ་བ"
-#: ../update-manager:116
+#: ../update-manager:111
msgid "Running partial upgrade"
msgstr "རིམ་སྤོར་ཚོ་གཅིག་འཁོར་སྐྱོད་བཞིན་པ"
-#: ../update-manager-text:59
+#: ../update-manager-text:54
msgid "Show description of the package instead of the changelog"
msgstr ""
-#: ../do-release-upgrade:58 ../check-new-release-gtk:190
+#: ../do-release-upgrade:53 ../check-new-release-gtk:186
msgid ""
"Try upgrading to the latest release using the upgrader from $distro-proposed"
msgstr "$distro-proposedཡི་རིམ་སྤོར་ཆས་སྤྱོད་ནས་ཐེངས་རྗེས་མའི་པར་གཞི་ལ་རིམ་སྤོར་བྱེད་པ"
-#: ../do-release-upgrade:62
+#: ../do-release-upgrade:57
msgid ""
"Run in a special upgrade mode.\n"
"Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2239,11 +2259,11 @@
"དང་ཐོག་གི་གཙོ་ངོས་མ་ལག་ལ་་གཙོ་ངོས་་ཀྱི་ཚད་ལྡན་རིམ་སྤོར་དང་ཞབས་ཞུ་བའི་མ་ལག་ལ་ ཞབས་ཞུ་བའི་རམ་"
"འདེགས་ཡོད་པ།"
-#: ../do-release-upgrade:68
+#: ../do-release-upgrade:63
msgid "Run the specified frontend"
msgstr "དམིགས་བསལ་ཅན་གྱི་མདུན་སྣེ་འཁོར་སྐྱོད"
-#: ../do-release-upgrade:73
+#: ../do-release-upgrade:68
msgid ""
"Check only if a new distribution release is available and report the result "
"via the exit code"
@@ -2251,11 +2271,11 @@
"འགྲེམས་སྤེལ་གསར་པ་ཁོ་ན་ཡོད་མིན་འཚོར་བཤེར་བྱེད་པ་དང་ཕྱིར་ཐོན་ཨང་རྟགས་བརྒྱུད་ནས་འདིའི་མཇུག་འབྲས་ཡར་ཞུ་"
"བྱེད་དགོས"
-#: ../do-release-upgrade:87
+#: ../do-release-upgrade:82
msgid "Checking for a new Ubuntu release"
msgstr ""
-#: ../do-release-upgrade:101
+#: ../do-release-upgrade:96
msgid ""
"For upgrade information, please visit:\n"
"%(url)s\n"
@@ -2263,167 +2283,211 @@
"རིམ་སྤོར་སྐོར་འདིར་འདྲི་ཞིབ་བྱེད་རོགས:\n"
"%(url)s\n"
-#: ../do-release-upgrade:107
+#: ../do-release-upgrade:102
msgid "No new release found"
msgstr "འགྲེམ་སྤེལ་གསར་པ་མ་རྙེད"
-#: ../do-release-upgrade:119
+#: ../do-release-upgrade:114
#, c-format
msgid "New release '%s' available."
msgstr "འགྲེམ་སྤེལ་གསར་པ་'%s' སྤྱོད་རུང་བ"
-#: ../do-release-upgrade:120
+#: ../do-release-upgrade:115
msgid "Run 'do-release-upgrade' to upgrade to it."
msgstr "'do-release-upgrade'འགྲེལ་སྤེལ་རིམ་སྤོར་བྱོས་་འཁོར་སྤྱོད་བྱས་ནས་དེ་ལ་རིམ་སྤོར་བྱེད་པ"
-#: ../check-new-release-gtk:101
+#: ../check-new-release-gtk:90
msgid "Ubuntu %(version)s Upgrade Available"
msgstr "Ubuntu %(པར་གཞི་)་ལ་རིམ་སྤོར་ཆོག་པ"
-#: ../check-new-release-gtk:143
+#: ../check-new-release-gtk:132
#, c-format
msgid "You have declined the upgrade to Ubuntu %s"
msgstr "Ubuntu %s་རིམ་སྤོར་བྱེད་པར་ཁྱོད་ཀྱིས་འདོར་ཚར"
-#: ../check-new-release-gtk:196
+#: ../check-new-release-gtk:192
msgid "Add debug output"
msgstr ""
-#: ../ubuntu-support-status:91
+#: ../ubuntu-support-status:81
msgid "Show unsupported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:94
+#: ../ubuntu-support-status:84
msgid "Show supported packages on this machine"
msgstr ""
-#: ../ubuntu-support-status:97
+#: ../ubuntu-support-status:87
msgid "Show all packages with their status"
msgstr ""
-#: ../ubuntu-support-status:100
+#: ../ubuntu-support-status:90
msgid "Show all packages in a list"
msgstr ""
-#: ../ubuntu-support-status:142
+#: ../ubuntu-support-status:132
#, c-format
msgid "Support status summary of '%s':"
msgstr ""
-#: ../ubuntu-support-status:145
+#: ../ubuntu-support-status:135
msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
msgstr ""
-#: ../ubuntu-support-status:151
+#: ../ubuntu-support-status:141
msgid ""
"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
"downloaded"
msgstr ""
-#: ../ubuntu-support-status:154
+#: ../ubuntu-support-status:144
msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
msgstr ""
-#: ../ubuntu-support-status:162
+#: ../ubuntu-support-status:157
msgid ""
"Run with --show-unsupported, --show-supported or --show-all to see more "
"details"
msgstr ""
-#: ../ubuntu-support-status:166
+#: ../ubuntu-support-status:161
msgid "No longer downloadable:"
msgstr ""
-#: ../ubuntu-support-status:169
+#: ../ubuntu-support-status:164
msgid "Unsupported: "
msgstr ""
-#: ../ubuntu-support-status:174
+#: ../ubuntu-support-status:169
#, c-format
msgid "Supported until %s:"
msgstr ""
-#: ../ubuntu-support-status:183
+#: ../ubuntu-support-status:178
msgid "Unsupported"
msgstr ""
-#. Why do we use %s here instead of $strings or {} format placeholders?
-#. It's because we don't want to break existing translations.
-#: ../janitor/plugincore/exceptions.py:42
+#: ../hwe-support-status:182
+msgid ""
+"You are not running a system with a Hardware Enablement Stack. Your system "
+"is supported until %(month)s %(year)s."
+msgstr ""
+
+#: ../hwe-support-status:189
+msgid "Check HWE support status"
+msgstr ""
+
+#: ../Janitor/computerjanitor/exc.py:30
#, python-format
msgid "Unimplemented method: %s"
msgstr "ལེགས་འགྲུབ་མ་བྱུང་བའི་ཐབས་ཤེས: %s"
-#: ../janitor/plugincore/core/file_cruft.py:41
+#: ../Janitor/computerjanitor/file_cruft.py:46
msgid "A file on disk"
msgstr "བླུགས་སྡེར་ནང་གི་ཡིག་ཆ་ཞིག"
-#: ../janitor/plugincore/core/missing_package_cruft.py:39
+#: ../Janitor/computerjanitor/package_cruft.py:45
+msgid ".deb package"
+msgstr ".deb འཐུམ་སྒྲིལ"
+
+#: ../Janitor/computerjanitor/missing_package_cruft.py:33
msgid "Install missing package."
msgstr "ཆ་མ་ཚང་བའི་འཐུམ་བུ་སྒྲིག་འཇུག"
-#. 2012-06-08 BAW: i18n string; don't use {} or PEP 292.
-#: ../janitor/plugincore/core/missing_package_cruft.py:49
+#: ../Janitor/computerjanitor/missing_package_cruft.py:42
#, python-format
msgid "Package %s should be installed."
msgstr "%s་འཐུམ་བུ་སྒྲིག་འཇུག་དགོས་པ"
-#: ../janitor/plugincore/core/package_cruft.py:49
-msgid ".deb package"
-msgstr ".deb འཐུམ་སྒྲིལ"
-
-#: ../janitor/plugincore/plugins/langpack_manual_plugin.py:46
-#, python-format
-msgid "%s needs to be marked as manually installed."
-msgstr "%sལ་ལག་བཟོས་སྒྲིག་འཇུག་དགོས་པ"
-
-#: ../janitor/plugincore/plugins/kdelibs4to5_plugin.py:49
-msgid ""
-"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
-"installed. See bugs.launchpad.net, bug #279621 for details."
-msgstr ""
-"རིམ་སྤོར་སྐབས་གལ་སྲིད་kdelibs4-devསྒྲིག་འཇུག་ཚར་ན་kdelibs5-devཡང་སྒྲིག་འཇུག་དགོས་པ bugs."
-"launchpad.net, bug #279621ལ་བལྟས་ནས་ཞིབ་ཕྲ་ཀློག་པ"
-
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:44
+#. pragma: no cover
+#: ../Janitor/plugins/dpkg_status_plugin.py:36
#, python-format
msgid "%i obsolete entries in the status file"
msgstr "གནས་སྟངས་ཡིག་ཆ་ནང་%iའཇུག་སྣོད་རྙིང་པ་འདུག"
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:47
+#: ../Janitor/plugins/dpkg_status_plugin.py:39
msgid "Obsolete entries in dpkg status"
msgstr "Obsolete entries in dpkg གནས་སྟངས་ནང་དུ་འཇུག་སྣོད་རཉིང་པ་འདུག"
#. pragma: no cover
-#: ../janitor/plugincore/plugins/dpkg_status_plugin.py:50
+#: ../Janitor/plugins/dpkg_status_plugin.py:42
msgid "Obsolete dpkg status entries"
msgstr "Obsolete dpkg གནས་སྟངས་འཇུག་སྣོད་རྙིང་པ"
-#: ../janitor/plugincore/plugins/remove_lilo_plugin.py:42
-msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
-msgstr "grub སྒྲིག་འཛུགས་ཡོད་པའི་སྟབས་ཀྱིས་lilo་བསུབ་དགོས(ཞིབ་ཕྲ་སྐྱོན་ #314004 ལ་ལྟ་རོགས)"
+#: ../Janitor/plugins/kdelibs4to5_plugin.py:39
+msgid ""
+"When upgrading, if kdelibs4-dev is installed, kdelibs5-dev needs to be "
+"installed. See bugs.launchpad.net, bug #279621 for details."
+msgstr ""
+"རིམ་སྤོར་སྐབས་གལ་སྲིད་kdelibs4-devསྒྲིག་འཇུག་ཚར་ན་kdelibs5-devཡང་སྒྲིག་འཇུག་དགོས་པ bugs."
+"launchpad.net, bug #279621ལ་བལྟས་ནས་ཞིབ་ཕྲ་ཀློག་པ"
-#~ msgid "%(count)s update has been selected."
-#~ msgid_plural "%(count)s updates have been selected."
-#~ msgstr[0] "གསར་སྒྱུར་དགོས་པ་%(count)s བདམས་ཟིན་པ"
+#: ../Janitor/plugins/langpack_manual_plugin.py:34
+#, python-format
+msgid "%s needs to be marked as manually installed."
+msgstr "%sལ་ལག་བཟོས་སྒྲིག་འཇུག་དགོས་པ"
-#~ msgid "%(count_str)s %(download_str)s"
-#~ msgstr "%(count_str)s %(download_str)s"
+#: ../Janitor/plugins/remove_lilo_plugin.py:28
+msgid "Remove lilo since grub is also installed.(See bug #314004 for details.)"
+msgstr "grub སྒྲིག་འཛུགས་ཡོད་པའི་སྟབས་ཀྱིས་lilo་བསུབ་དགོས(ཞིབ་ཕྲ་སྐྱོན་ #314004 ལ་ལྟ་རོགས)"
-#~ msgid "Welcome to Ubuntu"
-#~ msgstr "Ubuntu མ་ལག་གིས་དགའ་བསུ་ཞུ"
+#: ../HweSupportStatus/consts.py:20
+#, python-format
+msgid ""
+"\n"
+"There is a graphics stack installed on this system. An upgrade to a \n"
+"supported (or longer supported) configuration will become available\n"
+"on %(date)s and can be invoked by running 'update-manager' in the\n"
+"Dash.\n"
+" "
+msgstr ""
-#~ msgid "Update Manager"
-#~ msgstr "གསར་སྒྱུར་དོ་དམ་པ"
+#: ../HweSupportStatus/consts.py:28
+#, python-format
+msgid ""
+"\n"
+"To upgrade to a supported (or longer supported) configuration:\n"
+"\n"
+"* Upgrade from Ubuntu 12.04 LTS to Ubuntu 14.04 LTS by running:\n"
+"sudo do-release-upgrade %s\n"
+"\n"
+"OR\n"
+"\n"
+"* Install a newer HWE version by running:\n"
+"sudo apt-get install %s\n"
+"\n"
+"and reboot your system."
+msgstr ""
-#~ msgid "Starting Update Manager"
-#~ msgstr "གསར་སྒྱུར་དོ་དམ་པ་འགོ་འཛུགས་པ"
+#: ../HweSupportStatus/consts.py:41
+#, python-format
+msgid ""
+"Your Hardware Enablement Stack (HWE) is supported until %(month)s %(year)s."
+msgstr ""
-#~ msgid "You are connected via a wireless modem."
-#~ msgstr "ཁྱོད་ཀྱིས་སྐུད་མེད་མཐུན་སྒྲིག་ཆས་བརྒྱུད་ནས་སྦྲེལ་མཐུད་བྱས་འདུག"
+#: ../HweSupportStatus/consts.py:47
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is going out of support\n"
+"on %s. After this date security updates for critical parts (kernel\n"
+"and graphics stack) of your system will no longer be available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
-#~ msgid "_Install Updates"
-#~ msgstr "རིམ་སྤོར་སྒྲིག་འཇུག_I"
+#: ../HweSupportStatus/consts.py:56
+#, python-format
+msgid ""
+"\n"
+"Your current Hardware Enablement Stack (HWE) is no longer supported\n"
+"since %s. Security updates for critical parts (kernel\n"
+"and graphics stack) of your system are no longer available.\n"
+"\n"
+"For more information, please see:\n"
+"http://wiki.ubuntu.com/1204_HWE_EOL\n"
+msgstr ""
#~ msgid ""
#~ "This upgrade is running in sandbox (test) mode. All changes are written "
@@ -2455,6 +2519,10 @@
#~ "ད་ནས་བཟུང་ཁྱོད་ལ་བདེ་འཇགས་བཟོ་བཅོས་དང་གསར་སྒྱུར་གཙོ་ཆེན་ཐོབ་མི་སྲིད་པསUbuntu Linux་མ་ལག་"
#~ "པར་གཞི་གསར་པར་རིམ་སྤོར་བྱེད་རོགས"
+#~ msgid "The update has already been downloaded, but not installed"
+#~ msgid_plural "The updates have already been downloaded, but not installed"
+#~ msgstr[0] "གདམ་ཟིན་པའི་ཐུམ་བུ་གསར་སྒྱུར་རྣམས་མ་ལག་འདིའི་ཐོག་ལེན་འཇུག་དང་སྒྲིག་འཇུག་བྱས་ཚར"
+
#~ msgid "There are no updates to install"
#~ msgstr "སྒྲིག་འཇུག་བྱེད་དགོས་པའི་གསར་སྒྱུར་མེད་པ"
diff -Nru update-manager-17.10.11/po/br.po update-manager-0.156.14.15/po/br.po
--- update-manager-17.10.11/po/br.po 2017-01-05 18:01:57.000000000 +0000
+++ update-manager-0.156.14.15/po/br.po 2017-12-23 05:00:37.000000000 +0000
@@ -3,11 +3,12 @@
# This file is distributed under the same license as the update-manager package.
# FIRST AUTHOR , 2006.
#
+#: ../hwe-support-status:167
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2012-06-14 00:53+0100\n"
+"POT-Creation-Date: 2014-06-19 11:21+0200\n"
"PO-Revision-Date: 2012-02-23 20:01+0000\n"
"Last-Translator: Alan \n"
"Language-Team: Breton