summaryrefslogtreecommitdiff
path: root/po/urd.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/urd.po')
-rw-r--r--po/urd.po458
1 files changed, 226 insertions, 232 deletions
diff --git a/po/urd.po b/po/urd.po
index 0a34f9a4..3d403f41 100644
--- a/po/urd.po
+++ b/po/urd.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
-"POT-Creation-Date: 2006-09-10 01:15+0200\n"
+"POT-Creation-Date: 2006-09-23 00:48+0200\n"
"PO-Revision-Date: 2006-05-07 01:53+0000\n"
"Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n"
"Language-Team: Urdu <urd@li.org>\n"
@@ -130,7 +130,7 @@ msgstr ""
#: ../SoftwareProperties/SoftwareProperties.py:1036
#, python-format
msgid ""
-"<big><b>Error scaning the CD</b></big>\n"
+"<big><b>Error scanning the CD</b></big>\n"
"\n"
"%s"
msgstr ""
@@ -143,79 +143,79 @@ msgstr ""
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:89
+#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:90
+#: ../DistUpgrade/DistUpgradeCache.py:93
msgid ""
"Your system contains broken packages that couldn't be fixed with this "
"software. Please fix them first using synaptic or apt-get before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:147
+#: ../DistUpgrade/DistUpgradeCache.py:150
msgid "Can't upgrade required meta-packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:154
+#: ../DistUpgrade/DistUpgradeCache.py:157
msgid "A essential package would have to be removed"
msgstr ""
#. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:157
+#: ../DistUpgrade/DistUpgradeCache.py:160
msgid "Could not calculate the upgrade"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:158
+#: ../DistUpgrade/DistUpgradeCache.py:161
msgid ""
-"A unresolvable problem occured while calculating the upgrade.\n"
+"A unresolvable problem occurred while calculating the upgrade.\n"
"\n"
"Please report this bug against the 'update-manager' package and include the "
"files in /var/log/dist-upgrade/ in the bugreport."
msgstr ""
#. FIXME: maybe ask a question here? instead of failing?
-#: ../DistUpgrade/DistUpgradeCache.py:183
+#: ../DistUpgrade/DistUpgradeCache.py:186
msgid "Error authenticating some packages"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:184
+#: ../DistUpgrade/DistUpgradeCache.py:187
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:249
+#: ../DistUpgrade/DistUpgradeCache.py:252
#, python-format
msgid "Can't install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:250
+#: ../DistUpgrade/DistUpgradeCache.py:253
msgid ""
"It was impossible to install a required package. Please report this as a "
"bug. "
msgstr ""
#. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:257
+#: ../DistUpgrade/DistUpgradeCache.py:260
msgid "Can't guess meta-package"
msgstr ""
-#: ../DistUpgrade/DistUpgradeCache.py:258
+#: ../DistUpgrade/DistUpgradeCache.py:261
msgid ""
"Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-"
"desktop package and it was not possible to detect which version of ubuntu "
-"you are runing.\n"
+"you are running.\n"
" Please install one of the packages above first using synaptic or apt-get "
"before proceeding."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:73
+#: ../DistUpgrade/DistUpgradeControler.py:74
msgid "Failed to add the CD"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:74
+#: ../DistUpgrade/DistUpgradeControler.py:75
#, python-format
msgid ""
"There was a error adding the CD, the upgrade will abort. Please report this "
@@ -225,15 +225,15 @@ msgid ""
"'%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:104
+#: ../DistUpgrade/DistUpgradeControler.py:107
msgid "Reading cache"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:143
+#: ../DistUpgrade/DistUpgradeControler.py:147
msgid "Fetch data from the network for the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:144
+#: ../DistUpgrade/DistUpgradeControler.py:148
msgid ""
"The upgrade can use the network to check the latest updates and to fetch "
"packages that are not on the current CD.\n"
@@ -241,11 +241,11 @@ msgid ""
"If networking is expensive for you choose 'No'."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:235
+#: ../DistUpgrade/DistUpgradeControler.py:239
msgid "No valid mirror found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:236
+#: ../DistUpgrade/DistUpgradeControler.py:240
#, python-format
msgid ""
"While scaning your repository information no mirror entry for the upgrade "
@@ -258,11 +258,11 @@ msgid ""
msgstr ""
#. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeControler.py:253
+#: ../DistUpgrade/DistUpgradeControler.py:257
msgid "Generate default sources?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:254
+#: ../DistUpgrade/DistUpgradeControler.py:258
#, python-format
msgid ""
"After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -271,42 +271,42 @@ msgid ""
"cancel."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:288
+#: ../DistUpgrade/DistUpgradeControler.py:292
msgid "Repository information invalid"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:289
+#: ../DistUpgrade/DistUpgradeControler.py:293
msgid ""
"Upgrading the repository information resulted in a invalid file. Please "
"report this as a bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:295
+#: ../DistUpgrade/DistUpgradeControler.py:299
msgid "Third party sources disabled"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:300
msgid ""
-"Some third party entries in your souces.list were disabled. You can re-"
+"Some third party entries in your sources.list were disabled. You can re-"
"enable them after the upgrade with the 'software-properties' tool or with "
"synaptic."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:345
+#: ../DistUpgrade/DistUpgradeControler.py:349
msgid "Error during update"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:346
+#: ../DistUpgrade/DistUpgradeControler.py:350
msgid ""
"A problem occured during the update. This is usually some sort of network "
"problem, please check your network connection and retry."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:355
+#: ../DistUpgrade/DistUpgradeControler.py:359
msgid "Not enough free disk space"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:356
+#: ../DistUpgrade/DistUpgradeControler.py:360
#, python-format
msgid ""
"The upgrade aborts now. Please free at least %s of disk space on %s. Empty "
@@ -315,15 +315,15 @@ msgid ""
msgstr ""
#. ask the user if he wants to do the changes
-#: ../DistUpgrade/DistUpgradeControler.py:415
+#: ../DistUpgrade/DistUpgradeControler.py:419
msgid "Do you want to start the upgrade?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:432
+#: ../DistUpgrade/DistUpgradeControler.py:439
msgid "Could not install the upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:433
+#: ../DistUpgrade/DistUpgradeControler.py:440
msgid ""
"The upgrade aborts now. Your system could be in an unusable state. A "
"recovery was run (dpkg --configure -a).\n"
@@ -332,72 +332,77 @@ msgid ""
"files in /var/log/dist-upgrade/ in the bugreport."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:451
+#: ../DistUpgrade/DistUpgradeControler.py:458
msgid "Could not download the upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:452
+#: ../DistUpgrade/DistUpgradeControler.py:459
msgid ""
"The upgrade aborts now. Please check your internet connection or "
"installation media and try again. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:488
-msgid "Some software no longer officially supported"
+#: ../DistUpgrade/DistUpgradeControler.py:495
+msgid "Support for some applications ended"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:490
+#: ../DistUpgrade/DistUpgradeControler.py:496
msgid ""
-"These installed packages are no longer officially supported, and are now "
-"only community-supported ('universe').\n"
+"Canonical Ltd. no longer provides support for the following software "
+"packages. You can still get support from the community.\n"
"\n"
-"If you don't have 'universe' enabled these packages will be suggested for "
-"removal in the next step. "
+"If you havn't enabled community maintained software (universe), these "
+"packages will be suggested for removal in the next step."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:524
+#: ../DistUpgrade/DistUpgradeControler.py:531
msgid "Remove obsolete packages?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:525
+#: ../DistUpgrade/DistUpgradeControler.py:532
msgid "_Skip This Step"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:525
+#: ../DistUpgrade/DistUpgradeControler.py:532
msgid "_Remove"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:535
+#: ../DistUpgrade/DistUpgradeControler.py:542
msgid "Error during commit"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:536
+#: ../DistUpgrade/DistUpgradeControler.py:543
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
msgstr ""
#. generate a new cache
-#: ../DistUpgrade/DistUpgradeControler.py:546
+#: ../DistUpgrade/DistUpgradeControler.py:553
msgid "Restoring original system state"
msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:609
+#, python-format
+msgid "Fetching backport of '%s'"
+msgstr ""
+
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:554
-#: ../DistUpgrade/DistUpgradeControler.py:583
+#: ../DistUpgrade/DistUpgradeControler.py:644
+#: ../DistUpgrade/DistUpgradeControler.py:677
msgid "Checking package manager"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:569
+#: ../DistUpgrade/DistUpgradeControler.py:663
msgid "Updating repository information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:594
+#: ../DistUpgrade/DistUpgradeControler.py:688
msgid "Invalid package information"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:595
+#: ../DistUpgrade/DistUpgradeControler.py:689
#, python-format
msgid ""
"After your package information was updated the essential package '%s' can "
@@ -407,19 +412,19 @@ msgid ""
"bugreport."
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:607
+#: ../DistUpgrade/DistUpgradeControler.py:701
msgid "Asking for confirmation"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:611
+#: ../DistUpgrade/DistUpgradeControler.py:705
msgid "Upgrading"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:618
+#: ../DistUpgrade/DistUpgradeControler.py:712
msgid "Searching for obsolete software"
msgstr ""
-#: ../DistUpgrade/DistUpgradeControler.py:623
+#: ../DistUpgrade/DistUpgradeControler.py:717
msgid "System upgrade is complete."
msgstr ""
@@ -439,7 +444,7 @@ msgid "Fetching file %li of %li at %s/s"
msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:130
-#: ../DistUpgrade/DistUpgradeViewGtk.py:252
+#: ../DistUpgrade/DistUpgradeViewGtk.py:249
#, python-format
msgid "About %s remaining"
msgstr ""
@@ -471,19 +476,25 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeViewGtk.py:202
#, python-format
msgid ""
-"Replace configuration file\n"
+"Replace the customized configuration file\n"
"'%s'?"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:219
+#: ../DistUpgrade/DistUpgradeViewGtk.py:203
+msgid ""
+"You will loose all customizations, that have been made by yourself or by a "
+"script, if you replace the file by its latest version."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:216
msgid "The 'diff' command was not found"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:358
+#: ../DistUpgrade/DistUpgradeViewGtk.py:356
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 aborts "
@@ -493,28 +504,28 @@ msgstr ""
#. FIXME: make those two seperate lines to make it clear
#. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeViewGtk.py:475
+#: ../DistUpgrade/DistUpgradeViewGtk.py:487
#, python-format
-msgid "%s package is going to be removed."
-msgid_plural "%s packages are going to be removed."
+msgid "%d package is going to be removed."
+msgid_plural "%d packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:480
+#: ../DistUpgrade/DistUpgradeViewGtk.py:492
#, python-format
-msgid "%s new package is going to be installed."
-msgid_plural "%s new packages are going to be installed."
+msgid "%d new package is going to be installed."
+msgid_plural "%d new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:486
+#: ../DistUpgrade/DistUpgradeViewGtk.py:498
#, python-format
-msgid "%s package is going to be upgraded."
-msgid_plural "%s packages are going to be upgraded."
+msgid "%d package is going to be upgraded."
+msgid_plural "%d packages are going to be upgraded."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:491
+#: ../DistUpgrade/DistUpgradeViewGtk.py:503
#, python-format
msgid ""
"\n"
@@ -522,36 +533,39 @@ msgid ""
"You have to download a total of %s. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:497
+#: ../DistUpgrade/DistUpgradeViewGtk.py:509
msgid ""
"Fetching and installing the upgrade can take several hours and cannot be "
"canceled at any time later."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:500
+#: ../DistUpgrade/DistUpgradeViewGtk.py:512
msgid "To prevent data loss close all open applications and documents."
msgstr ""
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:506
-msgid "Could not find any upgrades"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:518
+#: ../UpdateManager/UpdateManager.py:618
+msgid "Your system is up-to-date"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:507
-msgid "Your system has already been upgraded."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:519
+msgid ""
+"There are no upgrades available for your system. The upgrade will now be "
+"canceled."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:522
+#: ../DistUpgrade/DistUpgradeViewGtk.py:535
#, python-format
msgid "<b>Remove %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:524
+#: ../DistUpgrade/DistUpgradeViewGtk.py:537
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:526
+#: ../DistUpgrade/DistUpgradeViewGtk.py:539
#, python-format
msgid "Upgrade %s"
msgstr ""
@@ -585,11 +599,11 @@ msgid ""
"DSL connection"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:105
+#: ../DistUpgrade/DistUpgradeView.py:109
msgid "Reboot required"
msgstr ""
-#: ../DistUpgrade/DistUpgradeView.py:106
+#: ../DistUpgrade/DistUpgradeView.py:110
msgid ""
"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
@@ -620,7 +634,7 @@ msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:7
-msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>"
+msgid "<b><big>Upgrading Ubuntu to version 6.10</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
@@ -741,8 +755,8 @@ msgstr ""
#: ../UpdateManager/DistUpgradeFetcher.py:222
msgid ""
-"Verfing the upgrade failed. There may be a problem with the network or with "
-"the server. "
+"Verifying the upgrade failed. There may be a problem with the network or "
+"with the server. "
msgstr ""
#: ../UpdateManager/DistUpgradeFetcher.py:228
@@ -765,162 +779,150 @@ msgstr ""
msgid "Downloading file %li of %li with unknown speed"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:197
+#: ../UpdateManager/UpdateManager.py:204
msgid "The list of changes is not available"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:203
+#: ../UpdateManager/UpdateManager.py:210
msgid "The list of changes is not available yet. Please try again later."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:208
+#: ../UpdateManager/UpdateManager.py:215
msgid ""
"Failed to download the list of changes. Please check your Internet "
"connection."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:228
-msgid "Important security updates of Ubuntu"
+#. Description
+#: ../UpdateManager/UpdateManager.py:235 ../data/channels/Ubuntu.info.in:88
+msgid "Important security updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:230
-msgid "Recommended updates of Ubuntu"
+#. Description
+#: ../UpdateManager/UpdateManager.py:237 ../data/channels/Ubuntu.info.in:93
+msgid "Recommended updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:232
-msgid "Proposed updates for Ubuntu"
+#. Description
+#: ../UpdateManager/UpdateManager.py:238 ../data/channels/Ubuntu.info.in:98
+msgid "Proposed updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:233
-msgid "Backports of Ubuntu"
+#: ../UpdateManager/UpdateManager.py:239
+msgid "Backports"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:234
-msgid "Updates of Ubuntu"
+#: ../UpdateManager/UpdateManager.py:240
+msgid "Normal updates"
msgstr ""
#. TRANSLATORS: updates from an 'unknown' origin
-#: ../UpdateManager/UpdateManager.py:242 ../UpdateManager/UpdateManager.py:255
+#: ../UpdateManager/UpdateManager.py:247 ../UpdateManager/UpdateManager.py:264
msgid "Other updates"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:276
-msgid "Cannot install all available updates"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:277
-msgid ""
-"Some of the updates require more extensive changes than expected.\n"
-"\n"
-"This usually means that you have enabled unoffical repositories, that it is "
-"not fully upgraded from the last distribution release or that you run a "
-"development release of the distribution.\n"
-"\n"
-"Would you like to perform a full distribution upgrade now?"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:474
+#: ../UpdateManager/UpdateManager.py:460
#, python-format
msgid "Version %s: \n"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:535
+#: ../UpdateManager/UpdateManager.py:521
msgid "Downloading the list of changes..."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:559
-msgid "Select _None"
+#: ../UpdateManager/UpdateManager.py:545
+msgid "_Uncheck All"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:565
-msgid "Select _All"
+#: ../UpdateManager/UpdateManager.py:551
+msgid "_Check All"
msgstr ""
#. TRANSLATORS: download size is 0
-#: ../UpdateManager/UpdateManager.py:596
+#: ../UpdateManager/UpdateManager.py:582
msgid "None"
msgstr ""
#. TRANSLATORS: download size of very small updates
-#: ../UpdateManager/UpdateManager.py:599
+#: ../UpdateManager/UpdateManager.py:585
msgid "1 KB"
msgstr ""
#. TRANSLATORS: download size of small updates, e.g. "250 KB"
-#: ../UpdateManager/UpdateManager.py:602
+#: ../UpdateManager/UpdateManager.py:588
#, python-format
msgid "%.0f KB"
msgstr ""
#. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../UpdateManager/UpdateManager.py:605
+#: ../UpdateManager/UpdateManager.py:591
#, python-format
msgid "%.1f MB"
msgstr ""
#. TRANSLATORS: b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:623 ../UpdateManager/UpdateManager.py:647
+#: ../UpdateManager/UpdateManager.py:609 ../UpdateManager/UpdateManager.py:633
#, python-format
msgid "Download size: %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:632
-msgid "Your system is up-to-date"
-msgstr ""
-
-#: ../UpdateManager/UpdateManager.py:643
+#: ../UpdateManager/UpdateManager.py:629
#, python-format
msgid "You can install %s update"
msgid_plural "You can install %s updates"
msgstr[0] ""
msgstr[1] ""
-#: ../UpdateManager/UpdateManager.py:676
+#: ../UpdateManager/UpdateManager.py:662
msgid "Please wait, this can take some time."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:678
+#: ../UpdateManager/UpdateManager.py:664
msgid "Update is complete"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:830
+#: ../UpdateManager/UpdateManager.py:715
+msgid "Checking for updates"
+msgstr ""
+
+#: ../UpdateManager/UpdateManager.py:822
#, python-format
msgid "From version %s to %s"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:834
+#: ../UpdateManager/UpdateManager.py:826
#, python-format
msgid "Version %s"
msgstr ""
#. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:836
+#: ../UpdateManager/UpdateManager.py:828
#, python-format
msgid "(Size: %s)"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:846
+#: ../UpdateManager/UpdateManager.py:839
msgid "Your distribution is not supported anymore"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:847
+#: ../UpdateManager/UpdateManager.py:840
msgid ""
"You will not get any further security fixes or critical updates. Upgrade to "
"a later version of Ubuntu Linux. See http://www.ubuntu.com for more "
"information on upgrading."
msgstr ""
-#: ../UpdateManager/UpdateManager.py:866
+#: ../UpdateManager/UpdateManager.py:859
#, python-format
msgid "<b>New distribution release '%s' is available</b>"
msgstr ""
#. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:901
+#: ../UpdateManager/UpdateManager.py:894
msgid "Software index is broken"
msgstr ""
-#: ../UpdateManager/UpdateManager.py:902
+#: ../UpdateManager/UpdateManager.py:895
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 "
@@ -936,84 +938,96 @@ msgid ""
msgstr ""
#: ../data/glade/UpdateManager.glade.h:4
-msgid ""
-"<big><b>Examining your system</b></big>\n"
-"\n"
-"Software updates correct errors, eliminate security vulnerabilities and "
-"provide new features."
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:5
+msgid "<big><b>Not all updates can be installed</b></big>"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:6
+msgid "<big><b>Starting update manager</b></big>"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:7
-msgid "<big><b>Keep your system up-to-date</b></big>"
+msgid "Cancel _Download"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:8
-msgid "Cancel _Download"
+msgid "Changes"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:9
-msgid "Changes"
+msgid "Changes and description of the update"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:10
-msgid "Changes and description of the update"
+msgid "Chec_k"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:11
-msgid "Chec_k"
+msgid "Check the software channels for new updates"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:12
-msgid "Check the software channels for new updates"
+msgid "Description"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:13
-msgid "Description"
+msgid "Release Notes"
msgstr ""
#: ../data/glade/UpdateManager.glade.h:14
-msgid "Release Notes"
+msgid ""
+"Run a distribution upgrade, to install as many updates as possible. \n"
+"\n"
+"This can be caused by an uncompleted upgrade, unofficial software packages "
+"or by running a development version."
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:15
+#: ../data/glade/UpdateManager.glade.h:17
msgid "Show progress of single files"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:16
+#: ../data/glade/UpdateManager.glade.h:18
msgid "Software Updates"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:17
+#: ../data/glade/UpdateManager.glade.h:19
msgid ""
"Software updates correct errors, eliminate security vulnerabilities and "
"provide new features."
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:18
+#: ../data/glade/UpdateManager.glade.h:20
msgid "U_pgrade"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:19
+#: ../data/glade/UpdateManager.glade.h:21
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:20
+#: ../data/glade/UpdateManager.glade.h:22
msgid "_Check"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:21
+#: ../data/glade/UpdateManager.glade.h:23
+msgid "_Distribution Upgrade"
+msgstr ""
+
+#: ../data/glade/UpdateManager.glade.h:24
msgid "_Hide this information in the future"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:22
+#: ../data/glade/UpdateManager.glade.h:25
msgid "_Install Updates"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:23
+#: ../data/glade/UpdateManager.glade.h:26
msgid "changes"
msgstr ""
-#: ../data/glade/UpdateManager.glade.h:24
+#: ../data/glade/UpdateManager.glade.h:27
msgid "updates"
msgstr ""
@@ -1118,10 +1132,10 @@ msgstr ""
#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1
msgid ""
-"<b><big>The channel information is out-of-date</big></b>\n"
+"<b><big>The information about available software is out-of-date</big></b>\n"
"\n"
-"You have to reload the channel information to install software and updates "
-"from newly added or changed channels. \n"
+"To install software and updates from newly added or changed sources, you "
+"have to reload the information about available software.\n"
"\n"
"You need a working internet connection to continue."
msgstr ""
@@ -1148,10 +1162,10 @@ msgstr ""
#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11
msgid ""
-"<big><b>Enter the complete APT line of the source that you want to add</b></"
-"big>\n"
+"<big><b>Enter the complete APT line of the repository that you want to add "
+"as source</b></big>\n"
"\n"
-"The APT line includes the type, location and components of a source, for "
+"The APT line includes the type, location and components of a repository, for "
"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
msgstr ""
@@ -1201,7 +1215,7 @@ msgstr ""
#: ../data/update-manager.schemas.in.h:3
msgid ""
-"If automatic checking for updates is disabeld, you have to reload the "
+"If automatic checking for updates is disabled, you have to reload the "
"channel list manually. This option allows to hide the reminder shown in this "
"case."
msgstr ""
@@ -1220,7 +1234,7 @@ msgstr ""
#: ../data/update-manager.schemas.in.h:7
msgid ""
-"Stores the state of the expander that contains the list of changs and the "
+"Stores the state of the expander that contains the list of changes and the "
"description"
msgstr ""
@@ -1244,192 +1258,172 @@ msgid "Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:15
+#: ../data/channels/Ubuntu.info.in:13
msgid "Community maintained"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:20
+#: ../data/channels/Ubuntu.info.in:17
msgid "Proprietary drivers for devices"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:23
+#: ../data/channels/Ubuntu.info.in:19
msgid "Restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:29
+#: ../data/channels/Ubuntu.info.in:25
msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:71
+#: ../data/channels/Ubuntu.info.in:59
msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:75
+#: ../data/channels/Ubuntu.info.in:62
msgid "By Canonical supported Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:78
+#: ../data/channels/Ubuntu.info.in:64
msgid "Community maintained (universe)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:79
+#: ../data/channels/Ubuntu.info.in:65
msgid "Community maintained Open Source software"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:82
+#: ../data/channels/Ubuntu.info.in:67
msgid "Non-free drivers"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:83
+#: ../data/channels/Ubuntu.info.in:68
msgid "Proprietary drivers for devices "
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:86
+#: ../data/channels/Ubuntu.info.in:70
msgid "Restricted software (Multiverse)"
msgstr ""
#. CompDescriptionLong
-#: ../data/channels/Ubuntu.info.in:87
+#: ../data/channels/Ubuntu.info.in:71
msgid "By copyright or legal issues restricted software"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:92
+#: ../data/channels/Ubuntu.info.in:76
msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:106
-msgid "Important security updates"
-msgstr ""
-
-#. Description
-#: ../data/channels/Ubuntu.info.in:113
-msgid "Recommended updates"
-msgstr ""
-
-#. Description
-#: ../data/channels/Ubuntu.info.in:120
-msgid "Proposed updates"
-msgstr ""
-
-#. Description
-#: ../data/channels/Ubuntu.info.in:127
+#: ../data/channels/Ubuntu.info.in:103
msgid "Backported updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:134
+#: ../data/channels/Ubuntu.info.in:110
msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
-#. CompDescription
-#: ../data/channels/Ubuntu.info.in:137 ../data/channels/Debian.info.in:51
-msgid "Officially supported"
-msgstr ""
-
#. Description
-#: ../data/channels/Ubuntu.info.in:151
+#: ../data/channels/Ubuntu.info.in:123
msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:165
+#: ../data/channels/Ubuntu.info.in:135
msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:172
+#: ../data/channels/Ubuntu.info.in:140
msgid "Ubuntu 5.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:179
+#: ../data/channels/Ubuntu.info.in:145
msgid "Ubuntu 5.10 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:186
+#: ../data/channels/Ubuntu.info.in:152
msgid "Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:203
+#: ../data/channels/Ubuntu.info.in:165
msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:207
-msgid "Oficially supported"
+#: ../data/channels/Ubuntu.info.in:168 ../data/channels/Debian.info.in:51
+msgid "Officially supported"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:217
+#: ../data/channels/Ubuntu.info.in:177
msgid "Ubuntu 5.04 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:224
+#: ../data/channels/Ubuntu.info.in:182
msgid "Ubuntu 5.04 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:231
+#: ../data/channels/Ubuntu.info.in:187
msgid "Ubuntu 5.04 Backports"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:237
+#: ../data/channels/Ubuntu.info.in:193
msgid "Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:246
+#: ../data/channels/Ubuntu.info.in:199
msgid "Community maintained (Universe)"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:249
+#: ../data/channels/Ubuntu.info.in:201
msgid "Non-free (Multiverse)"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:254
+#: ../data/channels/Ubuntu.info.in:206
msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:258
-msgid "No longer oficially supported"
+#: ../data/channels/Ubuntu.info.in:209
+msgid "No longer officially supported"
msgstr ""
#. CompDescription
-#: ../data/channels/Ubuntu.info.in:261
+#: ../data/channels/Ubuntu.info.in:211
msgid "Restricted copyright"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:268
+#: ../data/channels/Ubuntu.info.in:218
msgid "Ubuntu 4.10 Security Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:275
+#: ../data/channels/Ubuntu.info.in:223
msgid "Ubuntu 4.10 Updates"
msgstr ""
#. Description
-#: ../data/channels/Ubuntu.info.in:282
+#: ../data/channels/Ubuntu.info.in:228
msgid "Ubuntu 4.10 Backports"
msgstr ""