diff options
| -rw-r--r-- | channels/Debian.info.in | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | po/bg.po | 376 | ||||
| -rw-r--r-- | po/br.po | 282 | ||||
| -rw-r--r-- | po/cs.po | 336 | ||||
| -rw-r--r-- | po/da.po | 284 | ||||
| -rw-r--r-- | po/de.po | 422 | ||||
| -rw-r--r-- | po/el.po | 354 | ||||
| -rw-r--r-- | po/en_CA.po | 392 | ||||
| -rw-r--r-- | po/en_GB.po | 381 | ||||
| -rw-r--r-- | po/es.po | 439 | ||||
| -rw-r--r-- | po/fi.po | 470 | ||||
| -rw-r--r-- | po/fr.po | 429 | ||||
| -rw-r--r-- | po/gl.po | 384 | ||||
| -rw-r--r-- | po/he.po | 358 | ||||
| -rw-r--r-- | po/hu.po | 414 | ||||
| -rw-r--r-- | po/it.po | 404 | ||||
| -rw-r--r-- | po/ja.po | 423 | ||||
| -rw-r--r-- | po/lt.po | 345 | ||||
| -rw-r--r-- | po/mk.po | 371 | ||||
| -rw-r--r-- | po/nb.po | 385 | ||||
| -rw-r--r-- | po/ne.po | 421 | ||||
| -rw-r--r-- | po/nl.po | 280 | ||||
| -rw-r--r-- | po/no.po | 18 | ||||
| -rw-r--r-- | po/pa.po | 303 | ||||
| -rw-r--r-- | po/pl.po | 437 | ||||
| -rw-r--r-- | po/pt.po | 349 | ||||
| -rw-r--r-- | po/pt_BR.po | 435 | ||||
| -rw-r--r-- | po/ro.po | 357 | ||||
| -rw-r--r-- | po/rw.po | 346 | ||||
| -rw-r--r-- | po/sk.po | 287 | ||||
| -rw-r--r-- | po/sv.po | 545 | ||||
| -rw-r--r-- | po/uk.po | 382 | ||||
| -rw-r--r-- | po/update-manager.pot | 13 | ||||
| -rw-r--r-- | po/vi.po | 374 | ||||
| -rw-r--r-- | po/xh.po | 296 | ||||
| -rw-r--r-- | po/zh_CN.po | 368 | ||||
| -rw-r--r-- | po/zh_HK.po | 368 | ||||
| -rw-r--r-- | po/zh_TW.po | 365 |
39 files changed, 7951 insertions, 5256 deletions
diff --git a/channels/Debian.info.in b/channels/Debian.info.in index 7b19c7d4..ea2d1e53 100644 --- a/channels/Debian.info.in +++ b/channels/Debian.info.in @@ -6,7 +6,7 @@ _BaseURI: http://http.us.debian.org/debian/ _Description: Debian 3.1 "Sarge" Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: contrib Enabled: 0 _CompDescription: DFSG-compatible Software with Non-Free Dependencies @@ -20,7 +20,7 @@ _BaseURI: http://security.debian.org/ _Description: Debian 3.1 "Sarge" Security Updates Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: contrib Enabled: 0 _CompDescription: DFSG-compatible Software with Non-Free Dependencies @@ -34,7 +34,7 @@ _BaseURI: http://http.us.debian.org/debian/ _Description: Debian "Etch" (testing) Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: contrib Enabled: 0 _CompDescription: DFSG-compatible Software with Non-Free Dependencies @@ -48,7 +48,7 @@ _BaseURI: http://http.us.debian.org/debian/ _Description: Debian "Sid" (unstable) Component: main Enabled: 1 -_CompDescription: Oficially supported +_CompDescription: Officially supported Component: contrib Enabled: 0 _CompDescription: DFSG-compatible Software with Non-Free Dependencies diff --git a/debian/changelog b/debian/changelog index 236841b7..ea48e906 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +update-manager (0.42.2ubuntu12) dapper; urgency=low + + * channels/*.in: typo fix + + -- + update-manager (0.42.2ubuntu11) dapper; urgency=low * debian/control: @@ -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-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: Rostislav Raykov <nostalgiafed@gmail.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -17,40 +17,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +57,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -84,6 +83,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -97,23 +97,24 @@ msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -122,11 +123,12 @@ msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -139,42 +141,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Грешка при премахване на ключа" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -182,18 +185,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -206,164 +210,189 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Друга програма за управление на пакетите е стартирана." -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Обновлението е завършено" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Инсталиране на обновленията..." +msgid "Applying changes" +msgstr "Сваляне на промените..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -371,6 +400,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -394,8 +424,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -408,38 +438,51 @@ msgid "Details" msgstr "<b>Допълнителна информация</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Презареждане" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -453,7 +496,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -472,53 +515,56 @@ msgid "Changes" msgstr "Промени" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "Проверка за обновления..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Описание" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Обновления на софтуера" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Инсталиране на обновленията..." @@ -590,7 +636,7 @@ msgid "_Check for updates automatically:" msgstr "Проверка за обновления на всеки" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -621,12 +667,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Дистрибуция:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Раздели:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Дистрибуция:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -644,14 +691,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Добавете пълния ред на хранилището за APT, което искате да " -"добавите</b></big>\n" +"<big><b>Добавете пълния ред на хранилището за APT, което искате да добавите</" +"b></big>\n" "\n" "APT редът съдържа вида, местонахождението и съдържанието на хранилището. " "Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете " @@ -683,9 +730,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -733,112 +778,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 обновления" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 обновления по сигурността" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 обновления" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 обновления" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD с Ubuntu 5.10 „Breezy Badger“" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 обновления по сигурността" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 обновления" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 обновления" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Официално поддържан" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Ограничен от правата" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Поддържан от обществото (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Несвободен (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable обновления по сигурността" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Официално поддържан" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Инсталиране на обновленията..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "Проверка за обновления..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Раздели:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официално поддържан" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Презареждане от сървъра на информацията за пакетите." @@ -878,9 +955,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ден/дни" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Хранилище</b>" @@ -898,16 +972,16 @@ msgstr "" #~ msgstr "" #~ "<big><b>Ключове за идентификация</b></big>\n" #~ "\n" -#~ "Може да добавяте и премахвате ключове за идентификация през този прозорец. " -#~ "Ключът прави възможна проверката на цялостта на софтуера, който сваляте от " -#~ "интернет." +#~ "Може да добавяте и премахвате ключове за идентификация през този " +#~ "прозорец. Ключът прави възможна проверката на цялостта на софтуера, който " +#~ "сваляте от интернет." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, че " -#~ "сте получили ключа по сигурен канал и че можете да се доверите на " +#~ "Добавяне на нов ключов файл за доверените вериги от ключове. Уверете се, " +#~ "че сте получили ключа по сигурен канал и че можете да се доверите на " #~ "собственика. " #~ msgid "Add repository..." @@ -935,8 +1009,8 @@ msgstr "" #~ msgstr "Максимален размер в Мб:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Възвръщане на стандартните ключове идващи с дистрибуцията. Това няма да " #~ "промени потребителските инсталирани ключове." @@ -968,13 +1042,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Налични обновления</b></big>\n" #~ "\n" -#~ "Следните пакети могат да бъдат обновени. Може да ги обновите като натиснете " -#~ "бутона „Инсталиране“." +#~ "Следните пакети могат да бъдат обновени. Може да ги обновите като " +#~ "натиснете бутона „Инсталиране“." #~ msgid "Cancel downloading the changelog" #~ msgstr "Отказ на свалянето на дневника на промените" @@ -1063,9 +1137,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Версия %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Сваляне на промените..." - #~ msgid "There are no updated packages" #~ msgstr "Няма пакети за обновяване" @@ -1080,7 +1151,8 @@ msgstr "" #~ msgstr[1] "Избрахте всички %s пакета за обновяване, с общ размер %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Избрахте %s от %s пакет за обновяване, с размер %s" #~ msgstr[1] "Избрахте %s от %s пакета за обновяване, с общ размер %s" @@ -1088,11 +1160,11 @@ msgstr "" #~ msgstr "Обновленията се прилагат." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Може да стартирате само една програма за управление на пакетите. Затворете " -#~ "другата програма първо." +#~ "Може да стартирате само една програма за управление на пакетите. " +#~ "Затворете другата програма първо." #~ msgid "Updating package list..." #~ msgstr "Обновяване на списъка с пакетите..." @@ -1108,22 +1180,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще бъдат " -#~ "спрени поправките по сигурността и други критични обновления. Вижте " +#~ "Обновете до новата версия на Ubuntu Linux. За версията, която имате ще " +#~ "бъдат спрени поправките по сигурността и други критични обновления. Вижте " #~ "http://www.ubuntulinux.org за повече информация." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Има нова версия на Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Излезнала е нова версия с кодовото име „%s“. Вижте " -#~ "http://www.ubuntulinux.org за информация по обновяването." +#~ "Излезнала е нова версия с кодовото име „%s“. Вижте http://www.ubuntulinux." +#~ "org за информация по обновяването." #~ msgid "Never show this message again" #~ msgstr "Без да се показва това съобщение отново" @@ -1136,4 +1208,4 @@ msgstr "" #~ "connection." #~ msgstr "" #~ "Неуспех при сваляне на промените. Проверете дали има активна връзка към " -#~ "интернет."
\ No newline at end of file +#~ "интернет." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Breton <br@li.org>\n" @@ -17,38 +17,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -82,6 +81,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -92,33 +92,35 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -131,41 +133,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -173,18 +176,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -197,158 +201,183 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -356,6 +385,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -379,8 +409,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -392,38 +422,50 @@ msgid "Details" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -437,7 +479,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -456,52 +498,56 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 -msgid "Show details" +msgid "Release Notes" msgstr "" #: ../data/UpdateManager.glade.h:14 -msgid "Show progress of single files" +msgid "Show details" msgstr "" #: ../data/UpdateManager.glade.h:15 -msgid "Software Updates" +msgid "Show progress of single files" msgstr "" #: ../data/UpdateManager.glade.h:16 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" @@ -565,7 +611,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -595,11 +641,11 @@ msgid "<b>Comment:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -616,8 +662,8 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -647,9 +693,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -696,96 +740,114 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr ""
\ No newline at end of file +msgstr "" @@ -7,50 +7,49 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 19:43+0000\n" "Last-Translator: Texis <tomas@ciganek.cz>\n" "Language-Team: Czech <cs@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Po %s dnech" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importovat klíč" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Chyba při importování vybraného souboru" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný soubor nemusí obsahovat GPG klíč nebo může být porušen." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Vybraný klíč nemohl být odstraněn. Prosim nahlašte tento problém jako chybu" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -61,11 +60,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Prosím zadejte jméno disku" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" @@ -89,6 +88,7 @@ msgstr "Nemohu upgradovat požadované meta-balíky" msgid "A essential package would have to be removed" msgstr "Základní balík by musel být odstraněn" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat upgrade" @@ -101,11 +101,12 @@ msgstr "" "Při výpočtu upgradu nastal neřešitelný problém. Prosím oznamte to jako " "chybu. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -115,23 +116,24 @@ msgstr "" "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden " "seznam neověřených balíků." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -148,11 +150,12 @@ msgstr "" msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nenalezena žádná platná položka" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -160,11 +163,11 @@ msgstr "" "Během prozkoumávání vašich zdrojů nebyla nalezený žádná platná položka pro " "upgrade.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -172,11 +175,11 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -184,11 +187,11 @@ msgstr "" "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového " "připojení. Prosím zkontrolujte své připojení a zkuste to znovu." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -198,18 +201,20 @@ msgstr "" "Upgrade byl předčasně ukončen. Prosím uvolněte alespoň %s místa na disku. " "Vyprázdněte koš a odstraňte" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat upgrady" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Upgrade byl předčasně ukončen. Váš systém může být v nepoužitelném stavu. " "Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo Synaptic." @@ -226,15 +231,24 @@ msgstr "" "Upgrade byl předčasně ukončen. Prosím zkontrolujte si připojení k internetu " "nebo instalační médium a zkuste to znovu. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Odstranit zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -243,83 +257,99 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Prosím vložte '%s' do mechaniky '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Stahování bylo dokončeno" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Stahuji soubor %li z %li rychlostí %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s zbývá" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Stahuji soubor %li z %li neznámou rychlostí" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Stahuji soubor %li z %li rychlostí %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Instaluji aktualizace" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Nelze nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Upgrade byl předčasně ukončen. Prosím oznamte to jako chybu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Nastala fatální chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Prosím oznamte to jako chybu a do zprávy připojte soubory ~/dist-upgrade.log " "a ~/dist-upgrade-apt.log. Upgrade byl předčasně ukončen. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -327,7 +357,7 @@ msgstr[0] "%s balík bude odstraněn." msgstr[1] "%s balíky budou odstraněny." msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -335,7 +365,7 @@ msgstr[0] "%s nový balík bude nainstalován." msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -343,48 +373,49 @@ msgstr[0] "%s balík bude upgradován." msgstr[1] "%s balíky budou upgradovány." msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Bude staženo celkem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Žádné upgrady nebyly nalezeny." -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Váš systém byl již upgradován." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Odstranit %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Upgradovat %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Je třeba restartovat" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -393,6 +424,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -419,9 +451,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Spustit upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Upgraduje se na Ubuntu \"Dapper\" " "6.04</span>" @@ -435,38 +468,51 @@ msgid "Details" msgstr "Detaily" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Stahují a instalují se upgrady" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modifikují se programové kanály." -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Připravuje se upgrade" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Systém se restartuje" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminál" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Upgraduje se Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Obnovit" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Oznámit chybu" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Restartovat nyní" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Pokračovat v upgradu" @@ -483,8 +529,9 @@ msgstr "" "v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\"" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -507,30 +554,35 @@ msgid "Changes" msgstr "Změny" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Zkontrolovat dostupné aktualizace" +#, fuzzy +msgid "Chec_k" +msgstr "_Zkontrolovat" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Popis" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Poznámky k vydáni" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Zobrazit detaily" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Zobrazit průběh stahování jednotlivých souborů" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aktualizace softwaru" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -538,23 +590,23 @@ msgstr "" "Aktualizace softwaru může opravit chyby, eliminovat bezpečnostní rizika a " "poskytnout Vám nové možnosti." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Zkontrolovat" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Nezobrazovat příště tyto informace" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Na_instalovat Aktualizace" @@ -620,7 +672,8 @@ msgid "_Check for updates automatically:" msgstr "_Zkontrolovat aktualizace automaticky" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je." #: ../data/SoftwareProperties.glade.h:16 @@ -656,12 +709,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Komentář:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribuce:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komentář:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sekce:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribuce:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -677,16 +731,16 @@ msgstr "<b>Adresa:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Zadejt kompletní APT cestu ke zdroji, který chcete přidat</b></big>\n" "\n" -"APT cesta obsahuje typ, umístění a sekci zdroje, např. <i>\"deb " -"http://ftp.debian.org sarge main\"</i>." +"APT cesta obsahuje typ, umístění a sekci zdroje, např. <i>\"deb http://ftp." +"debian.org sarge main\"</i>." #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -713,11 +767,9 @@ msgid "Scanning CD-ROM" msgstr "Prohledávám CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Přidat _Zdroj" -msgstr[1] "Přidat _Zdroje" -msgstr[2] "" +msgstr "Přidat _Zdroj" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -767,97 +819,133 @@ msgstr "" msgid "The window size" msgstr "Velikost okna" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 Bezpečnostní Aktualizace" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 Aktualizace" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 Backports" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualizace" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálně podporováno" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Omezeno copyrightem" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Udržováno komunitou (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Bezpoečnostní Aktualizace" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Oficiálně podporované" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr "Žádný DFSG kompatibilní Software"
\ No newline at end of file +msgstr "Žádný DFSG kompatibilní Software" + +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Stahuji soubor %li z %li neznámou rychlostí" + +#~ msgid "Installing updates" +#~ msgstr "Instaluji aktualizace" + +#~ msgid "Check for available updates" +#~ msgstr "Zkontrolovat dostupné aktualizace" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sekce:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Oficiálně podporované" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-31 07:38+0000\n" "Last-Translator: Lennart Hansen <lahansen@gmail.com>\n" "Language-Team: Danish <da@li.org>\n" @@ -17,41 +17,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 -#, fuzzy +#: ../SoftwareProperties/SoftwareProperties.py:110 +#, fuzzy, python-format msgid "Every %s days" msgstr "Hver %s. dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Efter %s dag(e)" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importer nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Fejl under importering af den valgte fil" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Den valgte fil lader ikke til at være en GPG nøgle fil eller er korrupt" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapporter venligst denne fejl som en " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -62,11 +61,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Indtast venligst et navn for disken" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Indtast venligst en disk i drevet:" @@ -90,6 +89,7 @@ msgstr "Kan ikke opgradere krævet meta-pakke" msgid "A essential package would have to be removed" msgstr "En system kritisk pakke ville have blevet fjernet" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 #, fuzzy msgid "Could not calculate the upgrade" @@ -104,12 +104,13 @@ msgstr "" "Der er forkommet et uløseligt problem imens beregning af upgraderings tid. " "Raporter venligst denne fejl. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 #, fuzzy msgid "Error authenticating some packages" msgstr "Fejl ved validering af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 #, fuzzy msgid "" "It was not possible to authenticate some packages. This may be a transient " @@ -120,12 +121,12 @@ msgstr "" "Netværks problemer. Det anbefales du prøver igen senere. Se længere nede for " "en liste over pakker som ikke kunne valideres." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -134,12 +135,13 @@ msgstr "" "Det var umuligt at installere en pakke som var krævet. Venligst raporter " "denne hændelse som en fejl. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -152,41 +154,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Ikke nok frit disk plads" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -194,19 +197,20 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 #, fuzzy msgid "Could not install the upgrades" msgstr "Kan ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -219,158 +223,183 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -378,6 +407,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -401,8 +431,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -414,38 +444,50 @@ msgid "Details" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -459,7 +501,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -478,52 +520,56 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 -msgid "Show details" +msgid "Release Notes" msgstr "" #: ../data/UpdateManager.glade.h:14 -msgid "Show progress of single files" +msgid "Show details" msgstr "" #: ../data/UpdateManager.glade.h:15 -msgid "Software Updates" +msgid "Show progress of single files" msgstr "" #: ../data/UpdateManager.glade.h:16 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" @@ -587,7 +633,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -617,11 +663,11 @@ msgid "<b>Comment:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -638,8 +684,8 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -669,9 +715,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -718,96 +762,114 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr ""
\ No newline at end of file +msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 11:00+0000\n" "Last-Translator: Julian Turner <julian.turner@gmx.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -18,42 +18,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Alle %s Tage" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Nach %s Tagen" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -64,11 +63,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Geben Sie einen Namen für das Medium ein" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk" @@ -93,6 +92,7 @@ msgstr "Kann die benötigten Metapakete nicht aktualisieren" msgid "A essential package would have to be removed" msgstr "Ein wichtiges Paket müsste entfernt werden" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Konnte die Aktualisierung nicht ausrechnen" @@ -105,11 +105,12 @@ msgstr "" "Ein unlösbares Problem trat beim Ausrechnen der Aktualisierung auf. Bitte " "erstellen Sie hierfür einen Fehlerbericht. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Fehler beim Authentifizieren einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -119,12 +120,12 @@ msgstr "" "vorübergehenden Netzwerkproblemen liegen. Bitte probieren Sie es später noch " "einmal. Die unten stehenden Pakete konnten nicht authentifiziert werden:" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Kann ›%s‹ nicht installieren" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -132,11 +133,12 @@ msgstr "" "Ein notwendiges Paket konnte nicht installiert werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Kann kein Meta-Paket erraten" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -153,11 +155,12 @@ msgstr "" msgid "Reading cache" msgstr "Lese Speicher" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Kein gültiger Eintrag gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -165,11 +168,11 @@ msgstr "" "Beim Lesen ihrer Kanalliste konnte kein gültiger Eintrag für die " "Aktualisierung gefunden werden.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Ungültige Kanallisteninformationen" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -177,11 +180,11 @@ msgstr "" "Das Aktualisieren der Quelliste ergab eine ungültige Datei. Bitte erstellen " "Sie hierfür einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Fehler beim Aktualisieren" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -190,33 +193,36 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Nicht genug Platz auf der Festplatte verfügbar" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " "trash and remove temporary packages of former installations using 'sudo apt-" "get clean'." msgstr "" -"Die Aktualisierung wird jetzt abgebrochen. Bitte leeren Sie mindestens %s
\n" +"Die Aktualisierung wird jetzt abgebrochen. Bitte leeren Sie mindestens %s " +"\r\n" "Festplattenplatz. Leeren Sie ihren Mülleimer und entfernen Sie temporäre " "Pakete von vorherigen Installationen mit ›sudo apt-get clean‹." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Konnte die Aktualisierungen nicht installieren" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Die Aktualisierung wird jetzt abgebrochen. Bitte versuchen Sie, Ihr System " "mit ›sudo apt-get install -f‹ oder Synaptic zu reparieren." @@ -234,15 +240,24 @@ msgstr "" "Verbindung zum Internet oder Ihr Installationsmedium und versuchen Sie es " "noch einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -251,152 +266,170 @@ msgstr "" "Nachricht für mehr Informationen. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Paketmanager wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Aktualisiere Paketquellen" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Frage nach Bestätigung" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Suche nach veralteter Software" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Aktualisierung abgeschlossen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Bitte legen Sie das Medium ›%s‹ in das Laufwerk ›%s‹" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Herunterladen abgeschlossen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Lade Datei %li von %li mit %s/s herunter" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s verbleiben" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Lade Datei %li von %li mit unbekannter Geschwindigkeit herunter" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Lade Datei %li von %li mit %s/s herunter" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Aktualisierungen werden installiert" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Änderungen werden heruntergeladen..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Konnte ›%s‹ nicht installieren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" "Die Aktualisierung wird jetzt abgebrochen. Bitte erstellen Sie hierfür einen " "Fehlerbericht." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Bitte erstellen Sie einen Fehlerbericht und schließen Sie die Dateien ~/dist-" "upgrade.log und ~/dist-upgrade-apt.log in Ihren Bericht ein. Die " "Aktualisierung wird jetzt abgebrochen. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Insgesamt müssen %s heruntergeladen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Die Aktualisierung kann mehrere Stunden dauern und kann später nicht mehr " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Schließen Sie alle offenen Anwendungen und Dokumente, um Datenverlust zu " "vermeiden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Konnte keine Aktualisierungen finden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Ihr System wurde schon aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Entferne %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Installiere %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Aktualisiere %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Neustart erforderlich" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -406,6 +439,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -433,9 +467,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Aktualisierung starten?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Aktualisiere auf Ubuntu ›Dapper‹ " "6.06</span>" @@ -449,38 +484,51 @@ msgid "Details" msgstr "Details" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Lade Aktualisierungen herunter und installiere" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Verändere Software-Kanäle" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Bereite die Aktualisierung vor" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Starte das System neu" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Aktualisiere Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Neu laden" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Fehlerbericht erstellen" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Neu starten" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Aktualisierung fortsetzen" @@ -493,8 +541,9 @@ msgid "" msgstr "" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -517,30 +566,35 @@ msgid "Changes" msgstr "Änderungen" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Nach verfügbaren Aktualisierungen suchen" +#, fuzzy +msgid "Chec_k" +msgstr "_Prüfen" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Beschreibung" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notizen zur Veröffentlichung" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Details zeigen" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Fortschritt der einzelnen Dateien anzeigen" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software-Aktualisierungen" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -548,23 +602,23 @@ msgstr "" "Software-Aktualisierungen können Fehler korrigieren, Sicherheitslücken " "stopfen und Ihnen neue Funktionen anbieten." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Prüfen" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Diese Information in Zukunft _verstecken" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Installieren" @@ -636,7 +690,8 @@ msgid "_Check for updates automatically:" msgstr "_Automatisch auf Aktualisierungen überprüfen:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "" "Aktualisierungen _nur im Hintergrund herunterladen, aber nicht installieren" @@ -673,12 +728,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenten</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sparten:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -694,8 +750,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -732,10 +788,9 @@ msgid "Scanning CD-ROM" msgstr "CD wird eingelesen" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Kanal _hinzufügen" -msgstr[1] "Kanäle _hinzufügen" +msgstr "Kanal _hinzufügen" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -787,101 +842,137 @@ msgstr "" msgid "The window size" msgstr "Die Fenstergröße" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.06 ›Dapper Drake‹" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.06 Sicherheitsaktualisierungen" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.06 Aktualisierungen" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.06 Backports" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 ›Breezy Badger‹" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Aktualisierungen" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offiziell unterstützt" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Urheberrechtlich eingeschränkt" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft betreut (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 ›Sarge‹" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 ›Sarge‹ Sicherheitsaktualisierungen" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian ›Etch‹ (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian ›Sid‹ (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Offiziell unterstützt" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Lade Datei %li von %li mit unbekannter Geschwindigkeit herunter" + +#~ msgid "Installing updates" +#~ msgstr "Aktualisierungen werden installiert" + +#~ msgid "Check for available updates" +#~ msgstr "Nach verfügbaren Aktualisierungen suchen" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sparten:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Offiziell unterstützt" + #~ msgid "Reload the latest information about updates" #~ msgstr "Aktuelle Paketinformationen vom Server beziehen" @@ -899,13 +990,14 @@ msgstr "Nicht DFSG-kompatible Software" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Änderungen werden " -#~ "heruntergeladen</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">Änderungen werden heruntergeladen</" +#~ "span>\n" #~ "\n" #~ "Die Änderungen müssen vom zentralen Server abgerufen werden" #~ msgid "Show available updates and choose which to install" -#~ msgstr "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen" +#~ msgstr "" +#~ "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen" #, fuzzy #~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" @@ -936,16 +1028,14 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Verfügbare Aktualisierungen</b></big>\n" #~ "\n" -#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann " -#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenten</b>" +#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung " +#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen " +#~ "werden." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -974,12 +1064,12 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen Schlüsselbund. " -#~ "Stellen Sie sicher, dass der Schlüssel über eine sichere Verbindung bezogen " -#~ "wurde und dass der Besitzer vertrauenswürdig ist. " +#~ "Hinzufügen einer neuen Schlüsseldatei zum vertrauenswürdigen " +#~ "Schlüsselbund. Stellen Sie sicher, dass der Schlüssel über eine sichere " +#~ "Verbindung bezogen wurde und dass der Besitzer vertrauenswürdig ist. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "_Temporäre Paketdateien automatisch löschen" @@ -1001,11 +1091,12 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution ausgeliefert " -#~ "wurden. Vom Benutzer installierte Schlüssel werden dadurch nicht geändert." +#~ "Zurücksetzen der Vorgabeschlüssel, welche mit der Distribution " +#~ "ausgeliefert wurden. Vom Benutzer installierte Schlüssel werden dadurch " +#~ "nicht geändert." #~ msgid "Set _maximum size for the package cache" #~ msgstr "_Begrenzen der Größe des Paketzwischenspeichers" @@ -1030,8 +1121,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" #~ "Dies bedeutet, dass einige Abhängigkeiten der installierten Pakete nicht " -#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur Behebung " -#~ "des Problems." +#~ "aufgelöst sind. Verwenden Sie bitte »Synaptic« oder »apt-get« zur " +#~ "Behebung des Problems." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Es ist nicht möglich, alle Pakete zu aktualisieren." @@ -1039,12 +1130,13 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete weitere " -#~ "Aktionen, wie das Installieren oder Entfernen von Paketen, notwendig sind. " -#~ "Verwenden Sie bitte die »Intelligente Aktualisierung« von Synaptic oder »apt-" -#~ "get dist-upgrade« zur Behebung des Problems." +#~ "Dies bedeutet, dass neben der momentanen Aktualisierung der Pakete " +#~ "weitere Aktionen, wie das Installieren oder Entfernen von Paketen, " +#~ "notwendig sind. Verwenden Sie bitte die »Intelligente Aktualisierung« von " +#~ "Synaptic oder »apt-get dist-upgrade« zur Behebung des Problems." #~ msgid "The following packages are not upgraded: " #~ msgstr "Die folgenden Pakete wurden nicht aktualisiert: " @@ -1064,15 +1156,12 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Änderungen werden heruntergeladen..." - #~ msgid "The updates are being applied." #~ msgstr "Die Aktualisierungen werden ausgeführt." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit " #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung." @@ -1094,20 +1183,20 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Verwenden Sie bitte eine aktuellere Version von Ubuntu-Linux. Für die " #~ "momentan laufende Version werden keine Sicherheits- und andere kritische " -#~ "Aktualisierungen mehr bereitgestellt. Informationen zur Systemaktualisierung " -#~ "finden Sie unter http://www.ubuntulinux.org." +#~ "Aktualisierungen mehr bereitgestellt. Informationen zur " +#~ "Systemaktualisierung finden Sie unter http://www.ubuntulinux.org." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Eine neue Version von Ubuntu ist verfügbar!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Eine neue Version mit dem Codenamen »%s« ist verfügbar. Informationen zur " #~ "Aktualisierung des Systems erhalten Sie unter http://www.ubuntulinux.org." @@ -1117,8 +1206,8 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Es kann immer nur eine Anwendung zur Paketverwaltung zur gleichen Zeit " #~ "ausgeführt werden. Bitte beenden Sie zuerst die andere Anwendung." @@ -1127,7 +1216,8 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgstr "Initialisierung und Abrufen der Aktualisierungsliste..." #~ msgid "You need to be root to run this program" -#~ msgstr "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen." +#~ msgstr "" +#~ "Sie benötigen Administrationsrechte, um diese Anwendung auszuführen." #~ msgid "Edit software sources and settings" #~ msgstr "Bearbeiten der Software-Quellen und Einstellungen" @@ -1165,14 +1255,15 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" #~ msgstr "" -#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image <cdimage@ubuntu.com>" +#~ "Automatischer Signaturschlüssel für das Ubuntu-CD-Image <cdimage@ubuntu." +#~ "com>" #~ msgid "Repositories changed" #~ msgstr "Geänderte Repositories" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1186,10 +1277,11 @@ msgstr "Nicht DFSG-kompatible Software" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Verfügbare Aktualisierungen</b></big>\n" #~ "\n" -#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung kann " -#~ "durch einen Klick auf die Schaltfläche »Installieren« vorgenommen werden."
\ No newline at end of file +#~ "Für folgende Pakete sind neue Versionen verfügbar. Die Aktualisierung " +#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen " +#~ "werden." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 07:09+0000\n" "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n" "Language-Team: Greek <team@gnome.gr>\n" @@ -16,42 +16,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Κάθε %s ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Μετά από %s ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Εισαγωγή κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να " "είναι κατεστραμμένο." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Αφάλμα απομάκρυνσης του κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως " "σφάλμα." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -62,11 +61,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" @@ -91,6 +90,7 @@ msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετ msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" @@ -103,11 +103,12 @@ msgstr "" "Συνέβηκε ένα ανεπίλυτο πρόβλημα κατά τον υπολογισμό της αναβάθμισης. " "Παρακαλώ αναφέρετε το ως σφάλμα. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -117,12 +118,12 @@ msgstr "" "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -130,11 +131,12 @@ msgstr "" "Δεν ήταν δυνατή η αναβάθμιση του απαιτούμενου πακέτου. Παρακαλώ αναφέρετε το " "ως σφάλμα. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -152,11 +154,12 @@ msgstr "" msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Δεν βρέθηκε έγκυρη καταχώριση" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -164,11 +167,11 @@ msgstr "" "Κατά τον έλεγχο των πληροφοριών του repository δεν βρέθηκαν έγκυρες " "καταχωρίσεις αναβάθμισης.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -176,11 +179,11 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -188,11 +191,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -203,18 +206,20 @@ msgstr "" "στο δίσκο. Αδειάστε τα απορρίμματα σας και αφαιρέστε διάφορα προσωρινά " "πακέτα από προηγούμενες εγκαταστάσεις με την εντολή 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Παρακαλώ χρησιμοποιήστε την εντολή 'sudo apt-get install -f' ή το Synaptic " @@ -232,15 +237,24 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -249,150 +263,167 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Παρακαλώ εισάγετε τον δίσκο '%s' στον οδηγό '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Η λήψη ολοκληρώθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Λήψη αρχείου %li από %li με %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s απομένουν" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Λήψη αρχείου %li από %li με %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Εγκατάσταση ενημερώσεων" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Η αναβάθμιση θα τερματιστεί τώρα. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα και επισυνάψτε τα αρχεία ~/dist-upgrade.log " "και ~/dist-upgrade-apt.log στην αναφορά σας. Η αναβάθμιση τώρα θα " "τερματιστεί. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Η αναβάθμιση μπορεί να διαρκέσει αρκετέςς ώρες και δεν είναι δυνατή η " "ακύρωση της αργότερα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Δεν βρέθηκαν αναβαθμίσεις" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Απομάκρυνση %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Απαιτείται επανεκκίνηση" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -402,6 +433,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -429,12 +461,13 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu \"Dapper\" 6.04</" +"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -445,38 +478,51 @@ msgid "Details" msgstr "Λεπτομέρειες" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Λήψη και εγκατάσταση των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Τροποποίηση των καναλιών λογισμικού" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Προετοιμασία της αναβάθμισης" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Γίνεται επανεκκίνηση του συστήματος" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Τερματικό" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Αναβάθμιση Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Ανα_νέωση" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "Ανα_φορά σφάλματος" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "Επανε_κκίνηση τώρα" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Συνέχεια αναβάθμισης" @@ -494,8 +540,9 @@ msgstr "" "συστήματος\" -> \"Ιδιότητες λογισμικού\"." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -518,30 +565,35 @@ msgid "Changes" msgstr "Αλλαγές" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" +#, fuzzy +msgid "Chec_k" +msgstr "Ελε_γχος" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Περιγραφή" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Εμφάνιση λεπτομερειών" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Αναβαθμίσεις λογισμικού" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -549,23 +601,23 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "Ελε_γχος" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Ε_γκατάσταση ενημερώσεων" @@ -632,7 +684,8 @@ msgid "_Check for updates automatically:" msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν" #: ../data/SoftwareProperties.glade.h:16 @@ -669,12 +722,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Σχόλιο:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Διανομή:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Σχόλιο:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Ενότητες:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Διανομή:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -690,8 +744,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -727,10 +781,9 @@ msgid "Scanning CD-ROM" msgstr "Σάρωση CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Προσ_θήκη καναλιού" -msgstr[1] "Προσ_θήκη καναλιών" +msgstr "Προσ_θήκη καναλιού" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -781,101 +834,137 @@ msgstr "" msgid "The window size" msgstr "Το μέγεθος του παραθύρου" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ενημερώσεις ασφαλείας Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ενημερώσεις Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 Backports" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Αναβαθμίσεις Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Με επίσημη υποστήριξη" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Περιορισμένα πνευματικά δικαιώματα" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Debian 3.1 \"Sarge\"" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Oficially supported" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" + +#~ msgid "Installing updates" +#~ msgstr "Εγκατάσταση ενημερώσεων" + +#~ msgid "Check for available updates" +#~ msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Ενότητες:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Oficially supported" + #~ msgid "Software Channel" #~ msgstr "Κανάλι λογισμικού" @@ -902,24 +991,25 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "Το αρχείο '%s' δεν περιέχει έγκυρα κανάλια λογισμικού." #~ msgid "" -#~ "The upgrade is finished now. A reboot is required to now, do you want to do " -#~ "this now?" +#~ "The upgrade is finished now. A reboot is required to now, do you want to " +#~ "do this now?" #~ msgstr "" #~ "Η αναβάθμιση ολοκληρώθηκε. Απαιτείται επανεκκίνηση, θέλετε να γίνει τώρα;" #~ msgid "" -#~ "<b><big>You need to manually reload the latest information about " -#~ "updates</big></b>\n" +#~ "<b><big>You need to manually reload the latest information about updates</" +#~ "big></b>\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" -#~ "<b><big>Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για τις " -#~ "ενημερώσεις</big></b>\n" +#~ "<b><big>Πρέπει να ανανεώσετε χειροκίνητα τις τελευταίες πληροφορίες για " +#~ "τις ενημερώσεις</big></b>\n" #~ "\n" -#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για ενημερώσεις. " -#~ "Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> " -#~ "\"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"." +#~ "Το σύστημα σας δεν έχει ρυθμιστεί να κάνει αυτόματο έλεγχο για " +#~ "ενημερώσεις. Μπορείτε να ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού " +#~ "\"Σύστημα\" -> \"Διαχείριση συστήματος\" -> \"Ιδιότητες λογισμικού\"." #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" @@ -947,4 +1037,4 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" #~ msgid "Ubuntu 5.04 Security Updates" -#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04"
\ No newline at end of file +#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" diff --git a/po/en_CA.po b/po/en_CA.po index fbb28363..040b0940 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -17,39 +17,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -57,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -83,6 +82,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -95,23 +95,24 @@ msgid "" msgstr "" "The key you selected could not be removed. Please report this as a bug. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -119,11 +120,12 @@ msgid "" msgstr "" "The key you selected could not be removed. Please report this as a bug. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -136,42 +138,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -179,18 +182,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -203,164 +207,189 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Installing updates..." +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -368,6 +397,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -391,8 +421,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -405,39 +435,52 @@ msgid "Details" msgstr "<b>Details</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 #, fuzzy +msgid "_Replace" +msgstr "Reload" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +#, fuzzy msgid "_Resume Upgrade" msgstr "Upgrade finished" @@ -451,7 +494,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -470,53 +513,57 @@ msgid "Changes" msgstr "Changes" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software Updates" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Upgrade finished" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Install" @@ -590,7 +637,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -621,12 +668,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -644,14 +692,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Enter the complete APT line of the repository that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add</" +"b></big>\n" "\n" "The APT line contains the type, location and content of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " @@ -683,9 +731,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -733,112 +779,140 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:91 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:108 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Restricted copyright" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Officially supported" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installing updates..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Reload the package information from the server." @@ -887,16 +961,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Components</b>" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -916,16 +987,16 @@ msgstr "" #~ msgstr "" #~ "<big><b>Authentication keys</b></big>\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #~ msgid "A_uthentication" #~ msgstr "A_uthentication" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -950,11 +1021,11 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user-installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user-installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -987,11 +1058,13 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgid "The following packages are not upgraded: " #~ msgstr "The following packages are not upgraded: " @@ -1009,18 +1082,15 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Downloading changes..." - #~ msgid "The updates are being applied." #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -1039,33 +1109,33 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "There is a new release of Ubuntu available!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initializing and getting list of updates..." @@ -1113,14 +1183,14 @@ msgstr "" #~ msgstr "Repositories changed" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1128,10 +1198,10 @@ msgstr "" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button."
\ No newline at end of file +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." diff --git a/po/en_GB.po b/po/en_GB.po index 0d4de9e7..2e1e9c89 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n" "Language-Team: \n" @@ -16,39 +16,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -82,6 +81,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -94,23 +94,24 @@ msgid "" msgstr "" "The key you selected could not be removed. Please report this as a bug. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -118,11 +119,12 @@ msgid "" msgstr "" "The key you selected could not be removed. Please report this as a bug. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -135,42 +137,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -178,18 +181,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -202,165 +206,190 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Installing updates..." +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -368,6 +397,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -391,8 +421,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -405,38 +435,51 @@ msgid "Details" msgstr "<b>Details</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Reload" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -450,7 +493,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -469,52 +512,56 @@ msgid "Changes" msgstr "Changes" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software Updates" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." @@ -590,7 +637,7 @@ msgid "_Check for updates automatically:" msgstr "Installing updates..." #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -621,12 +668,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -644,14 +692,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Enter the complete APT line of the repository that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the repository that you want to add</" +"b></big>\n" "\n" "The APT line contains the type, location and content of a repository, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " @@ -683,9 +731,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -733,112 +779,140 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 Updates" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Restricted copyright" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Officially supported" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installing updates..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Officially supported" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Reload the package information from the server." @@ -876,9 +950,6 @@ msgstr "" #~ msgid "<b>Sources</b>" #~ msgstr "<b>Software Sources</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Components</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -897,13 +968,13 @@ msgstr "" #~ msgstr "" #~ "<big><b>Authentication keys</b></big>\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -935,11 +1006,11 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -969,13 +1040,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "Cancel downloading the changelog" #~ msgstr "Cancel downloading the changelog" @@ -1064,9 +1135,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Downloading changes..." - #~ msgid "There are no updated packages" #~ msgstr "There are no updated packages" @@ -1081,7 +1149,8 @@ msgstr "" #~ msgstr[1] "You have selected all %s updated packages, total size %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "You have selected %s out of %s updated package, size %s" #~ msgstr[1] "You have selected %s out of %s updated packages, total size %s" @@ -1089,11 +1158,11 @@ msgstr "" #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -1109,22 +1178,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "There is a new release of Ubuntu available!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" @@ -1152,14 +1221,14 @@ msgstr "" #~ msgstr "Repositories changed" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1177,11 +1246,13 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgid "The following packages are not upgraded: " -#~ msgstr "The following packages are not upgraded: "
\ No newline at end of file +#~ msgstr "The following packages are not upgraded: " @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 11:17+0000\n" "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n" "Language-Team: Spanish <traductores@gnome.org>\n" @@ -19,42 +19,41 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Cada %s días" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Después de %s días" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importar clave" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Hubo un error al importar el fichero seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté " "corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " "como un fallo." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -65,11 +64,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Por favor, introduzca un nombre para el disco" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" @@ -94,6 +93,7 @@ msgstr "No se han podido actualizar los meta-paquetes requeridos" msgid "A essential package would have to be removed" msgstr "Se ha tenido que desinstalar un paquete esencial" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" @@ -106,11 +106,12 @@ msgstr "" "Ha ocurrido un problema imposible de resolver cuando se calculaba la " "actualización. Por favor, informe de ésto como un error: " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -120,12 +121,12 @@ msgstr "" "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una " "lista de los paquetes no autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -133,11 +134,12 @@ msgstr "" "No ha sido posible instalar un paquete requerido. Por favor, informe de ésto " "como un fallo. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "No se ha podido suponer el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -155,11 +157,12 @@ msgstr "" msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "No se ha encontrado una entrada válida" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -167,11 +170,11 @@ msgstr "" "Cuando se exploraba la información de su repositorio, se encontró una " "entrada no válida para la actualización.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -179,11 +182,11 @@ msgstr "" "La actualización de la información del repositorio generó un archivo " "incorrecto. Por favor, informe de ésto como un error." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -192,11 +195,11 @@ msgstr "" "tipo de problema en la red, por lo que le recomendamos que compruebe su " "conexión de red y vuelva a intentarlo." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -207,18 +210,20 @@ msgstr "" "espacio en disco. Vacíe su papelera y elimine los paquetes temporales de " "instalaciones anteriores usando «sudo apt-get clean» en una terminal." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "La actualización se cancelará ahora. Su sistema puede haber quedado en un " "estado no usable. Por favor, intente con «sudo apt-get install -f» en una " @@ -236,15 +241,24 @@ msgstr "" "La actualización se cancelará ahora. Por favor, compruebe su conexión a " "internet (o su soporte de instalación) y vuelva a intentarlo. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -253,151 +267,169 @@ msgstr "" "inferior para más información. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor, inserte «%s» en la unidad «%s»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "La descarga se ha completado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Descargando archivo %li de %li a %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s restantes" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Descargando archivo %li de %li a velocidad desconocida" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Descargando archivo %li de %li a %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Instalando actualizaciones" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Descargando informe de cambios..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" "La actualización se cancelará ahora. Por favor, avise de esto como un fallo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Por favor, informe de esto como un fallo e incluya los ficheros ~/dist-" "upgrade.log y ~/dist-upgrade-apt.log en su informe. La actualización se " "cancelará ahora. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Se va a desinstalar %s paquete." msgstr[1] "Se van a desinstalar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Se va a instalar %s paquete nuevo." msgstr[1] "Se van a instalar %s paquetes nuevos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Se va a actualizar %s paquete." msgstr[1] "Se van a actualizar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Debe descargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "La actualización puede durar varias horas, y no puede cancelarse después en " "ningún momento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "No se ha podido encontrar ninguna actualización" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Su sistema ya ha sido actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Desinstalar %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Se requiere reiniciar el equipo" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -407,6 +439,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -426,20 +459,20 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "<b><big>Restart the system to complete the upgrade</big></b>" -msgstr "" -"<b><big>Reinicie el sistema para completar la actualización</big></b>" +msgstr "<b><big>Reinicie el sistema para completar la actualización</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>¿Comenzar la actualización?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu «Dapper» " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu «Dapper» 6.04</" +"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -450,38 +483,51 @@ msgid "Details" msgstr "Detalles" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Descargando e instalando las actualizaciones" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modificando los canales de software" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Preparando la actualización" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Reiniciando el sistema" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Actualizando Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Recargar" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Informar de un error" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Reiniciar ahora" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Continuar actualización" @@ -499,8 +545,9 @@ msgstr "" "software»." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -523,30 +570,35 @@ msgid "Changes" msgstr "Cambios" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Comprobar las actualizaciones disponibles" +#, fuzzy +msgid "Chec_k" +msgstr "_Comprobar" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descripción" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de publicación" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Mostrar detalles" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostrar el progreso de cada archivo individua" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizaciones de software" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -554,23 +606,23 @@ msgstr "" "Las actualizaciones de software pueden corregir errores, eliminar fallos de " "seguridad, y proporcionar nuevas funcionalidades." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ctualizar" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Comprobar" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta información en el futuro" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar actualizaciones" @@ -637,7 +689,8 @@ msgid "_Check for updates automatically:" msgstr "_Comprobar actualizaciones automáticamente:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Descargar actualizaciones en segundo plano, pero no instalarlas" #: ../data/SoftwareProperties.glade.h:16 @@ -660,8 +713,8 @@ msgstr "" "<b><big>La información de los canales está obsoleta</big></b>\n" "\n" "Debe recargar la información de los canales para poder instalar software y " -"actualizaciones a partir de los canales recientemente añadidos o cambiados. " -"\n" +"actualizaciones a partir de los canales recientemente añadidos o " +"cambiados. \n" "\n" "Necesita una conexión a internet para continuar." @@ -674,12 +727,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribución:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componentes</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Secciones:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribución:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -695,14 +749,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Introduzca la línea completa de APT del canal que quiere " -"añadir</b></big>\n" +"<big><b>Introduzca la línea completa de APT del canal que quiere añadir</b></" +"big>\n" "\n" "La línea de APT contiene el tipo, ubicación y contenido de un repositorio, " "por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -732,10 +786,9 @@ msgid "Scanning CD-ROM" msgstr "Analizando el CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Añadir un canal" -msgstr[1] "_Añadir canales" +msgstr "_Añadir un canal" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -787,101 +840,137 @@ msgstr "" msgid "The window size" msgstr "El tamaño de la ventana" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 «Dapper Drake»" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Actualizaciones de Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "«Backports» de Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Actualizaciones de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "«Backports» de Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Soportado oficialmente" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Copyright restringido" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizaciones de seguridad de Debian 3.1 «Sarge»" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian «Etch» (pruebas)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian «Sid» (inestable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Soportado oficialmente" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible con la DFSG con dependencias no libres" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Descargando archivo %li de %li a velocidad desconocida" + +#~ msgid "Installing updates" +#~ msgstr "Instalando actualizaciones" + +#~ msgid "Check for available updates" +#~ msgstr "Comprobar las actualizaciones disponibles" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Secciones:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Soportado oficialmente" + #~ msgid "Reload the latest information about updates" #~ msgstr "Recargar la última información sobre actualizaciones" @@ -894,7 +983,8 @@ msgstr "Software no compatible con la DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</" +#~ "span>\n" #~ "\n" #~ "Se necesita descargar los cambios del servidor central" @@ -930,16 +1020,13 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Actualizaciones disponibles</b></big>\n" #~ "\n" -#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. " -#~ "Puede actualizarlos usando el botón Instalar." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Componentes</b>" +#~ "El gestor de actualizaciones encontró los siguientes paquetes " +#~ "actualizables. Puede actualizarlos usando el botón Instalar." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repositorio</b>" @@ -959,19 +1046,20 @@ msgstr "Software no compatible con la DFSG" #~ msgstr "" #~ "<big><b>Claves de autenticación</b></big>\n" #~ "\n" -#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una clave " -#~ "hace posible verificar la integridad del software que descarga." +#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una " +#~ "clave hace posible verificar la integridad del software que descarga." #~ msgid "A_uthentication" #~ msgstr "A_utenticación" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Añadir un nuevo archivo de clave al anillo de confianza. Asegúrese de que " -#~ "obtuvo la clave a través de un canal seguro y que confía en el propietario. " +#~ "obtuvo la clave a través de un canal seguro y que confía en el " +#~ "propietario. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Limpiar _temporalmente los archivos de paquetes" @@ -993,8 +1081,8 @@ msgstr "Software no compatible con la DFSG" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Recupera las claves entregadas originalmente con la distribución. Esto no " #~ "cambia las claves instaladas por el usuario." @@ -1022,8 +1110,8 @@ msgstr "Software no compatible con la DFSG" #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" #~ "Ésto significa que no se satisfacen algunas dependencias de los paquetes " -#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-get " -#~ "dist-upgrade\" para arreglar la situación." +#~ "instalados. Utilice la \"Actualización inteligente\" de synaptic o \"apt-" +#~ "get dist-upgrade\" para arreglar la situación." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "No es posible actualizar todos los paquetes." @@ -1031,12 +1119,13 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Ésto significa que además de la actualización de los paquetes será necesaria " -#~ "alguna acción adicional (como instalar o quitar paquetes). Utilice la " -#~ "\"Actualización inteligente\" de synaptic o \"apt-get dist-upgrade\" para " -#~ "arreglar la situación." +#~ "Ésto significa que además de la actualización de los paquetes será " +#~ "necesaria alguna acción adicional (como instalar o quitar paquetes). " +#~ "Utilice la \"Actualización inteligente\" de synaptic o \"apt-get dist-" +#~ "upgrade\" para arreglar la situación." #~ msgid "The following packages are not upgraded: " #~ msgstr "Los siguientes paquetes no están actualizados: " @@ -1050,24 +1139,21 @@ msgstr "Software no compatible con la DFSG" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Hubo un fallo al descargar el informe de cambios. Compruebe si tiene alguna " -#~ "conexión activa." +#~ "Hubo un fallo al descargar el informe de cambios. Compruebe si tiene " +#~ "alguna conexión activa." #~ msgid "Version %s: \n" #~ msgstr "Versión %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Descargando informe de cambios..." - #~ msgid "The updates are being applied." #~ msgstr "Se están aplicando las actualizaciones." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. " -#~ "Cierre la otra aplicación primero." +#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo " +#~ "tiempo. Cierre la otra aplicación primero." #~ msgid "Updating package list..." #~ msgstr "Actualizando lista de paquetes..." @@ -1086,35 +1172,34 @@ msgstr "Software no compatible con la DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está usando " -#~ "no obtendrá más actualizaciones de seguridad ni otras actualizaciones " -#~ "críticas. Visite http://www.ubuntulinux.org para información acerca de cómo " -#~ "actualizar." +#~ "Actualícese a una nueva versión de Ubuntu Linux. La versión que está " +#~ "usando no obtendrá más actualizaciones de seguridad ni otras " +#~ "actualizaciones críticas. Visite http://www.ubuntulinux.org para " +#~ "información acerca de cómo actualizar." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Hay una nueva versión de Ubuntu disponible" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Está disponible una nueva versión con el nombre '%s'. Visite " -#~ "http://www.ubuntulinux.org/ para recibir instrucciones acerca de cómo " -#~ "actualizar." +#~ "Está disponible una nueva versión con el nombre '%s'. Visite http://www." +#~ "ubuntulinux.org/ para recibir instrucciones acerca de cómo actualizar." #~ msgid "Never show this message again" #~ msgstr "No mostrar más este mensaje" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo tiempo. " -#~ "Cierre la otra aplicación primero." +#~ "Solo puede ejecutar una aplicación de gestión de paquetes al mismo " +#~ "tiempo. Cierre la otra aplicación primero." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Inicializando y obteniendo lista de actualizaciones..." @@ -1165,8 +1250,8 @@ msgstr "Software no compatible con la DFSG" #~ msgstr "Hay cambios en los repositorios" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1180,10 +1265,10 @@ msgstr "Software no compatible con la DFSG" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Actualizaciones disponibles</b></big>\n" #~ "\n" -#~ "El gestor de actualizaciones encontró los siguientes paquetes actualizables. " -#~ "Puede actualizarlos usando el botón Instalar."
\ No newline at end of file +#~ "El gestor de actualizaciones encontró los siguientes paquetes " +#~ "actualizables. Puede actualizarlos usando el botón Instalar." @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-27 10:27+0000\n" "Last-Translator: Marko Kervinen <marko_kervinen@hotmail.com>\n" "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n" @@ -16,41 +16,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "%s päivän välein" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "%s päivän jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Tuo avain" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on " "vahingoittunut." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -61,11 +60,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Syötä nimi levylle" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" @@ -90,6 +89,7 @@ msgstr "Ei voida päivittää tarvittavia metapaketteja" msgid "A essential package would have to be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" @@ -102,11 +102,12 @@ msgstr "" "Tehtäessä päivitykseen liittyviä tarkistuksia tapahtui virhe jota ei voitu " "korjata. Ilmoita tästä virheraportilla. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Tapahtui virhe varmennettaessa joitain paketteja" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -116,23 +117,24 @@ msgstr "" "ongelma. Voit yrittää myöhemmin uudelleen. Alla on luettelo " "varmentamattomista paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheilmoitus. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -150,11 +152,12 @@ msgstr "" msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Ei löytynyt kelpoa ohjelmavarastomerkintää" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -162,11 +165,11 @@ msgstr "" "Luettaessa varastotietoja ei löydetty kelvollisia ohjelmavarastoja " "päivittämistä varten.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -174,11 +177,11 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -186,11 +189,11 @@ msgstr "" "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -201,18 +204,20 @@ msgstr "" "poista aiempien asennusten väliaikaiset pakettitiedostot käyttämällä " "komentoa 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Kokeile komentoa 'sudo apt-get install -f' tai Synaptic-ohjelmaa " @@ -230,15 +235,23 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "_Ohita tämä kohta" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "_Poista" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -247,147 +260,165 @@ msgstr "" "lisätietoja. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Laita '%s' asemaan '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Lataus on valmis" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Ladataan tiedostoa %li/%li nopeudella %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s jäljellä" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Ladataan tiedostoa %li/%li tuntemattomalla nopeudella" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Ladataan tiedostoa %li/%li nopeudella %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Asennetaan päivityksiä" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Ladataan muutoksia..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Ei voituu asentaa: '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Päivitys keskeytyy. Ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Vakava virhe tapahtui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot ~/dist-" -"upgrade.log ja ~/dist-upgrade-apt.log. Päivitys keskeytyy nyt. " +"Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot ~/dist-upgrade." +"log ja ~/dist-upgrade-apt.log. Päivitys keskeytyy nyt. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paketti poistetaan" msgstr[1] "%s pakettia poistetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s uusi paketti asennetaan" msgstr[1] "%s uutta pakettia asennetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paketti päivitetään" msgstr[1] "%s pakettia päivitetään" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Ladattavaa yhteensä %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Päivityksiä ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Järjestelmäsi on jo päivitetty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Poista %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Uudellenkäynnistys vaaditaan" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -396,6 +427,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -416,17 +448,18 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "<b><big>Restart the system to complete the upgrade</big></b>" msgstr "" -"<b><big>Käynnistä järjestelmä uudelleen saattaaksesi päivityksen " -"loppuun</big></b>" +"<b><big>Käynnistä järjestelmä uudelleen saattaaksesi päivityksen loppuun</" +"big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Aloita päivitys?</big/</b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Päivitetään seuraavaksi: Ubuntu " "\"Dapper\" 6.04</span>" @@ -440,38 +473,51 @@ msgid "Details" msgstr "Yksityiskohdat" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Ladataan ja asennetaan päivityksiä" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Muutetaan ohjelmakanavia" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Valmistellaan päivitystä" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Käynnistetään järjestelmä uudelleen" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Pääte" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Päivitetään Ubuntua" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Lataa uudelleen" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Tee virheraportti" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Uudelleenkäynnistä nyt" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Jatka päivitystä" @@ -484,12 +530,13 @@ msgid "" msgstr "" "<b><big>Sinun täytyy tarkistaa päivitykset itse</big></b>\n" "Sinun järjestelmäsi ei tutki päivityksiä automaattisesti. Voit muuttaa näitä " -"asetuksia kohdasta \"Järjestelmä\" -> \"Ylläpito\" -> \"Ohjelmien " -"asetukset\"." +"asetuksia kohdasta \"Järjestelmä\" -> \"Ylläpito\" -> \"Ohjelmien asetukset" +"\"." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -512,30 +559,35 @@ msgid "Changes" msgstr "Muutokset" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Tarkista saatavilla olevat päivitykset" +#, fuzzy +msgid "Chec_k" +msgstr "_Check" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Kuvaus" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Näytä yksityiskohdat" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Näytä edistyminen yksittäisten tiedostojen osalta" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -543,23 +595,23 @@ msgstr "" "Ohjelmapäivitykset voivat korjata virheitä ja turva-aukkoja tai tarjota " "uusia ominaisuuksia." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Check" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "P_iilota tämä tieto jatkossa" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Asenna päivitykset" @@ -626,7 +678,7 @@ msgid "_Check for updates automatically:" msgstr "_Tarkista päivitykset automaattisesti:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä" #: ../data/SoftwareProperties.glade.h:16 @@ -662,12 +714,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Kommentti:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Jakelu:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponentit</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Osastot:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Jakelu:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -683,16 +736,16 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Kirjoita haluamasi kanavan koko APT-rivi</b></big>\n" "\n" -"APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi " -"<i>\"deb http://ftp.debian.org sarge main\"</i>." +"APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi <i>" +"\"deb http://ftp.debian.org sarge main\"</i>." #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -719,10 +772,9 @@ msgid "Scanning CD-ROM" msgstr "Luetaan CD-levyä" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Lisää kanava" -msgstr[1] "_Lisää kanavia" +msgstr "_Lisää kanava" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -773,105 +825,144 @@ msgstr "" msgid "The window size" msgstr "Ikkunan koko" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 turvallisuuspäivitykset" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 päivitykset" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 takaisinsovitukset" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 turvallisuuspäivitykset" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 päivitykset" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 takaisinsovitukset" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Virallisesti tuettu" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Rajoitettu tekijänoikeus" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" turvallisuuspäivitykset" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testattava)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (epävakaa)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Virallisesti tuettu" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "DFSG-yhteensopivat ohjelmat joilla riippuvuuksia epävapaisiin ohjelmiin" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" -#~ msgid "_Download updates in the background, but do not install them" +#~ msgid "Remove obsolete Packages?" +#~ msgstr "Poista vanhentuneet paketit?" + +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Ladataan tiedostoa %li/%li tuntemattomalla nopeudella" + +#~ msgid "Installing updates" +#~ msgstr "Asennetaan päivityksiä" + +#~ msgid "Check for available updates" +#~ msgstr "Tarkista saatavilla olevat päivitykset" + +#~ msgid "_Download updates in the backgound, but do not install them" #~ msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä" +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Osastot:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Virallisesti tuettu" + #~ msgid "Software Channel" #~ msgstr "Ohjelmistokanava" @@ -904,21 +995,13 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "The file '%s' does not contain any valid software channels." #~ msgstr "Tiedosto '%s' ei sisällä sopivia ohjelmistokanavia." -#~ msgid "Remove obsolete packages?" -#~ msgstr "Poista vanhentuneet paketit?" - -#~ msgid "_Skip This Step" -#~ msgstr "_Ohita tämä kohta" - -#~ msgid "_Remove" -#~ msgstr "_Poista" - #~ msgid "" -#~ "<b><big>You need to manually reload the latest information about " -#~ "updates</big></b>\n" +#~ "<b><big>You need to manually reload the latest information about updates</" +#~ "big></b>\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" #~ "<b><big>Sinun pitää ladata päivitystiedot uudelleen käsin</big></b>\n" #~ "\n" @@ -943,9 +1026,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" #~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponentit</b>" - #~ msgid "<b>Software Sources</b>" #~ msgstr "<b>Ohjelmalähteet</b>" @@ -976,19 +1056,20 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "" #~ "<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n" #~ "\n" -#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi " -#~ "<i>\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät " +#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi <i>" +#~ "\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät " #~ "dokumentaatiosta." #~ msgid "A_uthentication" #~ msgstr "Varmenn_us" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit " -#~ "avaimen luotettavaa kanavaa pitkin, ja että luotat sen omistajaan. " +#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että " +#~ "vastaanotit avaimen luotettavaa kanavaa pitkin, ja että luotat sen " +#~ "omistajaan. " #~ msgid "Automatically check for software _updates." #~ msgstr "Tarkista ohjelma_päivitykset automaattisesti." @@ -1012,8 +1093,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Maksimikoko megatavuissa:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Palauta jakelun mukana toimitetut oletusavaimet. Tämä ei muuta tai poista " #~ "itse asennettuja avaimia." @@ -1042,8 +1123,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Saatavilla olevat päivitykset</b></big>\n" #~ "\n" @@ -1056,17 +1137,17 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Reload the package information from the server. \n" #~ "\n" -#~ "If you have a permanent internet connection this is done automatically. If " -#~ "you are behind an internet connection that needs to be started by hand (e.g. " -#~ "a modem) you should use this button so that update-manager knows about new " -#~ "updates." +#~ "If you have a permanent internet connection this is done automatically. " +#~ "If you are behind an internet connection that needs to be started by hand " +#~ "(e.g. a modem) you should use this button so that update-manager knows " +#~ "about new updates." #~ msgstr "" #~ "Lataa pakettitiedot palvelimelta uudelleen. \n" #~ "\n" #~ "Jos sinulla on kiinteä Internet-yhteys, tämä tehdään automaattisesti. Jos " #~ "olet käsin muodostettavan Internet-yhteyden (esim. modeemi) takana, sinun " -#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon uusista " -#~ "päivityksistä." +#~ "täytyy käyttää tätä valintaa jotta päivitystenhallinta saisi tiedon " +#~ "uusista päivityksistä." #~ msgid "Binary" #~ msgstr "Binääri" @@ -1104,8 +1185,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Varastot muuttuneet" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1120,8 +1201,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. Käytä " -#~ "\"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman." +#~ "Jotkut asennettujen pakettien riippuvuuksista ovat siis täyttämättä. " +#~ "Käytä \"Synaptic\"- tai \"apt-get\"-ohjelmia korjataksesi ongelman." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Kaikkia paketteja ei voida päivittää." @@ -1129,12 +1210,13 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita toimenpiteitä " -#~ "(kuten pakettien asentamista tai poistamista). Käytä Synaptic-ohjelman " -#~ "\"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade\"-komentoa " -#~ "korjataksesi ongelman." +#~ "Pakettien päivittämisen lisäksi tarvitaan siis joitain muita " +#~ "toimenpiteitä (kuten pakettien asentamista tai poistamista). Käytä " +#~ "Synaptic-ohjelman \"Smart Upgrade\"-toimintoa tai \"apt-get dist-upgrade" +#~ "\"-komentoa korjataksesi ongelman." #~ msgid "The following packages are not upgraded: " #~ msgstr "Seuraavia paketteja ei päivitetä: " @@ -1145,20 +1227,18 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "Muutosten lataus epäonnistui. Tarkista, että Internet-yhteys toimii." +#~ msgstr "" +#~ "Muutosten lataus epäonnistui. Tarkista, että Internet-yhteys toimii." #~ msgid "Version %s: \n" #~ msgstr "Versio: %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Ladataan muutoksia..." - #~ msgid "The updates are being applied." #~ msgstr "Päivityksiä asennetaan." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Voit hallita paketteja vain yhdellä ohjelmalla kerrallaan. Sulje toinen " #~ "ohjelma ensin." @@ -1180,19 +1260,20 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei enää " -#~ "ole tulossa turvallisuuspäivityksiä tai muita kriittisiä päivityksiä. " -#~ "Tietoja päivittämisestä löydät sivulta http://www.ubuntulinux.org." +#~ "Päivitä uudempaan versioon Ubuntu Linuxista. Käyttämällesi versiolle ei " +#~ "enää ole tulossa turvallisuuspäivityksiä tai muita kriittisiä " +#~ "päivityksiä. Tietoja päivittämisestä löydät sivulta http://www." +#~ "ubuntulinux.org." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntusta on uusi julkaisu saatavilla!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Uusi julkaisu nimeltään '%s' on saatavilla. Päivitysohjeet löydät " #~ "osoitteesta http://www.ubuntulinux.org/." @@ -1204,11 +1285,11 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "Ei saatu haluttua lukitusta" #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-get " -#~ "tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin." +#~ "Tämä tarkoittaa yleensä, että toinen pakettienhallintaohjelma (kuten apt-" +#~ "get tai aptitude) on jo käynnissä. Sulje tämä toinen ohjelma ensin." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Alustetaan ja ladataan luetteloa päivityksistä..." @@ -1237,15 +1318,16 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että vastaanotit " -#~ "avaimen luotettua kanavaa pitkin ja että luotat avaimen omistajaan. " +#~ "Lisää uusi avaintiedosto luotettuihin avaimiin. Varmista, että " +#~ "vastaanotit avaimen luotettua kanavaa pitkin ja että luotat avaimen " +#~ "omistajaan. " #~ msgid "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia käyttäjän " -#~ "asentamiin avaimiin." +#~ "Palauta jakelun mukana toimitetut avaimet. Tämä ei tee muutoksia " +#~ "käyttäjän asentamiin avaimiin." #~ msgid "Ubuntu Update Manager" #~ msgstr "Ubuntun päivitysten hallinta" @@ -1253,8 +1335,8 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Saatavilla olevat päivitykset</b></big>\n" #~ "\n" @@ -1265,4 +1347,4 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgstr "0" #~ msgid "Non-free" -#~ msgstr "Ei-vapaa"
\ No newline at end of file +#~ msgstr "Ei-vapaa" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-04-02 06:12+0000\n" "Last-Translator: Alexandre Patenaude <alexandre.patenaude@gmail.com>\n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -17,42 +17,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Tous les %s jours" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Après %s jours" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importer la clé" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erreur lors du chargement du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas une clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionné ne peut être supprimée. Veuillez envoyer " "ceci comme étant un bogue." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -63,11 +62,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Veuillez saisir un nom pour le disque" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur:" @@ -92,6 +91,7 @@ msgstr "Les meta-paquets désirés n'ont pu être mis à jour" msgid "A essential package would have to be removed" msgstr "Un paquet essentiel devrait être enlevé" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" @@ -104,11 +104,12 @@ msgstr "" "Un problème insoluble est apparu lors du calcul de la mise à jour. Merci de " "signaler ce bogue. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -118,12 +119,12 @@ msgstr "" "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. " "Vous trouverez ci-dessous une liste des paquets non authentifiés." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -131,11 +132,12 @@ msgstr "" "Il a été impossible d'installer un paquet pourtant requis. Merci de signaler " "ce bogue. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -153,11 +155,12 @@ msgstr "" msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Aucune entrée valide trouvée" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -165,11 +168,11 @@ msgstr "" "Durant la vérification des informations du dépôt, aucune entrée valide pour " "la mise à jour n'a été trouvée.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Information sur le dépôt invalide" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -177,11 +180,11 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. " "Veuillez rapporter ceci en tant que bogue." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -190,11 +193,11 @@ msgstr "" "un problème quelconque du réseau. Veuillez vérifier votre connexion au " "réseau et réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -205,18 +208,20 @@ msgstr "" "disque. Videz votre corbeille et supprimez les paquets temporaires des " "installations précédentes en utilisant 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "La mise à jour a été abandonnée maintenant. Votre système pourrait être dans " "un état instable. Veuillez essayer \"sudo apt-get install -f\" ou utilisez " @@ -234,15 +239,24 @@ msgstr "" "La mise a jour a été abandonnée maintenant. Veuillez vérifier votre " "connexion Internet ou votre médium d'installation, et réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -251,149 +265,167 @@ msgstr "" "ci-dessous pour plus d'informations. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Recherche de logiciels désuets" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Veuillez insérer « %s » dans le lecteur « %s »" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Le téléchargement est terminé" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Téléchargement du fichier %li sur %li à %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s restants" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Téléchargement du fichier %li sur %li à %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Installation des mises à jour" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Téléchargement des changements..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Impossible d'installer \"%s\"" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "La mise à jour vient d'échouer. Merci de signaler ce bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -"Veuillez signaler ce bogue et joindre les fichiers ~/dist-upgrade.log et " -"~/dist-upgrade-apt.log à votre rapport. La mise à jour s'annule maintenant. " +"Veuillez signaler ce bogue et joindre les fichiers ~/dist-upgrade.log et ~/" +"dist-upgrade-apt.log à votre rapport. La mise à jour s'annule maintenant. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Le paquet %s va être supprimé." msgstr[1] "Les paquets %s vont être supprimés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Le paquet %s va être installé." msgstr[1] "Les paquets %s vont être installés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Le paquet %s va être mis à jour." msgstr[1] "Les paquets %s vont être mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Vous devez télécharger un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "La mise à niveau peut prendre plusieurs heures et ne peut pas être annulée " "plus tard." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications ou documents ouverts." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Aucune mise à jour n'est disponible" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Votre système a déjà été mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Supprimer %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Mettre à jour %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Redémarrage de l'ordinateur requis" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -403,6 +435,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -430,9 +463,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Démarrer la mise à jour ?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu \"Dapper\" " "6.06</span>" @@ -446,38 +480,51 @@ msgid "Details" msgstr "Détails" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Téléchargement et installation des mises à jour" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modification des canaux du logiciel" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Préparation de la mise à jour" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Redémarrage du système" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Mettre à jour Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "A_ctualiser" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Rapporter un bogue" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Redémarrer Maintenant" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Reprendre la mise à jour" @@ -488,16 +535,17 @@ msgid "" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -"<b><big>Vous devez vérifier manuellement la disponibilité de mises à " -"jour</big></b>\n" +"<b><big>Vous devez vérifier manuellement la disponibilité de mises à jour</" +"big></b>\n" "\n" "Votre système ne contrôle pas les mises à jour automatiquement. Vous pouvez " "configurer ce comportement dans \"Système\" -> \"Administration\" -> " "\"Propriété des programmes\"" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -520,30 +568,35 @@ msgid "Changes" msgstr "Changements" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Rechercher les mises à jour disponibles" +#, fuzzy +msgid "Chec_k" +msgstr "_Vérifier" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notes de publication" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Montrer les détails" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Afficher l'avancement des fichiers individuels" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -551,23 +604,23 @@ msgstr "" "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " "problèmes de sécurité et apporter de nouvelles fonctionalités." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Mettre à _jour" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Vérifier" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Masquer ces informations à l'avenir" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installer les mises à jour" @@ -635,7 +688,8 @@ msgid "_Check for updates automatically:" msgstr "_Rechercher des mises à jour automatiquement:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "" "_Télécharger des mises à jour automatiquement, mais ne pas les installer" @@ -674,12 +728,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Commentaire :</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution :</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Composants</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sections :</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution :</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -695,14 +750,14 @@ msgstr "<b>URI :</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez " -"ajouter</b></big>\n" +"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez ajouter</" +"b></big>\n" "\n" "La ligne APT contient le type, la source et le contenu d'un dépôt, par " "exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une " @@ -733,10 +788,9 @@ msgid "Scanning CD-ROM" msgstr "Examen du cédérom" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Ajouter un canal" -msgstr[1] "_Ajouter des canaux" +msgstr "_Ajouter un canal" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -788,103 +842,139 @@ msgstr "" msgid "The window size" msgstr "La taille de la fenêtre" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Mises à jour de sécurité pour Ubuntu 6.06" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Mises à jour pour Ubuntu 6.06" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Mises à jour \"backports\" pour Ubuntu 6.06" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Mises à jour de sécurité d' Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Mises à jour d'Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Backports d'Ubuntu 6.06" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportés officiellement" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Copyright restreint" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Non-libre (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Mises à jour de sécurité de Debian 3.1 \"Sarge\"" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Supporté officiellement" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Logiciel libre (selon les lignes directrices du projet Debian) dont les " "dépendances ne sont pas libre" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" + +#~ msgid "Installing updates" +#~ msgstr "Installation des mises à jour" + +#~ msgid "Check for available updates" +#~ msgstr "Rechercher les mises à jour disponibles" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections :</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Supporté officiellement" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Recharger les informations des paquets depuis le serveur" @@ -898,7 +988,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Téléchargement des changements</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">Téléchargement des changements</" +#~ "span>\n" #~ "\n" #~ "Il est nécessaire de récupérer les changement du serveur central" @@ -934,16 +1025,13 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Mises à jour disponibles</b></big>\n" #~ "\n" -#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour " -#~ "en utilisant le bouton Installer." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Composants</b>" +#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à " +#~ "jour en utilisant le bouton Installer." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Dépôt</b>" @@ -964,20 +1052,20 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ "<big><b>Clés d'authentification</b></big>\n" #~ "\n" #~ "Vous pouvez ajouter ou enlever des clés d'authentification grâce à cette " -#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité des " -#~ "logiciels que vous téléchargez." +#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité " +#~ "des logiciels que vous téléchargez." #~ msgid "A_uthentication" #~ msgstr "A_uthentification" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez vérifier " -#~ "que vous avez obtenu la clé à travers un canal sécurisé et que vous faites " -#~ "confiance à son possesseur. " +#~ "Ajouter une nouvelle clé au trousseau digne de confiance. Veuillez " +#~ "vérifier que vous avez obtenu la clé à travers un canal sécurisé et que " +#~ "vous faites confiance à son possesseur. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Nettoyer automatiquement les fichiers _temporaires des paquets" @@ -999,8 +1087,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Restaurer les clés par défaut fournies avec la distribution. Les clés " #~ "installées par l'utilisateur ne seront pas modifiées." @@ -1037,19 +1125,21 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." -#~ msgstr "" -#~ "Cela signifie que d'autres actions (comme l'installation ou la suppression " -#~ "de paquets) seront requises après la mise à jour. Veuillez utiliser Synaptic " -#~ "« Mise à jour intelligente » ou « apt-get dist-upgrade » pour régler la " +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " #~ "situation." +#~ msgstr "" +#~ "Cela signifie que d'autres actions (comme l'installation ou la " +#~ "suppression de paquets) seront requises après la mise à jour. Veuillez " +#~ "utiliser Synaptic « Mise à jour intelligente » ou « apt-get dist-" +#~ "upgrade » pour régler la situation." #~ msgid "The following packages are not upgraded: " #~ msgstr "Les paquets suivants ne seront pas mis à jour : " #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" -#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à jour." +#~ "Changements non trouvés, le serveur n'a peut-être pas encore été mis à " +#~ "jour." #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " @@ -1061,15 +1151,12 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "Version %s: \n" #~ msgstr "Version %s : \n" -#~ msgid "Downloading changes..." -#~ msgstr "Téléchargement des changements..." - #~ msgid "The updates are being applied." #~ msgstr "Les mises à jour ont été appliquées." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. " #~ "Veuillez tout d'abord fermer cette autre application." @@ -1091,20 +1178,20 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Veuillez mettre à jour vers une version plus récente d'Ubuntu Linux. La " -#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres correctifs " -#~ "de sécurité ou mises à jour critiques. Veuillez voir " -#~ "http://www.ubuntulinux.org pour les informations de mise à jour." +#~ "version que vous êtes entrain d'utiliser ne recevra pas d'autres " +#~ "correctifs de sécurité ou mises à jour critiques. Veuillez voir http://" +#~ "www.ubuntulinux.org pour les informations de mise à jour." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Il y a une nouvelle version d'Ubuntu disponible !" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Une nouvelle version avec le nom de code « %s » est disponible. Veuillez " #~ "voir http://www.ubuntulinux.org pour les informations de mise à jour." @@ -1114,8 +1201,8 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Vous ne pouvez exécuter qu'un seul gestionnaire de paquets à la fois. " #~ "Veuillez tout d'abord fermer cette autre application." @@ -1168,28 +1255,28 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgstr "Les dépôts ont été modifiés" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Les informations des dépôts ont changés. Une sauvegarde de votre " -#~ "sources.list à été copiée à %s.save. \n" +#~ "Les informations des dépôts ont changés. Une sauvegarde de votre sources." +#~ "list à été copiée à %s.save. \n" #~ " \n" -#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que vos " -#~ "changements soient effectifs. Voulez-vous le faire maintenant ?" +#~ "Vous devez recharger la liste des paquets depuis les serveurs pour que " +#~ "vos changements soient effectifs. Voulez-vous le faire maintenant ?" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Mises à jour disponibles</b></big>\n" #~ "\n" -#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à jour " -#~ "en utilisant le bouton Installer." +#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à " +#~ "jour en utilisant le bouton Installer." #~ msgid "0" -#~ msgstr "0"
\ No newline at end of file +#~ msgstr "0" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" "Language-Team: Galego\n" @@ -17,42 +17,41 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que " "esté corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +59,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -86,6 +85,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -99,23 +99,24 @@ msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -124,11 +125,12 @@ msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -141,42 +143,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -184,18 +187,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -208,164 +212,189 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Instalando actualizacións..." +msgid "Applying changes" +msgstr "Descargando cambios..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -373,6 +402,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -396,8 +426,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -410,38 +440,51 @@ msgid "Details" msgstr "<b>Detalles</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Recargar" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -455,7 +498,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -474,53 +517,56 @@ msgid "Changes" msgstr "Cambios" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "Comprobando se hai actualizacións..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrición" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizacións de software" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." @@ -592,7 +638,7 @@ msgid "_Check for updates automatically:" msgstr "Comprobar se hai actualizacións cada" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -623,12 +669,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribución:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Compoñentes</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Seccións:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribución:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -646,14 +693,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Introduza a liña completa do repositorio APT que quere " -"engadir</b></big>\n" +"<big><b>Introduza a liña completa do repositorio APT que quere engadir</b></" +"big>\n" "\n" "A liña de APT contén o tipo, ubicación e contido dun repositorio, por " "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha " @@ -685,9 +732,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -735,112 +780,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Actualizacións de Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Actualizacións de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Actualizacións de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizacións de seguranza de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Actualizacións de Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Soporte oficial" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Dereito de copia restrinxido" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizacións de seguranza de Debian estable" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian de probas" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Inestable)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Soporte oficial" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Instalando actualizacións..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "Comprobando se hai actualizacións..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Seccións:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Soporte oficial" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Recargar a información do paquete desde o servidor." @@ -853,7 +930,8 @@ msgstr "" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</" +#~ "span>\n" #~ "\n" #~ "Necesítanse descargar os trocos do servidor actual" @@ -880,9 +958,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "día(s)" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Compoñentes</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repositorio</b>" @@ -900,12 +975,12 @@ msgstr "" #~ msgstr "" #~ "<big><b>Claves de autenticación</b></big>\n" #~ "\n" -#~ "Pode engadir e quitar claves de autenticación desde este diálogo. Unha clave " -#~ "fai posible verificar a integridade do software que descarga." +#~ "Pode engadir e quitar claves de autenticación desde este diálogo. Unha " +#~ "clave fai posible verificar a integridade do software que descarga." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Engadir un novo ficheiro de clave de anel de confianza. Asegúrese de que " #~ "obtivo a clave a través dun canle seguro e que confía no propietario. " @@ -935,8 +1010,8 @@ msgstr "" #~ msgstr "Tamaño máximo en MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Recupera as claves entregadas orixinalmente coa distribución. Isto non " #~ "cambiará as claves instaladas polo usuario." @@ -968,13 +1043,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Actualizacións dispoñibles</b></big>\n" #~ "\n" -#~ "O xestor de actualizacións atopou os seguintes paquetes actualizables. Pode " -#~ "actualizalos usando o botón Instalar." +#~ "O xestor de actualizacións atopou os seguintes paquetes actualizables. " +#~ "Pode actualizalos usando o botón Instalar." #~ msgid "Cancel downloading the changelog" #~ msgstr "Cancelar a descarga do informe de cambios" @@ -1030,7 +1105,8 @@ msgstr "" #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" #~ msgstr "" -#~ "Clave de asinado automático das imaxes de CD de Ubuntu <cdimage@ubuntu.com>" +#~ "Clave de asinado automático das imaxes de CD de Ubuntu <cdimage@ubuntu." +#~ "com>" #~ msgid "Choose a key-file" #~ msgstr "Escolla un ficheiro de clave" @@ -1047,9 +1123,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Versión %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Descargando cambios..." - #~ msgid "There are no updated packages" #~ msgstr "Non hai paquetes actualizados" @@ -1064,7 +1137,8 @@ msgstr "" #~ msgstr[1] "Seleccionou %s paquetes actualizables, de tamaño total %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Seleccionou %s paquete actualizable de %s, de tamaño %s" #~ msgstr[1] "Seleccionou %s paquetes actualizables de %s, de tamaño total %s" @@ -1072,11 +1146,11 @@ msgstr "" #~ msgstr "Estanse aplicando as actualizacións." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Só pode executar unha aplicación de xestión de paquetes ao mesmo tempo. Por " -#~ "favor peche a outra aplicación primeiro." +#~ "Só pode executar unha aplicación de xestión de paquetes ao mesmo tempo. " +#~ "Por favor peche a outra aplicación primeiro." #~ msgid "Updating package list..." #~ msgstr "Actualizando a lista de paquetes..." @@ -1092,35 +1166,35 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Por favor actualícese a unha versión de Ubuntu linux. A versión que está " -#~ "usando non obterá máis actualizacións de seguranza nin outras actualizacións " -#~ "críticas. Visite http://www.ubuntulinux.org para máis información acerca de " -#~ "como actualizar." +#~ "usando non obterá máis actualizacións de seguranza nin outras " +#~ "actualizacións críticas. Visite http://www.ubuntulinux.org para máis " +#~ "información acerca de como actualizar." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Hai unha versión nova de Ubuntu dispoñible!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Está dispoñible unha nova versión co nome '%s'. Por favor visite " -#~ "http://www.ubuntulinux.org para recibir instruccións de como actualizar." +#~ "Está dispoñible unha nova versión co nome '%s'. Por favor visite http://" +#~ "www.ubuntulinux.org para recibir instruccións de como actualizar." #~ msgid "Never show this message again" #~ msgstr "Non amosar máis esta mensaxe" #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" -#~ "Non se atopou o informe de cambios, pode que o servidor non esté actualizado " -#~ "aínda." +#~ "Non se atopou o informe de cambios, pode que o servidor non esté " +#~ "actualizado aínda." #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Fallou ao descargar o informe de cambios. Comprobe se ten algunha conexión " -#~ "activa."
\ No newline at end of file +#~ "Fallou ao descargar o informe de cambios. Comprobe se ten algunha " +#~ "conexión activa." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-25 18:19+0000\n" "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -20,38 +20,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "כל %s ימים" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "אחרי %s ימים" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -62,11 +61,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -88,6 +87,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -99,34 +99,36 @@ msgid "" "this as a bug. " msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -139,31 +141,32 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -171,11 +174,11 @@ msgstr "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -183,18 +186,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -207,160 +211,185 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "ההורדה הושלמה" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s נותרו" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "מתקין עדכונים..." +msgid "Applying changes" +msgstr "מוריד שינויים..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -368,6 +397,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -391,8 +421,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -405,38 +435,51 @@ msgid "Details" msgstr "<b>פרטים</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "טען מחדש" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -450,7 +493,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -469,53 +512,56 @@ msgid "Changes" msgstr "שינויים" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "בודק אם יש עדכונים..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "תיאור" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "עדכוני תוכנה" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." @@ -587,7 +633,7 @@ msgid "_Check for updates automatically:" msgstr "בדוק לעדכונים כל" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -618,12 +664,13 @@ msgid "<b>Comment:</b>" msgstr "<b>הערות:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>הפצה:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>רכיבים</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>מחלקה:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>הפצה:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -641,16 +688,16 @@ msgstr "<b>כתובת:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n" "\n" -"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb " -"http://ftp.debian.org sarge main\"</i>\n" +"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb http://ftp.debian." +"org sarge main\"</i>\n" "אפשר למצוא הסבר מפורט על זה בתיעוד." #: ../data/SoftwarePropertiesDialogs.glade.h:18 @@ -679,9 +726,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -729,112 +774,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "עדכונים - אובונטו 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "עדכוני אבטחה - אובונטו 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "עדכונים - אובונטו 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "נתמך רשמית" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "זכויות יוצרים מגבילות" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "דביאן 3.1 \"סארג'\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "עדכוני אבטחה - דביאן יציב" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "דביאן בדיקה" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "דביאן לא ארה\"ב (לא יציב)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "נתמך רשמית" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "מתקין עדכונים..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "בודק אם יש עדכונים..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>מחלקה:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "נתמך רשמית" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "טען מחדש את המידע על החבילה מהשרת" @@ -874,9 +951,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ימים" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>רכיבים</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>מאגר</b>" @@ -898,8 +972,8 @@ msgstr "" #~ "תקינות התוכנה שאתה מוריד." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "הוסף קובץ מפתח חדש לרשימת המפתחות שאתה בוטח בהם. אנא וודא שאתה שקיבלת את " #~ "המפתח בדרך מאובטחת ושאתה בוטח בבעלים. " @@ -929,8 +1003,8 @@ msgstr "" #~ msgstr "גודל מקסימלי במגה-בתים:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "שחזר את מפתחות ברירת המחדל שבאו עם ההפצה. זה לא ישנה את המפתחות המותקנים." @@ -961,8 +1035,8 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>עדכונים זמינים</b></big>\n" #~ "\n" @@ -1047,9 +1121,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "גרסה %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "מוריד שינויים..." - #~ msgid "There are no updated packages" #~ msgstr "אין חבילות מעודכנות" @@ -1064,7 +1135,8 @@ msgstr "" #~ msgstr[1] "בחרת את כל %s החבילות המעודכנות, בגודל כולל של %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "בחרת %s מתוך חבילה מעודכנת אחת, בגודל של %s" #~ msgstr[1] "בחרת %s מתוך %s חבילות מעודכנות, בגודל כולל של %s" @@ -1072,8 +1144,8 @@ msgstr "" #~ msgstr "העדכונים מתבצעים כרגע." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "אפשר להריץ רק מנהל חבילות אחד באותו זמן. אנא סגור מנהלי חבילות אחרים קודם." @@ -1091,19 +1163,19 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת עדכוני " -#~ "אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org בשביל " -#~ "מידע אודות שדרוג." +#~ "אנא עדכן לגרסת אובונטו לינוקס חדשה. הגרסה שאתה משתמש בה כבר לא מקבלת " +#~ "עדכוני אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org " +#~ "בשביל מידע אודות שדרוג." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "גרסה חדשה של אובונטו זמינה!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "הפצה חדשה עם שם קוד '%s' זמינה. אנא ראה http://www.ubuntulinux.org/ בשביל " #~ "הוראות שדרוג." @@ -1117,4 +1189,4 @@ msgstr "" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד."
\ No newline at end of file +#~ msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 12:21+0000\n" "Last-Translator: Tamás Nepusz <nepusz@mit.bme.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -17,39 +17,38 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "%s naponta" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "%s nap után" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Kulcs importálása" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +59,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Kérem, adja meg a lemez nevét" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" @@ -89,6 +88,7 @@ msgstr "A szükséges meta-csomagok nem frissíthetőek" msgid "A essential package would have to be removed" msgstr "Egy alapvető csomag eltávolításra kerülne" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" @@ -101,11 +101,12 @@ msgstr "" "A frissítés megtervezése közben feloldhatatlan probléma lépett fel. Kérem, " "jelentse ezt hibaként. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -115,22 +116,23 @@ msgstr "" "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi " "lista a hitelesíthetetlen csomagokat tartalmazza." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -148,11 +150,12 @@ msgstr "" msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nincs érvényes bejegyzés" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -160,11 +163,11 @@ msgstr "" "A csomagtároló információk olvasása közben nem találtam a frissítésre " "vonatkozó érvényes bejegyzést.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -172,11 +175,11 @@ msgstr "" "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, " "jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -184,11 +187,11 @@ msgstr "" "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. " "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -199,18 +202,20 @@ msgstr "" "merevlemezen. Ürítse ki a kukát és távolítsa el az előző telepítésekből " "származó átmeneti csomagokat a 'sudo apt-get clean' parancs használatával." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetőek" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan " "állapotban van. Az esetleges hibákat a 'sudo apt-get install -f' vagy a " @@ -228,15 +233,24 @@ msgstr "" "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy " "a telepítő médiát és próbálja újra. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Eltávolítsam az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -245,147 +259,165 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Helyezze be a következő médiát: '%s', ebbe a meghajtóba: '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "A letöltés befejeződött" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s van hátra" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: ismeretlen" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Frissítések telepítése" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Módosítások letöltése..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "A frissítés félbeszakadt. Kérem, jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Kérem, jelentse ezt hibaként és a hibajelentéshez mellékelje a ~/dist-" "upgrade.log és ~/dist-upgrade-apt.log fájlokat. A frissítés most " "félbeszakad. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s új csomag kerül telepítésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s csomag frissítve lesz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Összes letöltendő adatmennyiség: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet " "megszakítani." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Nincs elérhető frissítés" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Az Ön rendszere már frissítve lett." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s eltávolítása</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Újraindítás szükséges" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -395,6 +427,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -421,9 +454,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Megkezdi a frissítést?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu \"Dapper\" 6.04 " "változatra</span>" @@ -437,38 +471,51 @@ msgid "Details" msgstr "<b>Részletek</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Frissítések letöltése és telepítése" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Szoftvercsatornák módosítása" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Frissítés előkészítése" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "A rendszer újraindítása" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminál" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Az Ubuntu frissítése" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "F_rissítés" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Hibabejelentés" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "Újrain_dítás most" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "Frissítés _folytatása" @@ -479,16 +526,17 @@ msgid "" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -"<b><big>Önnek kézzel kell megkeresnie a rendelkezésre álló " -"frissítéseket</big></b>\n" +"<b><big>Önnek kézzel kell megkeresnie a rendelkezésre álló frissítéseket</" +"big></b>\n" "\n" "Az Ön rendszere jelenleg nem keresi automatikusan a frissítéseket. Ezt a " "viselkedést a \"Rendszer\" -> \"Adminisztráció\" -> \"Szoftverbeállítások\" " "menüpont alatt változtathatja meg." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -511,30 +559,35 @@ msgid "Changes" msgstr "Módosítások" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Rendelkezésre álló frissítések ellenőrzése" +#, fuzzy +msgid "Chec_k" +msgstr "_Ellenőrzés" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Leírás" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Részletek megjelenítése" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Egyes fájlok állapotának mutatása" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Szoftverfrissítések" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -542,23 +595,23 @@ msgstr "" "A szoftverfrissítések kijavítják az időközben felfedezett programhibákat, " "sebezhetőségeket és új szolgáltatásokat is biztosítanak Önnek." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Ellenőrzés" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_A jövőben ne mutassa ezt az információt" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Telepítés" @@ -625,7 +678,8 @@ msgid "_Check for updates automatically:" msgstr "_Frissítések automatikus keresése:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "Frissítések _letöltése a háttérben, telepítés nélkül" #: ../data/SoftwareProperties.glade.h:16 @@ -661,12 +715,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Megjegyzés:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Disztribúció:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Összetevők</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Csoportok:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Disztribúció:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -682,16 +737,16 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Adja meg a felvenni kívánt tároló teljes APT sorát</b></big>\n" "\n" -"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például " -"<i>\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes " +"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például <i>" +"\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes " "leírását a dokumentációban találhatja meg." #: ../data/SoftwarePropertiesDialogs.glade.h:18 @@ -720,8 +775,7 @@ msgstr "CD-ROM átvizsgálása" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Csatorna hozzá_adása" +msgstr "Csatorna hozzá_adása" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -773,105 +827,137 @@ msgstr "" msgid "The window size" msgstr "Az ablak mérete" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 biztonsági frissítések" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 frissítések" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 visszaportolt csomagok" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 biztonsági frissítések" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 frissítések" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 visszaportolt csomagok" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Hivatalosan támogatott" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Szerzői jogi korlátozás alatt" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" biztonsági frissítések" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (tesztelés alatt)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instabil)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Hivatalosan támogatott" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Fájlok letöltése (%li, összesen: %li), sebesség: ismeretlen" + +#~ msgid "Installing updates" +#~ msgstr "Frissítések telepítése" + +#~ msgid "Check for available updates" +#~ msgstr "Rendelkezésre álló frissítések ellenőrzése" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Csoportok:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Hivatalosan támogatott" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról." @@ -921,17 +1007,14 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Elérhető frissítések</b></big>\n" #~ "\n" #~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével " #~ "frissítheti őket." -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Összetevők</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Tároló</b>" @@ -959,11 +1042,12 @@ msgstr "Nem DFSG-kompatibilis szoftver" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Új kulcsfájl hozzáadása a megbízható kulcstartóhoz. Győződjön meg, hogy a " -#~ "kulcsot biztonságos csatornán keresztül kapta és megbízik a tulajdonosban. " +#~ "kulcsot biztonságos csatornán keresztül kapta és megbízik a " +#~ "tulajdonosban. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Átmeneti csomagfájlok automatikus _törlése" @@ -985,11 +1069,11 @@ msgstr "Nem DFSG-kompatibilis szoftver" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "A disztribúcióval szállított alapértelmezett kulcsok visszaállítása. Ez nem " -#~ "változtatja meg a felhasználó által telepített kulcsokat." +#~ "A disztribúcióval szállított alapértelmezett kulcsok visszaállítása. Ez " +#~ "nem változtatja meg a felhasználó által telepített kulcsokat." #~ msgid "Set _maximum size for the package cache" #~ msgstr "A csomaggyorsítótár legnagyobb _méretének beállítása" @@ -1023,11 +1107,12 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Ez azt jelenti, hogy a csomagok frissítése mellett néhány további művelet is " -#~ "szükséges (például csomagok telepítése vagy törlése). Kérem használja a " -#~ "Synaptic \"Intelligens frissítés\" lehetőségét, vagy az \"apt-get dist-" +#~ "Ez azt jelenti, hogy a csomagok frissítése mellett néhány további művelet " +#~ "is szükséges (például csomagok telepítése vagy törlése). Kérem használja " +#~ "a Synaptic \"Intelligens frissítés\" lehetőségét, vagy az \"apt-get dist-" #~ "upgrade\" parancsot a probléma megoldására." #~ msgid "The following packages are not upgraded: " @@ -1041,24 +1126,21 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Nem sikerült a módosításokat letölteni. Kérem ellenőrizze, hogy aktív-e az " -#~ "internetkapcsolata." +#~ "Nem sikerült a módosításokat letölteni. Kérem ellenőrizze, hogy aktív-e " +#~ "az internetkapcsolata." #~ msgid "Version %s: \n" #~ msgstr "%s verzió: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Módosítások letöltése..." - #~ msgid "The updates are being applied." #~ msgstr "A frissítések alkalmazása folyamatban." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb zárja " -#~ "be a másik alkalmazást." +#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb " +#~ "zárja be a másik alkalmazást." #~ msgid "Updating package list..." #~ msgstr "Csomaglista frissítése..." @@ -1077,34 +1159,34 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Kérem frissítse rendszerét az Ubuntu Linux újabb verziójára. Az Ön által " #~ "használt verzió már nem fog biztonsági javításokat vagy egyéb kritikus " -#~ "frissítéseket kapni. Kérem keresse fel a http://www.ubuntulinux.org oldalt a " -#~ "frissítési információkért." +#~ "frissítéseket kapni. Kérem keresse fel a http://www.ubuntulinux.org " +#~ "oldalt a frissítési információkért." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Az Ubuntu egy új kiadása áll rendelkezésre!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Egy új, \"%s\" kódnevű kiadás áll rendelkezésre. A frissítési utasításokért " -#~ "keresse fel a http://www.ubuntulinux.org/ webhelyet." +#~ "Egy új, \"%s\" kódnevű kiadás áll rendelkezésre. A frissítési " +#~ "utasításokért keresse fel a http://www.ubuntulinux.org/ webhelyet." #~ msgid "Never show this message again" #~ msgstr "Ne mutassa többé ezt az üzenetet" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb zárja " -#~ "be a másik alkalmazást." +#~ "Egyidejűleg csak egy csomagkezelő alkalmazást futtathat. Kérem előbb " +#~ "zárja be a másik alkalmazást." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Inicializálás és a frissítések letöltése..." @@ -1152,25 +1234,25 @@ msgstr "Nem DFSG-kompatibilis szoftver" #~ msgstr "Megváltoztak a tárolók" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "A tárolóinformációk megváltoztak. A sources.list biztonsági másolata %s.save " -#~ "néven van elmentve.\n" +#~ "A tárolóinformációk megváltoztak. A sources.list biztonsági másolata %s." +#~ "save néven van elmentve.\n" #~ "\n" -#~ "A csomaglistákat újra le kell tölteni a kiszolgálókról, hogy a változtatások " -#~ "életbe lépjenek. Meg akarja ezt tenni most?" +#~ "A csomaglistákat újra le kell tölteni a kiszolgálókról, hogy a " +#~ "változtatások életbe lépjenek. Meg akarja ezt tenni most?" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Elérhető frissítések</b></big>\n" #~ "\n" #~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével " -#~ "frissítheti őket."
\ No newline at end of file +#~ "frissítheti őket." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 17:46+0000\n" "Last-Translator: Maurizio Moriconi <bugman@tiscali.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -18,41 +18,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Ogni %s giorni" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Dopo %s giorni" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importa chiave" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Errore durante l'importazione del file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere corrotto." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Errore durante la rimozione della chiave" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Notificare questo come bug" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -63,11 +62,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Inserire un nome per il disco" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" @@ -81,8 +80,8 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" "Il sistema contiene pacchetti non integri che non possono essere aggiustati " -"con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-" -"get\" per aggiustarli." +"con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" +"\" per aggiustarli." #: ../DistUpgrade/DistUpgradeCache.py:135 msgid "Can't upgrade required meta-packages" @@ -92,6 +91,7 @@ msgstr "Impossibile aggiornare i meta-pacchetti richiesti" msgid "A essential package would have to be removed" msgstr "Un pacchetto essenziale dovrebbe essere rimosso" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" @@ -104,11 +104,12 @@ msgstr "" "Si è verificato un problema irrisolvibile calcolando l'aggiornamento. Per " "favore segnala questo come bug. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Errore durante l'autenticazione di alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -118,12 +119,12 @@ msgstr "" "un problema di rete passeggero. Riprovare più tardi. Segue una lista di " "pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -131,11 +132,12 @@ msgstr "" "Non è stato possibile installare un pacchetto richiesto. Per favore riporta " "questo come bug. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -153,11 +155,12 @@ msgstr "" msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nessuna voce valida trovata." -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -165,11 +168,11 @@ msgstr "" "Durante la scansione delle informazioni sui repository, non è stata trovata " "alcuna voce valida per l'aggiornamento.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -177,11 +180,11 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Per favore segnala questo come bug." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -189,11 +192,11 @@ msgstr "" "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta " "di problemi di rete, controllare la connessione di rete e riprovare." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Spazio libero insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -204,18 +207,20 @@ msgstr "" "spazio sul disco. Svuotare il cestino e rimuovere i pacchetti temporanei " "delle passate installazioni usando 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "L'aggiornamento dev'essere interrotto ora. Il sistema potrebbe essere in uno " "stato inutilizzabile. Per aggiustare il sistema, provare ad usare 'sudo apt-" @@ -233,15 +238,24 @@ msgstr "" "L'aggiornamento termina ora. Controllare la connessione internet o il " "supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -250,152 +264,170 @@ msgstr "" "seguente per maggiori informazioni. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Ricerca software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Inserire '%s' nell'unità '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Download completato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Download del file %li di %li a %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s rimanenti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Download del file %li di %li a velocità sconosciuta" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Download del file %li di %li a %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Installazione degli aggiornamenti" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Download modifiche in corso..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Impossibile installare '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "L'aggiornamento viene interrotto ora. Per favore riporta questo come bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 #, fuzzy msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -"Per favore riporta questo come bug e includi nella segnalazione i file " -"~/dist-upgrade.log e ~/dist-upgrade-apt.log . L'aggiornamento termina ora. " +"Per favore riporta questo come bug e includi nella segnalazione i file ~/" +"dist-upgrade.log e ~/dist-upgrade-apt.log . L'aggiornamento termina ora. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Verrà rimosso %s pacchetto." msgstr[1] "Verranno rimossi %s pacchetti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Verrà installato %s nuovo pacchetto." msgstr[1] "Verranno installati %s nuovi pacchetti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Verrà aggiornato %s pacchetto." msgstr[1] "Verranno aggiornati %s pacchetti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "È necessario scaricare un totale di %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "L'aggiornamento può richiedere diverse ore e non può essere annullato in " "nessun momento successivo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita " "di dati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Impossibile trovare aggiornamenti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Il sistema è già stato aggiornato." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Rimuovi %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Installa %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Aggiorna %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Riavvio richiesto" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" @@ -403,6 +435,7 @@ msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -422,17 +455,17 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "<b><big>Restart the system to complete the upgrade</big></b>" -msgstr "" -"<b><big>Riavviare il sistema per completare l'aggiornamento</big></b>" +msgstr "<b><big>Riavviare il sistema per completare l'aggiornamento</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Avviare l'aggiornamento?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Aggiornamento ad Ubuntu \"Dapper\" " "6.04</span>" @@ -446,38 +479,51 @@ msgid "Details" msgstr "Dettagli" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Download ed installazione degli aggiornamenti in corso" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modifica i canali software" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Preparazione dell'aggiornamento in corso" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Riavvio del sistema in corso" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminale" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Aggiornamento Ubuntu in corso" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Ricarica" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Riporta bug" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Riavvia ora" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Riprendi l'aggiornamento" @@ -490,8 +536,9 @@ msgid "" msgstr "" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -515,30 +562,34 @@ msgstr "Cambiamenti" #: ../data/UpdateManager.glade.h:10 #, fuzzy -msgid "Check for available updates" -msgstr "Verifica degli aggiornamenti..." +msgid "Chec_k" +msgstr "_Controlla" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrizione" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Note alla Release" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Visualizza dettagli" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Visualizza avanzamento dei singoli file" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aggiornamenti Software" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -546,23 +597,23 @@ msgstr "" "Gli aggiornamenti software possono correggere errori, eliminare " "vulnerabilità di sicurezza e fornire nuove funzionalità" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ggiorna" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Controlla" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Nascondi queste informazioni in futuro" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installa aggiornamenti" @@ -630,7 +681,8 @@ msgid "_Check for updates automatically:" msgstr "_Verificare aggiornamenti automaticamente:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Scaricare gli aggiornamenti in background, ma non installarli" #: ../data/SoftwareProperties.glade.h:16 @@ -666,12 +718,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Commento:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribuzione:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componenti</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sezioni:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribuzione:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -687,14 +740,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Inserire la linea APT completa del canale che si vuole " -"aggiungere</b></big>\n" +"<big><b>Inserire la linea APT completa del canale che si vuole aggiungere</" +"b></big>\n" "\n" "La riga APT contiene il tipo, la locazione e il contenuto di un canale, ad " "esempio <i>\"deb http://ftp.debian.org sarge main\"</i>" @@ -724,10 +777,9 @@ msgid "Scanning CD-ROM" msgstr "Scansione CD-ROM in corso" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Aggiungi Canale" -msgstr[1] "_Aggiungi Canali" +msgstr "_Aggiungi Canale" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -779,101 +831,138 @@ msgstr "" msgid "The window size" msgstr "Dimensione della finestra" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 «Dapper Drake»" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Aggiornamenti di Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Backport di Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 «Breezy Badger»" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Aggiornamenti di sicurezza di Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Backport di Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportato ufficialmente" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Copyright con restrizioni" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Mantenuto dalla comunità (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Software non libero (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aggiornamenti di sicurezza di Debian 3.1 «Sarge»" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian «Etch» (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian «Sid» (Unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Supportato ufficialmente" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibile con le DFSG e con dipendenze non libere" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Download del file %li di %li a velocità sconosciuta" + +#~ msgid "Installing updates" +#~ msgstr "Installazione degli aggiornamenti" + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "Verifica degli aggiornamenti..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sezioni:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Supportato ufficialmente" + #~ msgid "Reload the latest information about updates" #~ msgstr "Ricarica le informazioni sugli aggiornamenti" @@ -886,8 +975,8 @@ msgstr "Software non compatibile con le DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">Download delle modifiche in " -#~ "corso</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">Download delle modifiche in corso</" +#~ "span>\n" #~ "\n" #~ "Devo scaricare le modifiche dal server centrale" @@ -915,9 +1004,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "day(s)" #~ msgstr "giorni" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Componenti</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -939,11 +1025,11 @@ msgstr "Software non compatibile con le DFSG" #~ "permette di verificare l'integrità del software che scarichi." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati di " -#~ "aver ricevuto la chiave attraverso un canale sicuro e di fidarti del " +#~ "Aggiungi un nuovo file per una chiave nel portachiavi fidato. Assicurati " +#~ "di aver ricevuto la chiave attraverso un canale sicuro e di fidarti del " #~ "proprietario. " #~ msgid "Add repository..." @@ -971,8 +1057,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr "Dimensione massima in MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Ripristina le chiavi di default della distribuzione.\n" #~ "Questo non modificherà le chiavi installate dal'utente." @@ -1004,13 +1090,13 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<bi><b>Aggiornamenti Disponibili</b></big>\n" #~ "\n" -#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando il " -#~ "pulsante Installa." +#~ "I seguenti pacchetti possono essere aggiornati. Puoi aggiornarli usando " +#~ "il pulsante Installa." #~ msgid "Cancel downloading the changelog" #~ msgstr "Cancella il download delle modifiche" @@ -1066,7 +1152,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>" #~ msgstr "" -#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu <cdimage@ubuntu.com>" +#~ "Chiave di Firma Automatica per l'immagine CD di Ubuntu <cdimage@ubuntu." +#~ "com>" #~ msgid "Choose a key-file" #~ msgstr "Scegli un file di chiave" @@ -1083,9 +1170,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Version %s: \n" #~ msgstr "Versione %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Download modifiche in corso..." - #~ msgid "There are no updated packages" #~ msgstr "Non ci sono apacchetti aggiornati" @@ -1100,7 +1184,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr[1] "" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Hai selezionato %s pacchetti su %s, dimensione %s" #~ msgstr[1] "" @@ -1108,8 +1193,8 @@ msgstr "Software non compatibile con le DFSG" #~ msgstr "Gli aggiornamenti sono in fase di applicazione." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Puoi eseguire una sola applicazione di gestione dei pacchetti " #~ "contemporaneamente. Per favore prima chiudi quest'altra applicazione." @@ -1128,34 +1213,35 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione che " -#~ "stai usando non riceverà più aggiornamenti di sicurezza o altri " -#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org per " -#~ "informazioni riguardo all'aggiornamento." +#~ "Per favore aggiornati ad una nuova versione di Ubuntu Linux. La versione " +#~ "che stai usando non riceverà più aggiornamenti di sicurezza o altri " +#~ "aggiornamenti critici. Per favore guarda su http://www.ubuntulinux.org " +#~ "per informazioni riguardo all'aggiornamento." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "È disponibile una nuova release di Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su " -#~ "http://www.ubuntulinux.org/ per informazioni sull'aggiornamento" +#~ "Una nuova release con nome '%s' è disponbile. Per favore guarda su http://" +#~ "www.ubuntulinux.org/ per informazioni sull'aggiornamento" #~ msgid "Never show this message again" #~ msgstr "Non mostrare più questo messaggio" #~ msgid "Changes not found, the server may not be updated yet." #~ msgstr "" -#~ "Modifiche non trovate, il server potrebbe non essere stato ancora aggiornato." +#~ "Modifiche non trovate, il server potrebbe non essere stato ancora " +#~ "aggiornato." #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" #~ "Impossibile scaricare le modifiche. Per favore controlla se c'è una " -#~ "connessione internet attiva."
\ No newline at end of file +#~ "connessione internet attiva." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: ikuya <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n" @@ -18,38 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." -msgstr "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。" +msgstr "" +"選択したファイルはGPGキーファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "キー削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -57,11 +57,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -83,6 +83,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -94,34 +95,36 @@ msgid "" "this as a bug. " msgstr "選択したキーを削除できませんでした。バグとして報告してください。 " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "選択したキーを削除できませんでした。バグとして報告してください。 " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -134,42 +137,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "キー削除のエラー" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -177,18 +181,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -201,160 +206,185 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "他のパッケージマネージャが動いています" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "アップグレードが終了しました" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "アップデートをインストール中..." +msgid "Applying changes" +msgstr "変更点を取得中..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "システムに壊れたパッケージがあります！" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -362,6 +392,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -385,8 +416,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -399,38 +430,51 @@ msgid "Details" msgstr "<b>詳細</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "再読込" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -444,7 +488,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -463,52 +507,56 @@ msgid "Changes" msgstr "変更点" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "ソフトウェアのアップデート" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "アップデートをインストール中..." @@ -582,7 +630,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -613,12 +661,13 @@ msgid "<b>Comment:</b>" msgstr "<b>コメント:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>ディストリビューション:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>コンポーネント</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>セクション:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>ディストリビューション:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -636,16 +685,17 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n" "\n" -"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://ftp.debian.org sarge " -"main\"</i>付属のドキュメントに詳細な記述形式について書かれています。" +"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://" +"ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か" +"れています。" #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -673,8 +723,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -722,110 +771,138 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.04 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.04 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.04 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 セキュリティアップデート" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 セキュリティアップデート" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "公式サポート" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Restricted copyright" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "非フリー (Multiuniverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable セキュリティアップデート" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "公式サポート" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "アップデートをインストール中..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>セクション:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "公式サポート" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "サーバからパッケージ情報を再度読み込む。" @@ -868,9 +945,6 @@ msgstr "" #~ msgid "Choose a key-file" #~ msgstr "キーファイルを選択" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>コンポーネント</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>リポジトリ</b>" @@ -888,15 +962,18 @@ msgstr "" #~ msgstr "" #~ "<big><b>認証鍵</b></big>\n" #~ "\n" -#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完全なものか確認することができます。" +#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完" +#~ "全なものか確認することができます。" #~ msgid "A_uthentication" #~ msgstr "認証(_U)" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " -#~ msgstr "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経由で鍵を取得し、信頼される持ち主のものか確認してください。 " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " +#~ msgstr "" +#~ "新しい鍵ファイルを信頼されたキーリングに追加します。セキュアなチャンネル経" +#~ "由で鍵を取得し、信頼される持ち主のものか確認してください。 " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "一時ファイルを自動的に削除する(_T)" @@ -917,9 +994,11 @@ msgstr "" #~ msgstr "最大量(MB):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." -#~ msgstr "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更によりユーザが追加した鍵が失われることはありません。" +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." +#~ msgstr "" +#~ "ディストリビューション付属のデフォルトの鍵を元に戻します。この変更により" +#~ "ユーザが追加した鍵が失われることはありません。" #~ msgid "Set _maximum size for the package cache" #~ msgstr "パッケージキャッシュの最大量を設定する(_M)" @@ -945,26 +1024,27 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>アップデートがあります</b></big>\n" #~ "\n" -#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらのパッケージがインストールされます。" +#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら" +#~ "のパッケージがインストールされます。" #~ msgid "" #~ "Reload the package information from the server. \n" #~ "\n" -#~ "If you have a permanent internet connection this is done automatically. If " -#~ "you are behind an internet connection that needs to be started by hand (e.g. " -#~ "a modem) you should use this button so that update-manager knows about new " -#~ "updates." +#~ "If you have a permanent internet connection this is done automatically. " +#~ "If you are behind an internet connection that needs to be started by hand " +#~ "(e.g. a modem) you should use this button so that update-manager knows " +#~ "about new updates." #~ msgstr "" #~ "サーバからパッケージ情報を読み込み直します。\n" #~ "\n" -#~ "" -#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデムなどでそうではないなら、アップデートマネージャに新しいアップデートがあるかどうかを" -#~ "知らせるため、このボタンを使用して手動で行う必要があります。" +#~ "ずっとインターネットに接続されたままなら、自動的に行います。アナログモデム" +#~ "などでそうではないなら、アップデートマネージャに新しいアップデートがあるか" +#~ "どうかを知らせるため、このボタンを使用して手動で行う必要があります。" #~ msgid "Binary" #~ msgstr "バイナリ" @@ -997,13 +1077,14 @@ msgstr "" #~ msgstr "リポジトリが変更されました" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコピーしました\n" +#~ "リポジトリ情報が変更されました。sources.listのバックアップを %s.save にコ" +#~ "ピーしました\n" #~ "\n" #~ "パッケージリストをサーバから再取得する必要があります。今すぐ実行しますか?" @@ -1011,7 +1092,8 @@ msgstr "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" または \"apt-get\" を使用して修正してください。" +#~ "インストールされたパッケージの依存性が満たせないようです。\"Synaptic\" ま" +#~ "たは \"apt-get\" を使用して修正してください。" #~ msgid "It is not possible to upgrade all packages." #~ msgstr "全てのパッケージをアップグレードすることは不可能です。" @@ -1019,35 +1101,40 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対処がいるようです。Synaptic \"Smart " -#~ "Upgrade\"か\"apt-get dist-upgrade\"を実行して問題を修正してください。" +#~ "パッケージのアップグレードの他にパッケージのインストールや削除などの別の対" +#~ "処がいるようです。Synaptic \"Smart Upgrade\"か\"apt-get dist-upgrade\"を実" +#~ "行して問題を修正してください。" #~ msgid "The following packages are not upgraded: " #~ msgstr "これらのパッケージはアップグレードされません: " #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "変更点は見つかりませんでした。サーバはまだアップデートされていないようです。" +#~ msgstr "" +#~ "変更点は見つかりませんでした。サーバはまだアップデートされていないようで" +#~ "す。" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "変更点の取得に失敗しました。インターネットに接続されているか確認してください。" +#~ msgstr "" +#~ "変更点の取得に失敗しました。インターネットに接続されているか確認してくださ" +#~ "い。" #~ msgid "Version %s: \n" #~ msgstr "バージョン %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "変更点を取得中..." - #~ msgid "The updates are being applied." #~ msgstr "アップデートされました。" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." -#~ msgstr "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケーションマネージャを終了してください。" +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." +#~ msgstr "" +#~ "同時にひとつのパッケージマネージャしか起動できません。先に他のアプリケー" +#~ "ションマネージャを終了してください。" #~ msgid "Updating package list..." #~ msgstr "アップデートされるパッケージのリスト..." @@ -1066,22 +1153,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "新しいUbuntu " -#~ "Linuxにアップグレードしてください。現在お使いのシステムにはセキュリティフィクスや危急のアップデートはすでに提供されていません。アッ" -#~ "プグレードに関する情報は http://www.ubuntulinux.org/ を見てください。" +#~ "新しいUbuntu Linuxにアップグレードしてください。現在お使いのシステムにはセ" +#~ "キュリティフィクスや危急のアップデートはすでに提供されていません。アップグ" +#~ "レードに関する情報は http://www.ubuntulinux.org/ を見てください。" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntuの新しいリリース版があります！" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするために http://www.ubuntulinux.org/ " -#~ "をご覧ください。" +#~ "コードネーム '%s' という新しいリリース版があります。アップグレードするため" +#~ "に http://www.ubuntulinux.org/ をご覧ください。" #~ msgid "Never show this message again" #~ msgstr "このメッセージを二度と表示しない" @@ -1090,10 +1177,11 @@ msgstr "" #~ msgstr "排他的なロックができません" #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や aptitudeのような他のパッケージマネージャを終了してください。" +#~ "同時にひとつのパッケージマネージャしか起動できません。先に atp-get や " +#~ "aptitudeのような他のパッケージマネージャを終了してください。" #~ msgid "Initializing and getting list of updates..." #~ msgstr "アップデートリストを取得中..." @@ -1113,9 +1201,10 @@ msgstr "" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>利用可能なアップデート</b></big>\n" #~ "\n" -#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれらのパッケージがインストールされます。"
\ No newline at end of file +#~ "以下のパッケージがアップグレード可能です。インストールボタンを押すとこれら" +#~ "のパッケージがインストールされます。" @@ -7,50 +7,49 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-20 21:56+0000\n" "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"(n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Kas %s dienas" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Po %s dienų" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importuoti raktą" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Importuojant pasirinktą rinkmeną įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Pasirinkta rinkmena gali būti ne GPG rakto rinkmena arba sugadinta rinkmena." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -61,11 +60,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Įveskite disko pavadinimą" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" @@ -87,6 +86,7 @@ msgstr "Negalima atnaujinti reikiamų metapaketų" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" @@ -97,34 +97,36 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -137,41 +139,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -179,18 +182,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -203,96 +207,121 @@ msgid "" "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Atsiųsta" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "liko %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Atsiunčiama rinkmena %li iš %li, %s/s greičiu" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Diegiami atnaujinimai" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Nepavyko įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Atnaujinimas nutrūko. Praneškite apie tai kaip apie klaidą." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -300,7 +329,7 @@ msgstr[0] "Bus pašalintas %s paketas." msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -308,7 +337,7 @@ msgstr[0] "Bus įdiegtas %s naujas paketas." msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -316,51 +345,52 @@ msgstr[0] "Bus atnaujintas %s paketas." msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Turite atsisiųsti viso %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Nepavyko rasti jokių atnaujinimų" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Jūsų sistema jau buvo atnaujinta." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Pašalinti %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Reikia perkrauti kompiuterį" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -370,6 +400,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -392,12 +423,13 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Pradėti atnaujinimą?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" -"<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu „Dapper“ " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu „Dapper“ 6.04</" +"span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 msgid "Cleaning up" @@ -408,38 +440,51 @@ msgid "Details" msgstr "Detalės" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Atsiunčiami ir įdiegiami atnaujinimai" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Keičiami programinės įrangos kanalai" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Ruošiamas atnaujinimas" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Perkraunama sistema" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminalas" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Atnaujinama Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Į_kelti iš naujo" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Pranešti apie klaidą" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Perkrauti dabar" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Tęsti atnaujinimą" @@ -452,8 +497,9 @@ msgid "" msgstr "" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -476,30 +522,34 @@ msgid "Changes" msgstr "Pakeitimai" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Aprašymas" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Leidimo aprašymas" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Rodyti detales" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Rodyti pavienių rinkmenų progresą" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programinės įrangos atnaujinimai" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -507,23 +557,23 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Nerodyti šios informacijos ateityje" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Į_diegti atnaujinimus" @@ -587,7 +637,8 @@ msgid "_Check for updates automatically:" msgstr "_Ieškoti atnaujinimų automatiškai:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti" #: ../data/SoftwareProperties.glade.h:16 @@ -617,12 +668,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Komentaras:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribucija:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komentaras:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Skyriai:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribucija:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -638,8 +690,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -674,11 +726,9 @@ msgid "Scanning CD-ROM" msgstr "Skanuojamas CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Pridėti kanalą" -msgstr[1] "_Pridėti kanalus" -msgstr[2] "_Pridėti kanalų" +msgstr "_Pridėti kanalą" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -725,114 +775,145 @@ msgstr "" msgid "The window size" msgstr "Lango dydis" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 „Dapper Drake“" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 saugumo atnaujinimai" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 atnaujinimai" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" -msgstr "" +#, fuzzy +msgid "Ubuntu 6.06 Backports" +msgstr "Ubuntu 6.04 atnaujinimai" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 „Breezy Badger“" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 atnaujinimai" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Apribotos autorinės teisės" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 „Sarge“ saugumo atnaujinimai" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian „Etch“ (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.lt.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian „Sid“ (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Prižiūrima oficialiai" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" -msgstr "" -"Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" +msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" +#~ msgid "Installing updates" +#~ msgstr "Diegiami atnaujinimai" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Skyriai:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Prižiūrima oficialiai" + #~ msgid "" -#~ "<b><big>You need to manually reload the latest information about " -#~ "updates</big></b>\n" +#~ "<b><big>You need to manually reload the latest information about updates</" +#~ "big></b>\n" #~ "\n" -#~ "Your system does not check for updates automatically. You can configure this " -#~ "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." +#~ "Your system does not check for updates automatically. You can configure " +#~ "this behavior in \"System\" -> \"Administration\" -> \"Software Properties" +#~ "\"." #~ msgstr "" -#~ "<b><big>Jūs turite patys įkelti naujausią informaciją apie " -#~ "atnaujinimus</big></b>\n" +#~ "<b><big>Jūs turite patys įkelti naujausią informaciją apie atnaujinimus</" +#~ "big></b>\n" #~ "\n" #~ "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite " -#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“." +#~ "konfigūruoti „Sistema“ -> „Administravimas“ -> „Programinės įrangos " +#~ "savybės“." #~ msgid "Reload the latest information about updates" -#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus"
\ No newline at end of file +#~ msgstr "Įkelti naujausią informaciją apie atnaujinimus" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:18+0000\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -17,41 +17,40 @@ msgstr "" "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -59,11 +58,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -85,6 +84,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -98,23 +98,24 @@ msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -123,11 +124,12 @@ msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -140,42 +142,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -183,18 +186,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -207,102 +211,126 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Инсталирам надградби..." +msgid "Applying changes" +msgstr "Преземам промени..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -310,7 +338,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -318,7 +346,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -326,48 +354,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -375,6 +404,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -398,8 +428,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -412,38 +442,51 @@ msgid "Details" msgstr "<b>Детали</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Освежи" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -457,7 +500,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -476,53 +519,56 @@ msgid "Changes" msgstr "Промени" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "Проверувам за надградби..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Надградба на софтвер" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." @@ -594,7 +640,7 @@ msgid "_Check for updates automatically:" msgstr "Проверувај за надградби на секои" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -625,12 +671,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Дистрибуција:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Оддели:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Дистрибуција:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -648,14 +695,14 @@ msgstr "<b>Адреса:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Внесете ја комплетната линија за APT складиштето за да го " -"додадете</b></big>\n" +"<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</" +"b></big>\n" "\n" "APT линијата го содржи типот, локацијата и содржината на складиштето за на " "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата " @@ -687,10 +734,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -738,110 +782,142 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Надградби за Убунту 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Безбедносни надградби за Убунту 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Надградби за Убунту 5.10" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Надградби за Убунту 5.10" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Безбедносни надградби за Убунту 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Надградби за Убунту 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официјално поддржано" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Restricted copyright" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Безбедносни надградби за Debian Stable" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Официјално поддржано" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" +#, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Инсталирам надградби..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "Проверувам за надградби..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Оддели:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Официјално поддржано" + #~ msgid "Edit software sources and settings" #~ msgstr "Уреди софтверски извори и поставувања" @@ -863,9 +939,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ден(а)" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Складиште</b>" @@ -898,13 +971,13 @@ msgstr "" #~ "<big><b>Внесете ја комплетната линија за APT складиштето за да го " #~ "додадете</b></big>\n" #~ "\n" -#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за на " -#~ "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата " -#~ "можете да најдете детален опис на синтаксата." +#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за " +#~ "на пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во " +#~ "документацијата можете да најдете детален опис на синтаксата." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Додајте нова датотека со клуч во доверливиот привезок. Осигурајте се дека " #~ "сте го добиле клучот преку безбеден канал и дека му верувате на неговиот " @@ -941,8 +1014,8 @@ msgstr "" #~ msgstr "Врати ги стандардните клучеви" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Врати ги стандардните клучеви на дистрибуцијата. Ова нема да ги смени " #~ "клучевите инсталирани од корисникот." @@ -977,8 +1050,8 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Достапни надградби</b></big>\n" #~ "\n" @@ -1096,9 +1169,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Верзија %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Преземам промени..." - #~ msgid "There are no updated packages" #~ msgstr "Нема надградени пакети" @@ -1115,7 +1185,8 @@ msgstr "" #~ msgstr[2] "Избравте %s пакети за надградба, со големина од %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Избравте %s од %s пакет за надградба, со големина од %s" #~ msgstr[1] "Избравте %s од %s пакети за надградба, со големина од %s" #~ msgstr[2] "Избравте %s од %s пакети за надградба, со големина од %s" @@ -1130,11 +1201,11 @@ msgstr "" #~ msgstr "Веќе работи друг менаџер за пакети" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Можете да работите само со една апликација за менаџмент на пакети одеднаш. " -#~ "Ве молам прво исклучете ја оваа апликацијата." +#~ "Можете да работите само со една апликација за менаџмент на пакети " +#~ "одеднаш. Ве молам прво исклучете ја оваа апликацијата." #~ msgid "Updating package list..." #~ msgstr "Ја ажурирам листата на пакети..." @@ -1156,20 +1227,20 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Ве молам надградете до понова верзија на Убунту Линукс. Верзијата на која " -#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни поправки " -#~ "и други технички надградби. Ве молам побарајте информации за надградба на " -#~ "http://www.ubuntulinux.org." +#~ "што работите повеќе нема да биде поддржана во смисол на безбедносни " +#~ "поправки и други технички надградби. Ве молам побарајте информации за " +#~ "надградба на http://www.ubuntulinux.org." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Достапна е нова верзија на Убунту!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "Постои ново издание објавено под кодното име '%s'. Ве молам побарајте ги " #~ "инструкциите за надградба на http://www.ubuntulinux.org." @@ -1184,5 +1255,5 @@ msgstr "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Не успеав да ги преземам промените. Ве молам проверете дали Вашата интернет " -#~ "врска е активна."
\ No newline at end of file +#~ "Не успеав да ги преземам промените. Ве молам проверете дали Вашата " +#~ "интернет врска е активна." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 14:48+0000\n" "Last-Translator: Ingar Saltvik <ingar@saltvik.org>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -17,39 +17,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Hver %s dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Etter %s dager" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importer nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil, ellers er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +59,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Vennligst skriv inn et navn for platen" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn planen i stasjonen:" @@ -89,6 +88,7 @@ msgstr "Kan ikke oppgradere nødvendige meta-pakker" msgid "A essential package would have to be removed" msgstr "En nødvendig pakke må bli fjernet" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" @@ -101,11 +101,12 @@ msgstr "" "Et uopprettelig problem oppstå ved forberedelse av oppgraderingen. Vennligst " "rapporter dette som en feil. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Feil ved autentisering av noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -115,12 +116,12 @@ msgstr "" "nettverksproblem, og du bør prøve igjen senere. Se under for en liste over " "ikke-autentiserte pakker." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -128,11 +129,12 @@ msgstr "" "Det var ikke mulig å installere en nødvendig pakke. Vennligst rapporter " "denne feilen. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -150,11 +152,12 @@ msgstr "" msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Fant ikke noen gyldig oppføring" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -162,11 +165,11 @@ msgstr "" "Fant ikke noen gyldig oppføring for oppgradering ved lesing av " "arkivinformasjon.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -174,11 +177,11 @@ msgstr "" "Oppgradering av arkivinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -187,11 +190,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -202,18 +205,20 @@ msgstr "" "papirkurven og fjern midlertidige pakker fra tidligere installasjoner ved å " "bruke 'sudo apt-get-clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. Vennlist prøv " "'sudo apt-get install -f' eller Synaptic for å fikse systemet ditt." @@ -230,15 +235,24 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -247,148 +261,166 @@ msgstr "" "informasjon. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Vennligst sett inn '%s' i stasjonen '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Nedlastingen er fullført" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Laster ned fil %li av %li med %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s gjenstår" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Laster ned fil %li av %li med ukjent hastighet" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Laster ned fil %li av %li med %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Installerer oppdateringer" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Laster ned endringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Kunne ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Oppgraderingen avbrytes nå. Vennligst rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "En uopprettelig feil oppsto" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Vennligst rapporter feilen og inkluder filene ~/dist-upgrade.log og ~/dist-" "upgrade-apt.log i din melding. Oppgraderingen avbrytes nå. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Du må laste ned totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Kunne ikke finne noen oppgraderinger" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Systemet ditt er allerede oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Fjern %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Installèr %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Oppgradèr %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Omstart er nødvendig" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -398,6 +430,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -425,9 +458,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Vil du starte oppgraderingen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Oppgraderer til Ubuntu \"Dapper\" " "6.04</span>" @@ -441,38 +475,51 @@ msgid "Details" msgstr "Detaljer" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Laster ned og installerer oppgraderingene" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Endrer kanalene for programvare" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Forbereder oppgraderingen" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Starter systemet på nytt" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Oppgraderer Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Last på nytt" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Rapportèr en feil" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Omstart nå" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Gjenoppta oppgradering" @@ -490,8 +537,9 @@ msgstr "" "\"Programvareegenskaper\"" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -514,30 +562,35 @@ msgid "Changes" msgstr "Endringer" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Sjekker for tilgjengelige oppdateringer" +#, fuzzy +msgid "Chec_k" +msgstr "Sjekk" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivelse" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Utgivelsesinformasjon" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Vis detaljer" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Vis framgang for enkeltfiler" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -545,23 +598,23 @@ msgstr "" "Programvareoppdateringer kan fikse feil, fjerne sikkerhetshull og tilby ny " "funksjonalitet." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "Sjekk" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Skjul denne informasjonen i fremtiden" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installerer oppdateringer" @@ -628,7 +681,8 @@ msgid "_Check for updates automatically:" msgstr "_Sjekk for oppdateringer automatisk:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installer dem" #: ../data/SoftwareProperties.glade.h:16 @@ -664,12 +718,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribusjon:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenter</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Seksjoner:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribusjon:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -685,8 +740,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -722,10 +777,9 @@ msgid "Scanning CD-ROM" msgstr "Søker gjennom CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Legg til k_anal" -msgstr[1] "Legg til k_analer" +msgstr "Legg til k_anal" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -775,100 +829,137 @@ msgstr "" msgid "The window size" msgstr "Vindusstørrelsen" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Sikkerhetsoppdateringer for Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 Oppdateringer" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 Backports" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Security Updates" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Updates" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offisielt støttet" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Begrenset opphavsrett" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sikkerhetsoppdateringer" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Offisielt støttet" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Laster ned fil %li av %li med ukjent hastighet" + +#~ msgid "Installing updates" +#~ msgstr "Installerer oppdateringer" + +#~ msgid "Check for available updates" +#~ msgstr "Sjekker for tilgjengelige oppdateringer" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Seksjoner:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Oppdater pakkeinformasjonen fra tjeneren." @@ -907,9 +998,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "<b>Sources</b>" #~ msgstr "<b>Programvarekilder</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenter</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Arkiv</b>" @@ -927,13 +1015,13 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "" #~ "<big><b>Autentiseringsnøkler</b></big>\n" #~ "\n" -#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. Nøkler " -#~ "gjør det mulig å kontrollere integriteten til programvare som blir lastet " -#~ "ned." +#~ "Du kan legge til eller fjerne autentiseringsnøkler i dette vinduet. " +#~ "Nøkler gjør det mulig å kontrollere integriteten til programvare som blir " +#~ "lastet ned." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Legg til en ny nøkkelfil til den sikre nøkkelringen. Vær sikker på at du " #~ "mottok nøkkelen over en sikker kanal og at du stoler på eieren. " @@ -964,8 +1052,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Maksimum størrelse i MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "Gjenoppret nøklene som kom med distri" #~ msgid "Set _maximum size for the package cache" @@ -995,13 +1083,13 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Tilgjengelige oppdateringer</b></big>\n" #~ "\n" -#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke på " -#~ "«Installer»-knappen." +#~ "De følgende pakkene kan oppgraderes. Du kan oppgradere dem ved å trykke " +#~ "på «Installer»-knappen." #~ msgid "Cancel downloading the changelog" #~ msgstr "Avbryt nedlasting av endringslogg" @@ -1090,9 +1178,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "Version %s: \n" #~ msgstr "Versjon %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Laster ned endringer..." - #~ msgid "There are no updated packages" #~ msgstr "Det er ingen utdaterte pakker" @@ -1107,7 +1192,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr[1] "Du har valgt alle de %s oppdaterte pakkene, total størrelse %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Du har valgt %s av %s oppdaterte pakker, størrelse %s" #~ msgstr[1] "Du har valgt %s av de %s oppdaterte pakkene, total størrelse %s" @@ -1115,8 +1201,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Oppdateringene blir tilført." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Du kan bare kjøre et pakkehåndteringsprogram samtidig. Lukk det andre " #~ "programmet først." @@ -1135,19 +1221,19 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får ikke " -#~ "sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. Se " -#~ "http://www.ubuntulinux.org for informasjon om oppgradering." +#~ "Oppgrader til en nyere versjon av Ubuntu Linux. Versjonen du kjører får " +#~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. " +#~ "Se http://www.ubuntulinux.org for informasjon om oppgradering." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" #~ "En ny versjon med kodenavnet «%s» er tilgjengelig. Se http://www. " #~ "ubuntulinux.org/ for instruksjoner om oppgradering." @@ -1177,8 +1263,8 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgstr "Arkiv har blitt endret" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1202,11 +1288,12 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra handling " -#~ "(som å installere eller fjerne pakker). Bruk «Synaptic» eller «apt-get dist-" -#~ "upgrade» for å løse problemet." +#~ "Dette betyr at ved siden av å oppgradere pakkene kreves det ekstra " +#~ "handling (som å installere eller fjerne pakker). Bruk «Synaptic» eller " +#~ "«apt-get dist-upgrade» for å løse problemet." #~ msgid "The following packages are not upgraded: " -#~ msgstr "De følgende pakkene er ikke oppgradert: "
\ No newline at end of file +#~ msgstr "De følgende pakkene er ikke oppgradert: " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:19+0000\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -18,40 +18,37 @@ msgstr "" "X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2;plural=(n!=0)\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -59,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -85,6 +82,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -94,40 +92,38 @@ msgstr "" msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस " +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " -msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस " +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -140,42 +136,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -183,18 +180,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -207,165 +205,188 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "स्तरवृद्धिहरु स्थापना गर्दै" +msgid "Applying changes" +msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." +msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" + +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" msgstr "" -"तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा " -"दिनुहोस" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -373,6 +394,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -396,8 +418,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -410,38 +432,51 @@ msgid "Details" msgstr "<b>विवरणहरु</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "फेरि लोड गर्नुहोस" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -455,7 +490,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -474,52 +509,56 @@ msgid "Changes" msgstr "परिवर्तनहरु" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "बर्णन" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" @@ -595,7 +634,7 @@ msgid "_Check for updates automatically:" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -626,12 +665,13 @@ msgid "<b>Comment:</b>" msgstr "<b>टिप्पणि:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>वितरण:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>तत्वहरु</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>सेक्सनहरु:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>वितरण:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -649,18 +689,17 @@ msgstr "<b>युआरएल:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट " -"गर्नुहोस</b></big>\n" +"<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n" "\n" -"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि " -"<i>\"deb http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य " -"संरचनाको एउटा विस्तृत विवरण पाउन सक्नुहुन्छ" +"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि <i>\"deb " +"http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा " +"विस्तृत विवरण पाउन सक्नुहुन्छ" #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -688,9 +727,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -738,113 +775,141 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:91 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:108 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "निषेधित प्रतिलिपि अधिकार" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "कार्यालय बाट समर्थित" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>सेक्सनहरु:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "कार्यालय बाट समर्थित" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस" @@ -882,9 +947,6 @@ msgstr "" #~ msgid "<b>Sources</b>" #~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>तत्वहरु</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>कोष</b>" @@ -903,18 +965,16 @@ msgstr "" #~ msgstr "" #~ "<big><b>प्रमाणीकरण कुञ्जिहरु</b></big>\n" #~ "\n" -#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले " -#~ "डाउनलोड गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले " -#~ "संभव पार्दछ" +#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले डाउनलोड " +#~ "गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले संभव पार्दछ" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" -#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त " -#~ "हुनुहोस कि तपाईंले एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं " -#~ "मालिकलाइ विश्वास गर्नुहुन्छ. " +#~ "विश्वास गरिएको कुञ्जिरिंग मा एउटा नयाँ कुञ्जि फाइल थप्नुहोस. विश्वस्त हुनुहोस कि तपाईंले " +#~ "एउटा सुरक्षित माध्यम माथि कुञ्जि प्राप्त गर्नुभयो र तपाईं मालिकलाइ विश्वास गर्नुहुन्छ. " #, fuzzy #~ msgid "Add repository..." @@ -943,11 +1003,11 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले " -#~ "प्रयोगकर्ता स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन" +#~ "वितरण संग शिप गरिएको पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस. यसले प्रयोगकर्ता " +#~ "स्थापना गरिएको कुञ्जिहरु परिवर्तन गर्दैन" #~ msgid "Set _maximum size for the package cache" #~ msgstr "प्याकेज क्यासको लागि अधिकतम आकार सेट गर्नुहोस" @@ -974,13 +1034,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>उपलब्ध अद्यावधिकहरु</b></big>\n" #~ "\n" -#~ "निम्न प्याकेजहरु स्तरवृद्धि गर्न योग्य पाइयो. तपाईंले तिनिहरु लाइ स्थापना " -#~ "बटन प्रयोग गरेर स्तरवृद्धि गर्न सक्नुहुन्छ" +#~ "निम्न प्याकेजहरु स्तरवृद्धि गर्न योग्य पाइयो. तपाईंले तिनिहरु लाइ स्थापना बटन प्रयोग " +#~ "गरेर स्तरवृद्धि गर्न सक्नुहुन्छ" #~ msgid "Cancel downloading the changelog" #~ msgstr "परिवर्तनलग को डाउनलोड रद्द गर्नुहोस" @@ -1045,9 +1105,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "संस्करण %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै" - #, fuzzy #~ msgid "There are no updated packages" #~ msgstr "कुनै स्तरवृद्धिहरु उपलब्ध छैन" @@ -1056,11 +1113,11 @@ msgstr "" #~ msgstr "स्तरवृद्धिहरु लागु हुँदैछन" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन " -#~ "सक्नुहुन्छ.कृपया पहिला यो अन्य अनुप्रयोग बन्द गर्नुहोस" +#~ "तपाईंले उहि समयमा केवल एउटा प्याकेज व्यवस्थापन अनुप्रयोग चलाउन सक्नुहुन्छ.कृपया पहिला " +#~ "यो अन्य अनुप्रयोग बन्द गर्नुहोस" #~ msgid "Updating package list..." #~ msgstr "प्याकेज सुची स्तरवृद्धि गर्दै" @@ -1077,23 +1134,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले " -#~ "चलाइरहेको संस्करण ले सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त " -#~ "गर्नेछैन. कृपया स्तरवृद्धि जानकारी को लागि http://www.ubuntulinux.org " -#~ "हेर्नुहोस" +#~ "कृपया युबन्टु लिनक्स को नयाँ संस्करण मा स्तरवृद्धि गर्नुहोस. तपाईंले चलाइरहेको संस्करण ले " +#~ "सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त गर्नेछैन. कृपया स्तरवृद्धि जानकारी को " +#~ "लागि http://www.ubuntulinux.org हेर्नुहोस" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ. कृपया स्तरवृद्धि निर्देशन को " -#~ "लागि://www.ubuntulinux.org/ हेर्नुहोस." +#~ "एउटा नयाँ संकेतनाम '%s' भएको विमोचन उपलब्ध छ. कृपया स्तरवृद्धि निर्देशन को लागि://" +#~ "www.ubuntulinux.org/ हेर्नुहोस." #~ msgid "Never show this message again" #~ msgstr "यो संदेश फेरि कहिले पनि नदेखाउनुहोस" @@ -1104,8 +1160,7 @@ msgstr "" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "" -#~ "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" +#~ msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" #~ msgid "Ubuntu Update Manager" #~ msgstr "युबन्टु अद्यावधिक व्यवस्थापक" @@ -1120,24 +1175,24 @@ msgstr "" #~ msgstr "कोषहरु परिवर्तित" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप " -#~ "प्रति भण्डारण गरिएको छ. बचत गर्नुहोस. \n" +#~ "कोष जानकारी संग परिवर्तनहरु छन. %s मा तपाईंको स्रोतहरु को सुची को ब्याकअप प्रति " +#~ "भण्डारण गरिएको छ. बचत गर्नुहोस. \n" #~ "\n" -#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची " -#~ "फेरि लोड गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?" +#~ "तपाईको परिवर्तनहरुले प्रभाव लिनको लागि तपाईंले सर्भरहरु बाट प्याकेज सुची फेरि लोड " +#~ "गर्नुपर्दछ. के तपाईं यो अहिले गर्न चाहनुहुन्छ?" #~ msgid "" #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया " -#~ "स्थिति ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस" +#~ "यसको मतलब स्थापना गरिएका प्याकेजहरु को केहि निर्भरताहरु सन्तुष्ट छैनन. कृपया स्थिति " +#~ "ठीक गर्नको लागि \"साइनाप्टिक\" अथवा \"एपिटि-गेट\" प्रयोग गर्नुहोस" #~ msgid "It is not possible to upgrade all packages." #~ msgstr "सबै प्याकेजहरु स्तरवृद्धि गर्न संभव छैन" @@ -1145,15 +1200,15 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" -#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै " -#~ "प्याकेजहरुको स्थापन र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि " -#~ "साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग " -#~ "गर्नुहोस" +#~ "यसको मतलब प्याकेजहरु को उचित स्तरवृद्धि बाहेक केहि अधिक कार्य (जस्तै प्याकेजहरुको स्थापन " +#~ "र विस्थापन) आवश्यक छ. कृपया स्थिति ठीक गर्नको लागि साइनाप्टिक \"स्मार्ट स्तरवृद्धि\" " +#~ "अथवा \"एपिटि-गेट डिस्ट-स्तरवृद्धि\" प्रयोग गर्नुहोस" #~ msgid "The following packages are not upgraded: " #~ msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन " #~ msgid "Initializing and getting list of updates..." -#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै"
\ No newline at end of file +#~ msgstr "अद्यावधिकहरुको इनिसियलाइज गर्दै र सुची प्राप्त गर्दै" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-18 12:07+0000\n" "Last-Translator: Michiel Sikkes <michiel@eyesopened.nl>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\n" @@ -16,38 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -81,6 +80,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -91,33 +91,35 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -130,41 +132,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -172,18 +175,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -196,158 +200,183 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -355,6 +384,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -378,8 +408,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -391,38 +421,50 @@ msgid "Details" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -436,7 +478,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -455,52 +497,56 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 -msgid "Show details" +msgid "Release Notes" msgstr "" #: ../data/UpdateManager.glade.h:14 -msgid "Show progress of single files" +msgid "Show details" msgstr "" #: ../data/UpdateManager.glade.h:15 -msgid "Software Updates" +msgid "Show progress of single files" msgstr "" #: ../data/UpdateManager.glade.h:16 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" @@ -564,7 +610,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -594,11 +640,11 @@ msgid "<b>Comment:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -615,8 +661,8 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -646,9 +692,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -695,96 +739,114 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr ""
\ No newline at end of file +msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-04-03 11:03+0200\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -494,7 +494,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -517,7 +517,7 @@ msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Check for available updates" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 @@ -831,7 +831,7 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:128 +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Offisielt støttet" @@ -891,12 +891,6 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Offisielt støttet" - -#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -907,6 +901,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Offisielt støttet" + +#, fuzzy #~ msgid "Installing updates" #~ msgstr "Installerer oppdateringer..." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-18 12:07+0000\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n" @@ -17,38 +17,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -82,6 +81,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -92,33 +92,35 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -131,41 +133,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -173,18 +176,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -197,160 +201,184 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -#, fuzzy -msgid "Installing updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -358,6 +386,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -381,8 +410,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -395,38 +424,50 @@ msgid "Details" msgstr "<b>ਵੇਰਵਾ</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 #, fuzzy msgid "_Resume Upgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" @@ -441,7 +482,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -460,55 +501,59 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 +msgid "Release Notes" +msgstr "" + +#: ../data/UpdateManager.glade.h:14 #, fuzzy msgid "Show details" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 #, fuzzy msgid "Software Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." @@ -580,7 +625,7 @@ msgid "_Check for updates automatically:" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -612,14 +657,14 @@ msgid "<b>Comment:</b>" msgstr "<b>ਵੇਰਵਾ</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy -msgid "<b>Sections:</b>" +msgid "<b>Components:</b>" msgstr "<b>ਵੇਰਵਾ</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" +msgstr "" + #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" @@ -637,8 +682,8 @@ msgstr "<b>ਵੇਰਵਾ</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -668,9 +713,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -718,100 +761,126 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy #~ msgid "Add Software Channels" -#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
\ No newline at end of file +#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 19:34+0000\n" "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n" "Language-Team: Polish <translators@gnomepl.org>\n" @@ -17,38 +17,37 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Co %s dni" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Po %s dniach" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Zaimportuj klucz" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Błąd podczas importowania wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić ten błąd." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -59,11 +58,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Proszę podać nazwę dla płyty" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" @@ -88,6 +87,7 @@ msgstr "Nie można zaktualizować wymaganych meta-pakietów" msgid "A essential package would have to be removed" msgstr "Niezbędny pakiet musiałby zostać usunięty" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" @@ -100,11 +100,12 @@ msgstr "" "Wystąpił nierozwiązywalny problem podczas przetwarzania aktualizacji. Proszę " "zgłosić ten błąd. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -114,22 +115,23 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić ten błąd. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -145,11 +147,12 @@ msgstr "" msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nie odnaleziono poprawnych wpisów" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -157,11 +160,11 @@ msgstr "" "Podczas skanowaia informacji o repozytoriach nie odnaleziono poprawnych " "wpisów potrzebnych do aktualizacji.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -169,11 +172,11 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -181,11 +184,11 @@ msgstr "" "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z " "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -196,18 +199,20 @@ msgstr "" "dysku. Proszę opróżnić kosz i usunąć pliki tymczasowe z poprzednich " "instalacji używając 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Aktualizacja została przerwana. System może znajdować się w stanie " "nienadającym się do użytku. Proszę spróbować naprawić system używając " @@ -225,15 +230,24 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -242,83 +256,100 @@ msgstr "" "poniższych wiadomościach. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Proszę włożyć '%s' do napędu '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Pobieranie zostało zakończone." -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Pobieranie pliku %li z %li z prędkością %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s pozostało" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Pobieranie pliku %li z %li z prędkością %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Instalowanie pakietów" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Pobieranie informacji o zmianach..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Nie można było zainstalować '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Aktualizacja została przerwana. Proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Proszę zgłosić ten błąd i w raporcie dołączyć pliki ~/dist-upgrade.log oraz " "~/dist-upgrade-apt.log. Aktualizacja została przerwana. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -326,7 +357,7 @@ msgstr[0] "Pakietów do usunięcia: %s." msgstr[1] "Pakietów do usunięcia: %s." msgstr[2] "Pakietów do usunięcia: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -334,7 +365,7 @@ msgstr[0] "Nowych pakietów do zainstalowania: %s." msgstr[1] "Nowych pakietów do zainstalowania: %s." msgstr[2] "Nowych pakietów do zainstalowania: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -342,51 +373,52 @@ msgstr[0] "Pakietów do zaktualizowania: %s." msgstr[1] "Pakietów do zaktualizowania: %s." msgstr[2] "Pakietów do zaktualizowania: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Konieczne pobranie ogółem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Nie można było odnaleźć żadnych aktualizacji" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "System został już zaktualizowany." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Usuń %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Wymagane ponowne uruchomienie komputera" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -396,6 +428,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -423,9 +456,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Rozpocząć aktualizację?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu \"Dapper\" " "6.06</span>" @@ -439,38 +473,51 @@ msgid "Details" msgstr "Szczegóły" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Pobieranie i instalowanie aktualizacji" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modyfikowanie kanałów aktualizacji" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Przygotowywanie aktualizacji" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Ponowne uruchamianie systemu" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Aktualizacja Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Wczytaj ponownie" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "Zgłoś błąd" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "Uruchom ponownie" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "Wznów aktualizację" @@ -484,12 +531,13 @@ msgstr "" "<b><big>Wymagane jest ręczne sprawdzenie dostępności aktualizacji</big></b>\n" "\n" "System nie sprawdza dostępności aktualizacji automatycznie. To ustawienie " -"można to zmienić w \"System\" -> \"Administracja\" -> \"Software " -"Properties\"." +"można to zmienić w \"System\" -> \"Administracja\" -> \"Software Properties" +"\"." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -512,30 +560,35 @@ msgid "Changes" msgstr "Zmiany" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Sprawdź dostępne aktualizacje" +#, fuzzy +msgid "Chec_k" +msgstr "Sprawdź" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Opis" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Wyświetl szczegóły" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Pokaż postęp pobierania poszczególnych plików" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -543,23 +596,23 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Aktualizuj" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "Sprawdź" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Ukryj tę informację w przyszłości" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instaluj aktualizacje" @@ -623,7 +676,8 @@ msgid "_Check for updates automatically:" msgstr "Sprawdzaj dostępność aktualizacji automatycznie:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "Pobieraj aktualizacje w tle, ale ich nie instaluj" #: ../data/SoftwareProperties.glade.h:16 @@ -659,12 +713,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Komentarz:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Dystrybucja:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenty</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sekcje:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Dystrybucja:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -680,16 +735,16 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></big>\n" "\n" -"Wiersz APT zawiera typ, lokalizację i zawartość kanału. Dla przykładu " -"<i>\"deb http://ftp.debian.org sarge main\"</i>." +"Wiersz APT zawiera typ, lokalizację i zawartość kanału. Dla przykładu <i>" +"\"deb http://ftp.debian.org sarge main\"</i>." #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -716,11 +771,9 @@ msgid "Scanning CD-ROM" msgstr "Przeszukiwanie CD-ROMu" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "Dod_aj kanał" -msgstr[1] "Dod_aj kanały" -msgstr[2] "Dod_aj kanały" +msgstr "Dod_aj kanał" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -771,101 +824,137 @@ msgstr "" msgid "The window size" msgstr "Rozmiar okna" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 6.06" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Aktualizacje dla Ubuntu 6.06" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Aktualizacje dla Ubuntu 6.06 (Backporty)" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Aktualizacje dla Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Wspierane oficjalnie" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "O ograniczonych prawach kopiowania" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Debiana 3.1 \"Sarge\"" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (wersja testowa)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (wersja unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Wspierane oficjalnie" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" + +#~ msgid "Installing updates" +#~ msgstr "Instalowanie pakietów" + +#~ msgid "Check for available updates" +#~ msgstr "Sprawdź dostępne aktualizacje" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sekcje:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Wspierane oficjalnie" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Wczytuje ponownie z serwera informacje o pakietach." @@ -917,16 +1006,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Dostępne aktualizacje</b></big>\n" #~ "\n" -#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając " -#~ "przycisk Instaluj." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenty</b>" +#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować " +#~ "klikając przycisk Instaluj." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repozytorium</b>" @@ -946,20 +1032,21 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "" #~ "<big><b>Klucze autentykacyjne</b></big>\n" #~ "\n" -#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. Klucz " -#~ "pozwala na sprawdzenie integralności oprogramowania które jest pobierane z " -#~ "sieci." +#~ "W tym oknie dialogowym można dodawać i usuwać klucze autentykacyjne. " +#~ "Klucz pozwala na sprawdzenie integralności oprogramowania które jest " +#~ "pobierane z sieci." #~ msgid "A_uthentication" #~ msgstr "A_utentykacja" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Dodaje plik z kluczem do listy zaufanych kluczy. Należy upewnić sie, że " -#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego źródła. " +#~ "został otrzymany bezpiecznym kanałem oraz, że pochodzi z zaufanego " +#~ "źródła. " #~ msgid "Automatically clean _temporary packages files" #~ msgstr "Usuwaj _tymczasowe pliki z pakietami" @@ -981,11 +1068,11 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to na " -#~ "klucze zainstalowane przez użytkownika." +#~ "Przywraca domyślne klucze rozprowadzane wraz z dystrybucją. Nie wpływa to " +#~ "na klucze zainstalowane przez użytkownika." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Maksymalny rozmiar pamięci podręcznej" @@ -1009,8 +1096,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "This means that some dependencies of the installed packages are not " #~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation." #~ msgstr "" -#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione.Aby " -#~ "rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-get\"." +#~ "Oznacza to, że pewne zależności instalowanych pakietów nie są spełnione." +#~ "Aby rozwiązać problem proszę skorzystać z programu \"Synaptic\" lub \"apt-" +#~ "get\"." #~ msgid "It is not possible to upgrade all packages." #~ msgstr "Nie można uaktualnić wszystkich pakietów" @@ -1018,12 +1106,13 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "Oznacza to, że do aktualizacji wymagane sa dodatkowe działania (takie jak " -#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać z " -#~ "funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać polecenie " -#~ "\"apt-get dist-upgrade\"." +#~ "dodanie lub usunięcie pakietów). Aby rozwiązać problem proszę skorzystać " +#~ "z funkcji \"sprytnej aktualizacji\" programu Synaptic lub wykonać " +#~ "polecenie \"apt-get dist-upgrade\"." #~ msgid "The following packages are not upgraded: " #~ msgstr "Następujące pakiety nie są aktualizowane: " @@ -1037,24 +1126,21 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić czy połączenie " -#~ "z internetem jest aktywne" +#~ "Nie udało się pobrać informacji o zmianach. Proszę sprawdzić czy " +#~ "połączenie z internetem jest aktywne" #~ msgid "Version %s: \n" #~ msgstr "Wersja %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Pobieranie informacji o zmianach..." - #~ msgid "The updates are being applied." #~ msgstr "Aktualizacje są teraz instalowane." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy " -#~ "najpierw zamknąć aplikację która teraz działa." +#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. " +#~ "Należy najpierw zamknąć aplikację która teraz działa." #~ msgid "Updating package list..." #~ msgstr "Aktualizacja listy pakietów..." @@ -1073,13 +1159,14 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna wersja " -#~ "nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych krytycznych " -#~ "uaktualnień. Informacje o tym jak uaktualnić dystrybucję można znaleźć na " -#~ "stronie http://www.ubuntulinux.org (Witryna w języku angielskim)" +#~ "Proszę uaktualnić dystrybucję do nowszej wersji Ubuntu Linux. Obecna " +#~ "wersja nie będzie już otrzymywać uaktualnień bezpieczeństwa oraz innych " +#~ "krytycznych uaktualnień. Informacje o tym jak uaktualnić dystrybucję " +#~ "można znaleźć na stronie http://www.ubuntulinux.org (Witryna w języku " +#~ "angielskim)" #, fuzzy #~ msgid "There is a new release of Ubuntu available!" @@ -1090,11 +1177,11 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. Należy " -#~ "najpierw zamknąć aplikację która teraz działa." +#~ "Naraz można uruchomić tylko jedną aplikację zarządzającą pakietami. " +#~ "Należy najpierw zamknąć aplikację która teraz działa." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Inicjowanie i pobieranie listy aktualizacji..." @@ -1142,28 +1229,28 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgstr "Repozytoria zmienione" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "Zmieniły się informacje o repozytoriach. Kopia zapasowa oryginalnego pliku " -#~ "sources.list została zapisana w %s.save. \n" +#~ "Zmieniły się informacje o repozytoriach. Kopia zapasowa oryginalnego " +#~ "pliku sources.list została zapisana w %s.save. \n" #~ "\n" -#~ "Należy ponownie odczytać listę pakietów z serwerów aby zmiany były widoczne. " -#~ "Czy chcesz zrobić to teraz?" +#~ "Należy ponownie odczytać listę pakietów z serwerów aby zmiany były " +#~ "widoczne. Czy chcesz zrobić to teraz?" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Dostępne aktualizacje</b></big>\n" #~ "\n" -#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować klikając " -#~ "przycisk Instaluj." +#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować " +#~ "klikając przycisk Instaluj." #~ msgid "CD disk" -#~ msgstr "Płyta CD"
\ No newline at end of file +#~ msgstr "Płyta CD" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-25 21:49+0000\n" "Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n" @@ -15,41 +15,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Todos os %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Depois de %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que seleccionou não pôde ser removida. Por favor reporte este erro." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +59,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" @@ -89,6 +88,7 @@ msgstr "Não foi possível actualizar os meta-pacotes necessários" msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" @@ -101,11 +101,12 @@ msgstr "" "Um problema irresolúvel ocorreu ao calcular a actualização. Por favor " "reporte este erro. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -115,23 +116,24 @@ msgstr "" "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " "lista de pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -149,11 +151,12 @@ msgstr "" msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nenhuma entrada válida encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -161,11 +164,11 @@ msgstr "" "Ao pesquisar o seu repositório de informação não foi encontrada nenhuma " "entrada válida de actualização.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -173,11 +176,11 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -186,11 +189,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -201,18 +204,20 @@ msgstr "" "Esvazie o Lixo e remova pacotes temporários de instalações anteriores usando " "'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "A actualização abortará agora. O seu sistema poderá estar num estado " "inutilizável. Por favor tente 'sudo apt-get install -f' ou use o Synaptic " @@ -230,16 +235,25 @@ msgstr "" "A actualização abortará agora. Por favor verifique a sua ligação à internet " "ou media de instalação e volte a tentar. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 #, fuzzy msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -248,149 +262,166 @@ msgstr "" "abaixo para mais informação. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor insira '%s' no leitor '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "O Download está completo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "A descarregar ficheiro %li de %li com %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s restantes" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "A descarregar ficheiro %li de %li com %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "A instalar actualizações" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "A actualização abortará agora. Reporte este erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -"Por favor reporte este erro e inclua os ficheiros ~/dist-upgrade.log e " -"~/dist-upgrade-apt.log no seu relatório. A actualização abortará agora. " +"Por favor reporte este erro e inclua os ficheiros ~/dist-upgrade.log e ~/" +"dist-upgrade-apt.log no seu relatório. A actualização abortará agora. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será actualizado." msgstr[1] "%s pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Tem de efectuar o download de um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A actualização poderá demorar várias horas e não poderá ser cancelada a " "qualquer instante posteriormente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Impossível de encontrar quaisquer actualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "O seu sistema já foi actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -399,6 +430,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -425,9 +457,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a actualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu \"Dapper\" " "6.04</span>" @@ -441,38 +474,51 @@ msgid "Details" msgstr "Detalhes" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "A efectuar o download e a instalar actualizações" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "A modificar os repositórios de software" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "A preparar actualização" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "A reiniciar o sistema" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "A actualizar o Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Reler" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Reportar um erro" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Reiniciar agora" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Retomar Actualização?" @@ -484,16 +530,17 @@ msgid "" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -"<b><big>Tem de reler manualmente a última informação sobre " -"actualizações</big></b>\n" +"<b><big>Tem de reler manualmente a última informação sobre actualizações</" +"big></b>\n" "\n" "O seu sistema não procura por actualizações automaticamente. Pode configurar " "este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do " "Software\"." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -516,30 +563,35 @@ msgid "Changes" msgstr "Alterações" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Verificar por actualizações disponíveis" +#, fuzzy +msgid "Chec_k" +msgstr "_Verificar" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Mostrar detalhes" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostrar progresso de ficheiros individuais" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizações de Software" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -547,23 +599,23 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Actualizações" @@ -630,7 +682,8 @@ msgid "_Check for updates automatically:" msgstr "_Procurar por actualizações automaticamente:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Descarregar actualizações silenciosamente, sem as instalar" #: ../data/SoftwareProperties.glade.h:16 @@ -667,12 +720,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comentários:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribuição:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Comentários:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Secções:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribuição:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -688,8 +742,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -725,10 +779,9 @@ msgid "Scanning CD-ROM" msgstr "A pesquisar o CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Adicionar Repositório" -msgstr[1] "_Adicionar Repositórios" +msgstr "_Adicionar Repositório" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -779,101 +832,137 @@ msgstr "" msgid "The window size" msgstr "Tamanho da Janela" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 \"Dapper Drake\"" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 Actualizações de Segurança" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 Actualizações" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 Backports" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Actualizações de Segurança" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Actualizações" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Backports" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suportado Oficialmente" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Direitos de autor restritos" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Suportado Oficialmente" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatível-DFSG com Dependências Não-Livres" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" + +#~ msgid "Installing updates" +#~ msgstr "A instalar actualizações" + +#~ msgid "Check for available updates" +#~ msgstr "Verificar por actualizações disponíveis" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Secções:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "Reload the latest information about updates" #~ msgstr "Reler a última informação sobre actualizações" @@ -886,8 +975,8 @@ msgstr "Software compatível-DFSG" #~ "\n" #~ "Need to get the changes from the central server" #~ msgstr "" -#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de " -#~ "alterações</span>\n" +#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de alterações</" +#~ "span>\n" #~ "\n" #~ "É necessário obter as alterações de um servidor central" @@ -896,8 +985,8 @@ msgstr "Software compatível-DFSG" #~ msgid "" #~ "There is not enough free space on your system to download the required " -#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " -#~ "clean'" +#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" +#~ "get clean'" #~ msgstr "" #~ "Não existe espaço suficiente no seu sistema para descarregar os pacotes " #~ "necessários. Por favor liberte algum espaço antes de tentar novamente por " @@ -910,8 +999,8 @@ msgstr "Software compatível-DFSG" #~ "Some problem occured during the fetching of the packages. This is most " #~ "likely a network problem. Please check your network and try again. " #~ msgstr "" -#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de um " -#~ "problema de rede. Por favor verifique a rede e tente novamente. " +#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de " +#~ "um problema de rede. Por favor verifique a rede e tente novamente. " #~ msgid "" #~ "%s packages are going to be removed.\n" @@ -936,8 +1025,8 @@ msgstr "Software compatível-DFSG" #~ msgstr "Tem a certeza que pretende cancelar?" #~ msgid "" -#~ "Canceling during a upgrade can leave the system in a unstable state. It is " -#~ "strongly adviced to continue the operation. " +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " #~ msgstr "" #~ "Cancelar durante uma actualização pode deixar o seu sistema num estado " #~ "instável. É fortemente aconselhado a prosseguir a operação. " @@ -958,4 +1047,4 @@ msgstr "Software compatível-DFSG" #~ msgstr "Propriedades dos Software" #~ msgid "CD" -#~ msgstr "CD"
\ No newline at end of file +#~ msgstr "CD" diff --git a/po/pt_BR.po b/po/pt_BR.po index b530a5ed..cfc4a42e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 01:47+0000\n" "Last-Translator: LKRaider <paul@eipper.com.br>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" @@ -16,42 +16,41 @@ msgstr "" "X-Poedit-Country: BRAZIL\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Após %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que você selecionou não pôde se removida. Por favor reporte isto " "como um erro." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -62,11 +61,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -91,6 +90,7 @@ msgstr "Não foi possível atualizar os meta-pacotes requeridos" msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" @@ -103,11 +103,12 @@ msgstr "" "Um problema sem resolução ocorreu enquanto calculando a atualização. Por " "favor reporte isto como um erro. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -117,12 +118,12 @@ msgstr "" "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " "não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -130,11 +131,12 @@ msgstr "" "Não foi possível instalar um pacote requerido. Por favor reporte isto como " "um erro. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -152,11 +154,12 @@ msgstr "" msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Nenhuma entrada válida encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" @@ -164,11 +167,11 @@ msgstr "" "Enquanto analisava as informações de repositórios não foi encontrada uma " "entrada válida para a atualização.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -176,11 +179,11 @@ msgstr "" "Atualizando a informações de repositórios resultou em um arquivo inválido. " "Por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -189,11 +192,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -204,18 +207,20 @@ msgstr "" "em disco. Limpe a sua lixeira e remova pacotes temporários de instalações " "anteriores executando 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "A atualização será abortada agora. Seu sistema pode estar em um estado " "inutilizável. Por favor tente executar 'sudo apt-get install -f' ou entrar " @@ -233,15 +238,24 @@ msgstr "" "A atualização será abortada agora. Por favor verifique sua conexão à " "Internet ou mídia de instalação e tente de novo. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -250,146 +264,164 @@ msgstr "" "abaixo para maiores informações. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Por favor insira '%s' no drive '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "O Download está completo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Obtendo arquivo %li de %li a %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "Faltam %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Obtendo arquivo %li de %li a %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Instalando Atualizações" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "A atualização será abortada agora. Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Por favor reporte isto como um bug e inclua os arquivos ~/dist-upgrade.log e " "~/dist-upgrade-apt.log em seu relatório. O upgrade abortará agora. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será atualizado." msgstr[1] "%s pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Você precisa obter um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A atualização pode levar diversas horas e não poderá ser cancelada depois." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Não foi possível encontrar nenhuma atualização" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Seu sistema já foi atualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Reinicialização requerida" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -399,6 +431,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -418,17 +451,17 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:5 msgid "<b><big>Restart the system to complete the upgrade</big></b>" -msgstr "" -"<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>" +msgstr "<b><big>Reinicie o seu sistema para finalizar a atualização</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:6 msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a Atualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu \"Dapper\" " "6.04</span>" @@ -442,38 +475,51 @@ msgid "Details" msgstr "Detalhes" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Obtendo e instalando as atualizações" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Modificando os canais de software" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Preparando a Atualização" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Reiniciando o sistema" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminal" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Atualizando o Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Recarregar" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "Reportar _Erro" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Reiniciar Agora" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "Continua_r Atualização" @@ -491,8 +537,9 @@ msgstr "" "de Programas\"." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -515,30 +562,35 @@ msgid "Changes" msgstr "Mudanças" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Procurar updates disponíveis" +#, fuzzy +msgid "Chec_k" +msgstr "_Verificar" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descrição" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Notas de Versão" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Exibir Detalhes" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Exibir progresso de arquivos únicos" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Atualizações de Programas" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -546,23 +598,23 @@ msgstr "" "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " "segurança, e prover novas funcionalidades para você." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Atualizações" @@ -629,7 +681,8 @@ msgid "_Check for updates automatically:" msgstr "Verifi_car por atualizações automaticamente:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Obter atualizações em segundo plano, mas não instalá-las" #: ../data/SoftwareProperties.glade.h:16 @@ -665,12 +718,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -686,14 +740,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Insira a linha completa do APT do canal que você quer " -"adicionar</b></big>\n" +"<big><b>Insira a linha completa do APT do canal que você quer adicionar</b></" +"big>\n" "\n" "A linha do APT contém o tipo, a localização e as seções do canal, por " "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -723,10 +777,9 @@ msgid "Scanning CD-ROM" msgstr "Procurando no CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Adicionar Canal" -msgstr[1] "_Adicionar Canais" +msgstr "_Adicionar Canal" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -777,101 +830,137 @@ msgstr "" msgid "The window size" msgstr "O tamanho da janela" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Atualizações do Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Backports do Ubuntu 6.04" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Atualizações de Segurança do Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Atualizações do Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Backports do Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suporte oficial" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Restrito por copyright" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Mantido pela Comunidade (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\"" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Suportado Oficialmente" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Programa compatível com a DFSG mas com dependências não-livres" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" + +#~ msgid "Installing updates" +#~ msgstr "Instalando Atualizações" + +#~ msgid "Check for available updates" +#~ msgstr "Procurar updates disponíveis" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Suportado Oficialmente" + #~ msgid "Reload the latest information about updates" #~ msgstr "Recarregar as últimas informações sobre atualizações" @@ -906,12 +995,12 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "There is not enough free space on your system to download the required " -#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-get " -#~ "clean'" +#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-" +#~ "get clean'" #~ msgstr "" #~ "Não há espaço suficiente no seu sistema para obter os pacotes requeridos. " -#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-get " -#~ "clean'" +#~ "Por favor libere algum espaço antes de tentar novamente. Como: 'sudo apt-" +#~ "get clean'" #~ msgid "Error fetching the packages" #~ msgstr "Erro ao obter os pacotes" @@ -921,8 +1010,8 @@ msgstr "Programas não compatíveis com a DFSG" #~ "likely a network problem. Please check your network and try again. " #~ msgstr "" #~ "Alguns problemas ocorreram durante a obtenção dos pacotes. Isso é bem " -#~ "provável que seja por problemas de rede. Por favor verifique a sua conexão " -#~ "de rede e tente novamente. " +#~ "provável que seja por problemas de rede. Por favor verifique a sua " +#~ "conexão de rede e tente novamente. " #~ msgid "" #~ "%s packages are going to be removed.\n" @@ -947,11 +1036,11 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "Tem certeza que deseja cancelar?" #~ msgid "" -#~ "Canceling during a upgrade can leave the system in a unstable state. It is " -#~ "strongly adviced to continue the operation. " +#~ "Canceling during a upgrade can leave the system in a unstable state. It " +#~ "is strongly adviced to continue the operation. " #~ msgstr "" -#~ "Cancelar durante a atualização pode deixar o sistema em um estado instável. " -#~ "É fortemente recomendável que a operação continue. " +#~ "Cancelar durante a atualização pode deixar o sistema em um estado " +#~ "instável. É fortemente recomendável que a operação continue. " #, fuzzy #~ msgid "<b>Sources</b>" @@ -974,16 +1063,13 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Components</b>" +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -1003,16 +1089,16 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "" #~ "<big><b>Authentication keys</b></big>\n" #~ "\n" -#~ "You can add and remove authentication keys in this dialogue. A key makes it " -#~ "possible to check verify the integrity of the software you download." +#~ "You can add and remove authentication keys in this dialogue. A key makes " +#~ "it possible to check verify the integrity of the software you download." #~ msgid "A_uthentication" #~ msgstr "A_uthentication" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Add a new key file to the trusted keyring. Make sure that you got the key " #~ "over a secure channel and that you trust the owner. " @@ -1037,11 +1123,11 @@ msgstr "Programas não compatíveis com a DFSG" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Restore the default keys shiped with the distribution. This will not change " -#~ "user-installed keys." +#~ "Restore the default keys shiped with the distribution. This will not " +#~ "change user-installed keys." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Set _maximum size for the package cache" @@ -1074,11 +1160,13 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgid "The following packages are not upgraded: " #~ msgstr "The following packages are not upgraded: " @@ -1096,18 +1184,15 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Downloading changes..." - #~ msgid "The updates are being applied." #~ msgstr "The updates are being applied." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Updating package list..." #~ msgstr "Updating package list..." @@ -1126,33 +1211,33 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "There is a new release of Ubuntu available!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgid "Never show this message again" #~ msgstr "Never show this message again" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initializing and getting list of updates..." @@ -1200,14 +1285,14 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "Repositories changed" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" #~ msgstr "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1215,10 +1300,10 @@ msgstr "Programas não compatíveis com a DFSG" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button."
\ No newline at end of file +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." @@ -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-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:19+0000\n" "Last-Translator: Dan Damian <dand@codemonkey.ro>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n" @@ -17,43 +17,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 -#, fuzzy +#: ../SoftwareProperties/SoftwareProperties.py:110 +#, fuzzy, python-format msgid "Every %s days" msgstr "La fiecare %s zile" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "După %s zile" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 #, fuzzy msgid "Import key" msgstr "Importă cheie" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 #, fuzzy msgid "Error importing selected file" msgstr "Eroare la importarea fişierului ales" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." -#: ../SoftwareProperties/SoftwareProperties.py:406 +#: ../SoftwareProperties/SoftwareProperties.py:437 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Cheia selectată nu poate fi ştearsă. Raportaţi acest lucru ca un bug " "(eroare)." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -64,11 +63,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Introduceţi un nume pentru disc" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 #, fuzzy msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în dispozitiv:" @@ -91,6 +90,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -101,23 +101,24 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -126,11 +127,12 @@ msgstr "" "Nu am reuşit să instalez pachetul cerut. Puteţi raporta acest lucru ca bug " "(eroare). " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -143,41 +145,42 @@ msgstr "" msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -185,18 +188,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -209,98 +213,123 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Un alt manager de pachete rulează" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Actualizare completă" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Descarc modificările..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -308,7 +337,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -316,7 +345,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -324,49 +353,50 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sistemul dvs. este la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -374,6 +404,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -397,8 +428,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -411,38 +442,50 @@ msgid "Details" msgstr "<b>Detalii</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 #, fuzzy msgid "_Resume Upgrade" msgstr "Actualizare completă" @@ -457,7 +500,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -476,53 +519,57 @@ msgid "Changes" msgstr "Modificări" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Descriere" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizări software" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Actualizare completă" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Instalează" @@ -594,7 +641,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -626,12 +673,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Comentariu:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribuţie:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componente</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Secţiuni:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribuţie:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -649,8 +697,8 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -658,9 +706,9 @@ msgstr "" "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o " "adăugaţi</b></big>\n" "\n" -"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de " -"exemplu<i>\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o " -"descriere detaliată a sintaxei în documentaţie." +"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu<i>" +"\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere " +"detaliată a sintaxei în documentaţie." #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -688,10 +736,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -739,111 +784,135 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:91 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:108 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "Actualizări de securitate Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Pachete suportate oficial" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Copyright restrictiv" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizări de securitate Debian Stable" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Pachete suportate oficial" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Secţiuni:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Pachete suportate oficial" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Reîncarcă informaţiile despre pachete de pe server." @@ -884,16 +953,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Actualizări disponibile</b></big>\n" #~ "\n" -#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând " -#~ "pe butonul Instalează." - -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Componente</b>" +#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările " +#~ "apăsând pe butonul Instalează." #~ msgid "<b>Repository</b>" #~ msgstr "<b>Locaţie</b>" @@ -913,8 +979,8 @@ msgstr "" #~ msgstr "" #~ "<big><b>Chei autentificare</b></big>\n" #~ "\n" -#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul unei " -#~ "chei estede a permite verificarea integrităţii unui pachet software " +#~ "Din acest dialog puteţi adăuga sau şterge chei de autentificare. Rolul " +#~ "unei chei estede a permite verificarea integrităţii unui pachet software " #~ "descărcat." #~ msgid "A_uthentication" @@ -922,8 +988,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Adăugaţi o nouă cheie în keyring-ul de încredere. Asiguraţi-vă că aţi " #~ "obţinut cheia printr-un canal sigur şi că aveţi încredere în proprietarul " @@ -940,8 +1006,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Restaurează cheile implicite furnizate împreună cu distribuţia. Această " #~ "acţiune nu va influenţa cheile instalate ca utilizator." @@ -972,15 +1038,12 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Versiunea %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Descarc modificările..." - #~ msgid "The updates are being applied." #~ msgstr "Actualizările sunt în curs de aplicare." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să " #~ "închideţi ceilalţi manageri mai întâi." @@ -1003,8 +1066,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Puteţi rula doar un singur manager de pachete la un moment dat. Vă rog să " #~ "închideţi ceilalţi manageri mai întâi." @@ -1047,8 +1110,8 @@ msgstr "" #~ msgstr "Locaţiile au fost schimbate" #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" @@ -1062,13 +1125,13 @@ msgstr "" #, fuzzy #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Actualizări disponibile</b></big>\n" #~ "\n" -#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările apăsând " -#~ "pe butonul Instalează." +#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările " +#~ "apăsând pe butonul Instalează." #~ msgid "0" -#~ msgstr "0"
\ No newline at end of file +#~ msgstr "0" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-18 12:07+0000\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -24,42 +24,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 #, fuzzy msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:406 +#: ../SoftwareProperties/SoftwareProperties.py:437 #, fuzzy -msgid "" -"The key you selected could not be removed. Please report this as a bug." +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -67,11 +66,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -93,6 +92,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -104,34 +104,36 @@ msgid "" "this as a bug. " msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -144,42 +146,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -187,18 +190,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -211,162 +215,188 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Amahinduka" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sisitemu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -374,6 +404,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -397,8 +428,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -411,39 +442,52 @@ msgid "Details" msgstr "<B B" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 #, fuzzy +msgid "_Replace" +msgstr "Kongera Gutangiza" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 +#, fuzzy msgid "_Resume Upgrade" msgstr "Byarangiye" @@ -457,7 +501,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -476,59 +520,63 @@ msgid "Changes" msgstr "Amahinduka" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" +msgstr "" + +#: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" msgstr "" # #-#-#-#-# basctl.pot (PACKAGE VERSION) #-#-#-#-# # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text # #-#-#-#-# basctl.pot (PACKAGE VERSION) #-#-#-#-# -#: ../data/UpdateManager.glade.h:11 +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Byarangiye" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" @@ -599,7 +647,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -632,12 +680,12 @@ msgstr "<B B" #: ../data/SoftwarePropertiesDialogs.glade.h:10 #, fuzzy -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "<B B" #: ../data/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "<B B" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -658,8 +706,8 @@ msgstr "<B B" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -694,8 +742,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 #, fuzzy @@ -744,112 +791,134 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:91 #, fuzzy msgid "Ubuntu 5.10 Security Updates" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:108 #, fuzzy msgid "Ubuntu 5.10 Updates" msgstr "5" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "5" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 #, fuzzy msgid "Restricted copyright" msgstr "Uburenganzira bw'umuhimbyi" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "4. 10" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<B B" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri" @@ -902,15 +971,11 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto" #, fuzzy -#~ msgid "<b>Components</b>" -#~ msgstr "<B B" - -#, fuzzy #~ msgid "<b>Repository</b>" #~ msgstr "<B B" @@ -929,13 +994,13 @@ msgstr "" #~ "You can add and remove authentication keys in this dialog. A key makes it " #~ "possible to verify the integrity of the software you download." #~ msgstr "" -#~ "<B Utubuto B Kongeramo Na Gukuraho... Utubuto in iyi Ikiganiro A Urufunguzo " -#~ "Kuri Kugenzura... i Bya i Gufungura" +#~ "<B Utubuto B Kongeramo Na Gukuraho... Utubuto in iyi Ikiganiro A " +#~ "Urufunguzo Kuri Kugenzura... i Bya i Gufungura" #, fuzzy #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i " #, fuzzy @@ -960,8 +1025,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "i Mburabuzi Utubuto Na: i Ikwirakwiza... OYA Guhindura>> Ukoresha: Utubuto" @@ -994,7 +1059,8 @@ msgstr "" #~ msgid "" #~ "This means that besides the actual upgrade of the packages some further " #~ "action (such as installing or removing packages) is required. Please use " -#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the situation." +#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the " +#~ "situation." #~ msgstr "" #~ "i Bya i Igikorwa Nka gukora iyinjizaporogaramu:%s Cyangwa ni Bya ngombwa " #~ "Gukoresha Cyangwa Kubona Kuri i" @@ -1019,17 +1085,13 @@ msgstr "" #~ msgstr "Verisiyo \n" #, fuzzy -#~ msgid "Downloading changes..." -#~ msgstr "Amahinduka" - -#, fuzzy #~ msgid "The updates are being applied." #~ msgstr "Byashyizweho" #, fuzzy #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira" @@ -1056,11 +1118,11 @@ msgstr "" #, fuzzy #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi Ibyangombwa " -#~ "HTTP www org kugirango Ibisobanuro" +#~ "Kuri a Verisiyo Bya Verisiyo Oya Kubona Umutekano Cyangwa Ikindi " +#~ "Ibyangombwa HTTP www org kugirango Ibisobanuro" #, fuzzy #~ msgid "There is a new release of Ubuntu available!" @@ -1068,8 +1130,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "A Gishya Na: i ni Bihari HTTP www org kugirango Amabwiriza" #, fuzzy @@ -1078,8 +1140,8 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" #~ "Gukoresha Porogaramu ku i Igihe Gufunga iyi Ikindi Porogaramu Itangira" @@ -1125,9 +1187,9 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "The repository information has changes. A backup copy of your sources.list " -#~ "is stored in %s.save. \n" +#~ "The repository information has changes. A backup copy of your sources." +#~ "list is stored in %s.save. \n" #~ "\n" #~ "You need to reload the package list from the servers for your changes to " #~ "take effect. Do you want to do this now?" -#~ msgstr "Kubika."
\ No newline at end of file +#~ msgstr "Kubika." @@ -7,49 +7,48 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 01:43+0000\n" "Last-Translator: Martin Mancuska <borgcube@centrum.sk>\n" "Language-Team: Slovak <sk@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Po %s dňoch" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importovať kľúč" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Chyba pri importovaní vybraného súboru" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný súbor nemusí obsahovať GPG kľúč alebo môže byť poškodený." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný kľúč nemohol byť odstránený. Prosím, nahláste to ako bug." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +59,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Prosím, zadajte názov disku" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" @@ -88,6 +87,7 @@ msgstr "Nemôžem upgradovať požadované meta-balíčky" msgid "A essential package would have to be removed" msgstr "Základný balíček by musel byt odstránený" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať upgrade" @@ -100,11 +100,12 @@ msgstr "" "Počas počítania upgradu sa vyskytol neriešiteľný problém. Prosím, nahláste " "to ako bug. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíčkov" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -114,23 +115,24 @@ msgstr "" "problémom v sieti. Môžete to skúsiť neskôr. Nižšie je uvedený zoznam " "neoverených balíčkov." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" "Nebolo možné nainštalovať požadovaný balíček. Prosím, nahláste to ako bug. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -143,41 +145,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -185,18 +188,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -209,96 +213,120 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -306,7 +334,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -314,7 +342,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -322,48 +350,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -371,6 +400,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -394,8 +424,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -407,38 +437,50 @@ msgid "Details" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -452,7 +494,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -471,52 +513,56 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 -msgid "Show details" +msgid "Release Notes" msgstr "" #: ../data/UpdateManager.glade.h:14 -msgid "Show progress of single files" +msgid "Show details" msgstr "" #: ../data/UpdateManager.glade.h:15 -msgid "Software Updates" +msgid "Show progress of single files" msgstr "" #: ../data/UpdateManager.glade.h:16 +msgid "Software Updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" @@ -580,7 +626,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -610,11 +656,11 @@ msgid "<b>Comment:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -631,8 +677,8 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -662,10 +708,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -712,96 +755,114 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" -msgstr ""
\ No newline at end of file +msgstr "" @@ -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-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-27 18:10+0000\n" "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -17,40 +17,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Var %s dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Efter %s dagar" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Importera nyckel" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Fel vid import av vald fil" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." -msgstr "" -"Nyckeln du valde kan inte tas bort. Var vänlig anmäl det som en bugg." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." +msgstr "Nyckeln du valde kan inte tas bort. Var vänlig anmäl det som en bugg." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -61,11 +59,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Skriv in namnet för skivan" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" @@ -89,6 +87,7 @@ msgstr "Kan inte uppdatera obligatoriska meta-paket" msgid "A essential package would have to be removed" msgstr "Ett grundläggande paket skulle behövas tas bort" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Det gick inte beräkna uppdateringen" @@ -101,11 +100,12 @@ msgstr "" "Ett problem som inte gick att lösa uppstod när uppdateringen kontrolerades. " "Rapportera gärna detta som en bugg. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 " @@ -115,12 +115,12 @@ msgstr "" "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista " "med incke autentisierade paket." -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -128,11 +128,12 @@ msgstr "" "Det var inte möjligt att installera ett obligatoriskt paket. Var god " "rapportera detta som en bugg. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -150,22 +151,23 @@ msgstr "" msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Ingen giltig källa funnen" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" "Ingen giltig källa för uppdatering hittades när dina förråd söktes igenom.\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -173,11 +175,11 @@ msgstr "" "Uppdatering av informationen om förråd orsakade en ogiltig fil. Var god " "rabortera detta som en bug." -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -186,11 +188,11 @@ msgstr "" "av nätverks problem, var god kontrolera din nätverks anslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -201,18 +203,20 @@ msgstr "" "papperskorg och ta bort temporära paket från tidigare uppdateringar genom " "att köra 'sudo apt-get clean'." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppdateringarna" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Uppdateringen avbryter nu. Ditt system kan vara i ett instabilt läget. " "Vänligen försök med 'sudo apt-get install -f' eller Synaptic för att fixa " @@ -230,15 +234,25 @@ msgstr "" "Uppdeateringen avbryter nu. Var god kontrollerar din internetanslutning " "eller installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +#, fuzzy +msgid "_Remove" +msgstr "Ta bort" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -247,147 +261,165 @@ msgstr "" "information. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Kontrolerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "Uppdaterar" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Systemuppdateringarna är klara" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Mata in \"%s\" i enheten \"%s\"" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Hämtningen är färdig" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Hämtar hem fil %li av %li med en hastighet av %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s återstår" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Hämtar hem fil %li av %li med en okänd hastighet" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Hämtar hem fil %li av %li med en hastighet av %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Installerar uppdateringar" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "Hämtar ändringar..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Det gick inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "Uppdateringen avbryts. Var vänlig rapportera denna bugg." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Ett kritiskt fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Var vänlig rapportera detta som en bugg och inkludera ~/dist-upgrade.log och " "~/dist-upgrade-apt.log i din rapport. Uppdateringen avbryts. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket kommer att tas bort." msgstr[1] "%s paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s nytt paket kommer att installeras." msgstr[1] "%s nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s packet kommer att uppgraderas." msgstr[1] "%s packet kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Du behöver ladda ner totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "Uppdateringen kan ta flera timmar och kan inte avbrytas under tiden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" "För att förhindra att data försvinner rekomenderas du att stänga alla " "program och dokument." -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Kunde inte hitta några uppdateringar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Ditt system har redan uppdaterats." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Tabort %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "Uppdatera %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Omstart krävs" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -396,6 +428,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -423,9 +456,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Starta uppdateringen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu \"Dapper\" " "6.04</span>" @@ -439,38 +473,51 @@ msgid "Details" msgstr "Detaljer" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Hämtar och installerar uppdateringarna" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "Ändra förråden för program" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Förbereder uppdateringen" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Startar om systemet" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Terminalfönster" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Uppdaterar Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "_Uppdatera" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "_Rapportera Bugg" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Starta om nu" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "_Återuppta uppdateringen" @@ -488,8 +535,9 @@ msgstr "" "\"Programvaruinställningar\"" #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -512,30 +560,36 @@ msgid "Changes" msgstr "Ändringar" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Kontrollera efter tillgängliga uppdateringar" +#, fuzzy +msgid "Chec_k" +msgstr "_Kontrollera" #: ../data/UpdateManager.glade.h:11 +#, fuzzy +msgid "Check the software channels for new updates" +msgstr "All programvara från denna kanal är aktuell." + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Beskrivning" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "Utgåveanteckningar" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "Visa detaljer" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Visa förlopp för enstaka filer" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programvaruuppdateringar" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -543,23 +597,23 @@ msgstr "" "Mjukvaruuppdateringar kan åtgärda fel, avlägsna säkerhetshål eller " "sårbarheter och förse programmet med nya funktioner." -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Uppdateringar" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Kontrollera" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Dölj denna information i framtiden" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installera Uppdateringar" @@ -626,7 +680,8 @@ msgid "_Check for updates automatically:" msgstr "Leta efter uppdateringar _automatiskt:" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "_Hämta uppdateringar i bakgrunden, men installera dom inte" #: ../data/SoftwareProperties.glade.h:16 @@ -662,12 +717,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Distribution:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenter</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Avdelningar:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Distribution:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -683,17 +739,17 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Skriv in en komplett APT-rad för kanalen du vill lägga " -"till</b></big>\n" +"<big><b>Skriv in en komplett APT-rad för kanalen du vill lägga till</b></" +"big>\n" "\n" -"APT-raden inehåller typ, plats och avdelningar för kanalen, till exempel " -"<i>\"deb http://ftp.debian.org sarge main\"</i>." +"APT-raden inehåller typ, plats och avdelningar för kanalen, till exempel <i>" +"\"deb http://ftp.debian.org sarge main\"</i>." #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -720,10 +776,9 @@ msgid "Scanning CD-ROM" msgstr "Söker igenom CD-skivan" #: ../data/SoftwarePropertiesDialogs.glade.h:24 +#, fuzzy msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "_Läggtill kanal" -msgstr[1] "_Läggtill kanal" +msgstr "_Läggtill kanal" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -774,101 +829,137 @@ msgstr "" msgid "The window size" msgstr "Fönstrets storlek" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 Säkerhetsuppdateringar" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 Uppdateringar" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 Backåtanpassningar" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 Uppdateringar" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Bakåtanpassningar" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "Stöds officiellt" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Begränsad upphovsrätt" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Säkerhetsuppdateringar" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "Stöds officiellt" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibel mjukvara med beroenden till ickefri" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel mjukvara" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Hämtar hem fil %li av %li med en okänd hastighet" + +#~ msgid "Installing updates" +#~ msgstr "Installerar uppdateringar" + +#~ msgid "Check for available updates" +#~ msgstr "Kontrollera efter tillgängliga uppdateringar" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Avdelningar:</b>" + +#~ msgid "Oficially supported" +#~ msgstr "Stöds officiellt" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Läs om paketinformationen från servern." @@ -888,8 +979,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ "Need to get the changes from the central server" #~ msgstr "" #~ "<span weight=\"bold\" size=\"larger\">Nätverksinställningar</span>\n" -#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt " -#~ "andra datorer" +#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer " +#~ "åt andra datorer" #~ msgid "Show available updates and choose which to install" #~ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras" @@ -927,9 +1018,6 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgid "<b>Packages to install:</b>" #~ msgstr "<b>Paket att installera:</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenter</b>" - #, fuzzy #~ msgid "<b>Repository</b>" #~ msgstr "<b>Säkerhet</b>" @@ -977,7 +1065,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Följande kanaler är våra kanaltips! " #~ msgid "Changes not found, the server may not be updated yet." -#~ msgstr "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än." +#~ msgstr "" +#~ "Ändringar kunde inte hittas, servern har kanske inte uppdaterats än." #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " @@ -989,9 +1078,6 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgid "Version %s: \n" #~ msgstr "Version %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Hämtar ändringar..." - #~ msgid "The updates are being applied." #~ msgstr "Uppdateringarna verkställs." @@ -999,11 +1085,11 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Uppgradering slutförd" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra " -#~ "programmet först." +#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det " +#~ "andra programmet först." #, fuzzy #~ msgid "Updating package list..." @@ -1034,11 +1120,11 @@ msgstr "Inte DFSG-kompatibel mjukvara" #, fuzzy #~ msgid "" -#~ "This usually means that another package management application (like apt-get " -#~ "or aptitude) already running. Please close that application first" +#~ "This usually means that another package management application (like apt-" +#~ "get or aptitude) already running. Please close that application first" #~ msgstr "" -#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det andra " -#~ "programmet först." +#~ "Du kan endast köra ett pakethanteringsprogram på samma gång. Stäng det " +#~ "andra programmet först." #~ msgid "Initializing and getting list of updates..." #~ msgstr "Initierar och hämtar lista med uppdateringar..." @@ -1204,16 +1290,18 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ "Försäkra dig om att du angav e-postadressen och aktiveringskoden korrekt" #~ msgid "" -#~ "Unable to show help because the help files were missing. Please report this " -#~ "to your vendor." +#~ "Unable to show help because the help files were missing. Please report " +#~ "this to your vendor." #~ msgstr "" -#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till din " -#~ "leverantör." +#~ "Kan inte visa hjälp eftersom hjälpfilerna saknas. Rapportera detta till " +#~ "din leverantör." #~ msgid "" -#~ "Unable to show help because there are no applications available to view help." +#~ "Unable to show help because there are no applications available to view " +#~ "help." #~ msgstr "" -#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är tillgängliga." +#~ "Kan inte visa hjälp eftersom inga program för att visa hjälp är " +#~ "tillgängliga." #~ msgid "Are you sure you want to open %d package information windows?" #~ msgstr "Är du säker på att du vill öppna %d fönster med paketinformation?" @@ -1460,10 +1548,11 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Löser beroenden" #~ msgid "" -#~ "You must agree to the licenses covering this software before installing it." +#~ "You must agree to the licenses covering this software before installing " +#~ "it." #~ msgstr "" -#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan du " -#~ "kan installera den." +#~ "Du måste acceptera villkoren i licenserna som rör denna programvara innan " +#~ "du kan installera den." #~ msgid "I Agree" #~ msgstr "Jag accepterar" @@ -1971,8 +2060,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Kanalprenumerationer på kanal %s" #~ msgid "" -#~ "You do not have permission to subscribe or unsubscribe from channels. You " -#~ "will be unable to make any changes to the subscriptions." +#~ "You do not have permission to subscribe or unsubscribe from channels. " +#~ "You will be unable to make any changes to the subscriptions." #~ msgstr "" #~ "Du har inte rättighet att prenumerera eller säga upp prenumerationer på " #~ "kanaler. Du kommer inte att kunna göra ändringar i prenumerationer." @@ -1993,8 +2082,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Privilegium" #~ msgid "" -#~ "If you remove superuser privileges from yourself, you will be unable to re-" -#~ "add them.\n" +#~ "If you remove superuser privileges from yourself, you will be unable to " +#~ "re-add them.\n" #~ "\n" #~ "Are you sure you want to do this?" #~ msgstr "" @@ -2033,9 +2122,6 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgid "Are you sure you want to delete '%s'?" #~ msgstr "Är du säker på att du vill ta bort \"%s\"?" -#~ msgid "Remove" -#~ msgstr "Ta bort" - #~ msgid "Privileges" #~ msgstr "Privilegier" @@ -2119,8 +2205,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Information" #~ msgid "" -#~ "Unable to show help because it was not found or because you don't have any " -#~ "help viewers available." +#~ "Unable to show help because it was not found or because you don't have " +#~ "any help viewers available." #~ msgstr "" #~ "Kan inte visa hjälp eftersom den inte hittades eller eftersom du inte har " #~ "några hjälpvisare tillgängliga." @@ -2230,8 +2316,10 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgid "Executive Summary" #~ msgstr "Sammanfattning" -#~ msgid "Update packages individually (NOTE: This is an unsupported operation)" -#~ msgstr "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)" +#~ msgid "" +#~ "Update packages individually (NOTE: This is an unsupported operation)" +#~ msgstr "" +#~ "Uppdatera paket individuellt (OBSERVERA: Denna operation stöds inte)" #~ msgid "Actual widget tag" #~ msgstr "Riktig widgettagg" @@ -2375,7 +2463,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Städar upp..." #~ msgid "" -#~ "The packages you requested are being downloaded and installed on your system." +#~ "The packages you requested are being downloaded and installed on your " +#~ "system." #~ msgstr "" #~ "Paketen du begärde håller på att hämtas och installeras på ditt system." @@ -2481,9 +2570,9 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ "packages. You must free up some disk space before you can continue. Some " #~ "options include:" #~ msgstr "" -#~ "<!--html-->Du har inte tillräckligt med diskutrymme för att kunna hämta de " -#~ "begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. Det " -#~ "finns en del alternativ:" +#~ "<!--html-->Du har inte tillräckligt med diskutrymme för att kunna hämta " +#~ "de begärda paketen. Du måste skapa ledigt utrymme innan du kan fortsätta. " +#~ "Det finns en del alternativ:" #~ msgid "<!--html-->Removing some packages from your system" #~ msgstr "<!--html-->Tar bort en del paket från ditt system" @@ -2495,13 +2584,14 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "<a href=\"updater:cache_clear\">Töm din cache</a>." #~ msgid "" -#~ "<font color=#ff0000>Warning!</font> There may not be sufficient disk space " -#~ "to install this package, and installation of this package may fail. You " -#~ "should free up some disk space before continuing." +#~ "<font color=#ff0000>Warning!</font> There may not be sufficient disk " +#~ "space to install this package, and installation of this package may fail. " +#~ "You should free up some disk space before continuing." #~ msgstr "" #~ "<font color=#ff0000>Varning!</font> Det kan finnas otillräckligt med " -#~ "diskutrymme för att installera detta paket, och installation av detta paket " -#~ "kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du fortsätter." +#~ "diskutrymme för att installera detta paket, och installation av detta " +#~ "paket kan misslyckas. Du bör skapa en del ledigt diskutrymme innan du " +#~ "fortsätter." #~ msgid "1 Package" #~ msgstr "1 paket" @@ -2519,24 +2609,25 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "nödvändiga installationer" #~ msgid "<html><body><b>Please wait, loading page...</b></body></html>" -#~ msgstr "<html><body><b>Var vänlig vänta, läser in sidan...</b></body></html>" +#~ msgstr "" +#~ "<html><body><b>Var vänlig vänta, läser in sidan...</b></body></html>" #~ msgid "" #~ "You have no packages from this channel currently installed on your system." #~ msgstr "" -#~ "Du har för närvarande inte några paket från denna kanal installerade på ditt " -#~ "system." +#~ "Du har för närvarande inte några paket från denna kanal installerade på " +#~ "ditt system." #~ msgid "" -#~ "You can visit the channel's <a href=\"updater:info_page\">about page</a> to " -#~ "get more information about what software is available, or you can go " +#~ "You can visit the channel's <a href=\"updater:info_page\">about page</a> " +#~ "to get more information about what software is available, or you can go " #~ "directly to the <a href=\"updater:available_page\">install page</a> to " #~ "install software." #~ msgstr "" -#~ "Du kan besöka kanalens <a href=\"updater:info_page\">om-sida</a> för att få " -#~ "mer information om vilken programvara som är tillgänglig, eller gå direkt " -#~ "till <a href=\"updater:available_page\">installationssidan</a> för att " -#~ "installera program." +#~ "Du kan besöka kanalens <a href=\"updater:info_page\">om-sida</a> för att " +#~ "få mer information om vilken programvara som är tillgänglig, eller gå " +#~ "direkt till <a href=\"updater:available_page\">installationssidan</a> för " +#~ "att installera program." #~ msgid "View the <a href=\"updater:info_page\">about page</a>." #~ msgstr "Visa <a href=\"updater:info_page\">om-sidan</a>." @@ -2548,49 +2639,46 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a>." #~ msgid "" -#~ "You don't have any packages installed from this channel. The following pre-" -#~ "defined sets of packages are available, or you may select individual " +#~ "You don't have any packages installed from this channel. The following " +#~ "pre-defined sets of packages are available, or you may select individual " #~ "packages from the <a href=updater:available_page>Install page</a>." #~ msgstr "" #~ "Du har inga paket installerade från denna kanal. Följande fördefinierade " #~ "paket är tillgängliga, eller så kan du välja enstaka paket från <a " #~ "href=updater:available_page>installationssidan</a>." -#~ msgid "All of the software from this channel is up-to-date." -#~ msgstr "All programvara från denna kanal är aktuell." - #~ msgid "" -#~ "To install new software from this channel, visit the <a " -#~ "href=\"updater:available_page\">install page</a>." +#~ "To install new software from this channel, visit the <a href=\"updater:" +#~ "available_page\">install page</a>." #~ msgstr "" -#~ "För att installera ny programvara går du till <a " -#~ "href=\"updater:available_page\">installationssidan</a>." +#~ "För att installera ny programvara går du till <a href=\"updater:" +#~ "available_page\">installationssidan</a>." #~ msgid "" -#~ "To remove already installed software from this channel, visit the <a " -#~ "href=\"updater:installed_page\">remove page</a>." +#~ "To remove already installed software from this channel, visit the <a href=" +#~ "\"updater:installed_page\">remove page</a>." #~ msgstr "" -#~ "För att ta bort redan installerad programvara från denna kanal går du till " -#~ "<a href=\"updater:installed_page\">borttagningssidan</a>." +#~ "För att ta bort redan installerad programvara från denna kanal går du " +#~ "till <a href=\"updater:installed_page\">borttagningssidan</a>." #~ msgid "<a href=\"updater:unsubscribe\">Unsubscribe</a> from this channel." #~ msgstr "" -#~ "<a href=\"updater:unsubscribed_page\">Säg upp prenumerationen</a> på denna " -#~ "kanal." +#~ "<a href=\"updater:unsubscribed_page\">Säg upp prenumerationen</a> på " +#~ "denna kanal." #~ msgid "" -#~ "There is <b>1 update</b> available in this channel, totalling <b>%s</b> of " -#~ "data to be downloaded." +#~ "There is <b>1 update</b> available in this channel, totalling <b>%s</b> " +#~ "of data to be downloaded." #~ msgstr "" #~ "Det finns <b>1 uppdatering</b> tillgänglig i denna kanal, som kräver att " #~ "<b>%s</b> data hämtas." #~ msgid "" -#~ "There are <b>%s updates</b> available in this channel, totalling <b>%s</b> " -#~ "of data to be downloaded." +#~ "There are <b>%s updates</b> available in this channel, totalling <b>%s</" +#~ "b> of data to be downloaded." #~ msgstr "" -#~ "Det finns <b>%s uppdateringar</b> tillgängliga i denna kanal, som kräver att " -#~ "<b>%s</b> data hämtas." +#~ "Det finns <b>%s uppdateringar</b> tillgängliga i denna kanal, som kräver " +#~ "att <b>%s</b> data hämtas." #~ msgid "Essential Updates" #~ msgstr "Nödvändiga uppdateringar" @@ -2622,34 +2710,36 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ "ditt system.</p>" #~ msgid "" -#~ "<p>You can go to the <a href=\"updater:update_page\">Update page</a> to view " -#~ "available updates for your software in this channel, or return to the <a " -#~ "href=\"updater:summary\">Summary</a> to view all available updates.</p>" +#~ "<p>You can go to the <a href=\"updater:update_page\">Update page</a> to " +#~ "view available updates for your software in this channel, or return to " +#~ "the <a href=\"updater:summary\">Summary</a> to view all available updates." +#~ "</p>" #~ msgstr "" -#~ "<p>Du kan gå till <a href=\"updater:update_page\">uppdateringssidan</a> för " -#~ "att se de uppdateringar till din programvara som finns i denna kanal, eller " -#~ "gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a> för att se " -#~ "alla tillgängliga uppdateringar.</p>" +#~ "<p>Du kan gå till <a href=\"updater:update_page\">uppdateringssidan</a> " +#~ "för att se de uppdateringar till din programvara som finns i denna kanal, " +#~ "eller gå tillbaka till <a href=\"updater:summary\">sammanfattningen</a> " +#~ "för att se alla tillgängliga uppdateringar.</p>" #~ msgid "" #~ "<p>You can go to the <a href=\"updater:summary\">Summary</a> to view all " #~ "available updates for your system.</p>" #~ msgstr "" -#~ "<p>Du kan gå till <a href=\"updater:summary\">sammanfattningen</a> för att " -#~ "se alla uppdateringar som är tillgängliga för ditt system.</p>" +#~ "<p>Du kan gå till <a href=\"updater:summary\">sammanfattningen</a> för " +#~ "att se alla uppdateringar som är tillgängliga för ditt system.</p>" #~ msgid "" #~ "<!--html-->The following packages from this channel are available for " #~ "installation." #~ msgstr "" -#~ "<!--html-->Följande paket från denna kanal är tillgängliga för installation." +#~ "<!--html-->Följande paket från denna kanal är tillgängliga för " +#~ "installation." #~ msgid "" -#~ " Package names that are in <font color=\"#777777\">gray</font> indicate that " -#~ "a newer version of this package is already installed." +#~ " Package names that are in <font color=\"#777777\">gray</font> indicate " +#~ "that a newer version of this package is already installed." #~ msgstr "" -#~ " Paketnamn som är <font color=\"#777777\">grå</font> indikerar att en nyare " -#~ "version av detta paket redan är installerat." +#~ " Paketnamn som är <font color=\"#777777\">grå</font> indikerar att en " +#~ "nyare version av detta paket redan är installerat." #~ msgid "Name:" #~ msgstr "Namn:" @@ -2691,18 +2781,18 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Du prenumererar för närvarande på alla tillgängliga kanaler!" #~ msgid "" -#~ "There is <b>one update</b> available for your system, totalling <b>%s</b> of " -#~ "data to be downloaded." +#~ "There is <b>one update</b> available for your system, totalling <b>%s</b> " +#~ "of data to be downloaded." #~ msgstr "" -#~ "Det finns <b>en uppdatering</b> tillgänglig för ditt system, som kräver att " -#~ "<b>%s</b> data hämtas." +#~ "Det finns <b>en uppdatering</b> tillgänglig för ditt system, som kräver " +#~ "att <b>%s</b> data hämtas." #~ msgid "" -#~ "There are <b>%s updates</b> available for your system, totalling <b>%s</b> " -#~ "of data to be downloaded." +#~ "There are <b>%s updates</b> available for your system, totalling <b>%s</" +#~ "b> of data to be downloaded." #~ msgstr "" -#~ "Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som kräver " -#~ "att <b>%s</b> data hämtas." +#~ "Det finns <b>%s uppdateringar</b> tillgängliga för ditt system, som " +#~ "kräver att <b>%s</b> data hämtas." #~ msgid " Of these updates, <b>one</b> is <b>urgent</b>." #~ msgstr " Utav dessa uppdateringar är <b>en brådskande</b>." @@ -2720,7 +2810,8 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Synlig felsökningsnivå, går från 0 (ingenting) till 6 (allting)" #~ msgid "Log file debugging level, ranges from 0 (nothing) to 6 (everything)" -#~ msgstr "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)" +#~ msgstr "" +#~ "Felsökningsnivå för loggfil, går från 0 (ingenting) till 6 (allting)" #~ msgid "The XAuthority file (usually from GDM)" #~ msgstr "XAuthority-filen (vanligtvis från GDM)" @@ -2742,11 +2833,11 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgstr "Hämtar kanalgrafik..." #~ msgid "" -#~ "An error occurred trying to parse the channel list. You should ensure that " -#~ "you are running a supported distribution and try again later." +#~ "An error occurred trying to parse the channel list. You should ensure " +#~ "that you are running a supported distribution and try again later." #~ msgstr "" -#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig om " -#~ "att du använder en distribution som stöds och försöka igen senare." +#~ "Ett fel inträffade vid försök att tolka kanallistan. Du bör försäkra dig " +#~ "om att du använder en distribution som stöds och försöka igen senare." #~ msgid "Navigation" #~ msgstr "Navigering" @@ -2952,4 +3043,4 @@ msgstr "Inte DFSG-kompatibel mjukvara" #~ msgid "translator-credits" #~ msgstr "" #~ "Christian Rose\n" -#~ "Skicka synpunkter på översättningen till sv@li.org"
\ No newline at end of file +#~ "Skicka synpunkter på översättningen till sv@li.org" @@ -5,48 +5,47 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 11:26+0000\n" "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "Кожні %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "Через %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "Імпортувати ключ" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "Введіть назву диску" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" @@ -82,6 +81,7 @@ msgstr "Не можливо поновити необхідні meta-пакун msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" @@ -93,34 +93,36 @@ msgid "" "this as a bug. " msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -133,42 +135,43 @@ msgstr "" msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -176,18 +179,20 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" "Апргрейд системи щойно зупинено. Система тепер може працювати нестабільно. " "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " @@ -205,15 +210,24 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -222,86 +236,102 @@ msgstr "" "нижче. " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "Вставте '%s' в пристрій '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "Завантадення пакунків завершено" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Завантажується файл %li of %li at %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "%s залишилось" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "Завантажується файл %li of %li на невизначенії швидкості" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "Завантажується файл %li of %li at %s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Встановлення оновлень..." +msgid "Applying changes" +msgstr "Завантаження змін..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-" "upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано. " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -309,7 +339,7 @@ msgstr[0] "%s пакунків буде видалено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -317,7 +347,7 @@ msgstr[0] "%s пакунків буде встановлено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -325,50 +355,51 @@ msgstr[0] "буде проведено апргрейд %s пакунків." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "Потрібно завантажити всього %s пакунків." -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом " "всього часу." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "Не знайдено пакунків для апгрейду" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "Апгрейд вашої системи вже проведено." -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Видалити %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, fuzzy, python-format msgid "Upgrade %s" msgstr "Апргрейд %s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Необхідно перезавантажити систему" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -378,6 +409,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -403,8 +435,8 @@ msgstr "<b><big>Почати апгрейд системи?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -416,38 +448,51 @@ msgid "Details" msgstr "<b>Подробиці</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "Завантаження та встановлення пакунків для апгрейду" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "Підготовка до апгрейду системи" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "Перезавантаження системи" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "Термінал" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "Апгрейд системи Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Перезавантажити" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "П_овідомити про помилку" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "_Перезавантажити" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "П_родовжити апгрейд системи" @@ -461,7 +506,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -480,52 +525,56 @@ msgid "Changes" msgstr "Зміни" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "Пошук пакунків для апгрейду" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Опис" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Оновлення програм" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." @@ -597,7 +646,7 @@ msgid "_Check for updates automatically:" msgstr "Перевіряти оновлення кожні" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -628,12 +677,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Дистрибутив:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Розділи:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Дистрибутив:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -651,14 +701,14 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -"<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте " -"додати</b></big>\n" +"<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></" +"big>\n" "\n" "Рядок APT містить тип, адресу та вміст репозиторію, наприклад <i>\"deb " "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у " @@ -690,10 +740,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -741,111 +788,145 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Оновлення Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Оновлення Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Оновлення Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Оновлення безпеки Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Оновлення Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Оновлення Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Офіціально підтримуються" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Обмежені авторські права" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Оновлення безпеки стабільного Debian" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Тестовий Debian" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian поза США (Нестабільний)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Офіціально підтримуються" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "Завантажується файл %li of %li на невизначенії швидкості" + +#, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Встановлення оновлень..." + +#~ msgid "Check for available updates" +#~ msgstr "Пошук пакунків для апгрейду" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Розділи:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Офіціально підтримуються" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Перезавантажити з сервера інформацію про пакет" @@ -886,9 +967,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "діб" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Репозиторій</b>" @@ -910,8 +988,8 @@ msgstr "" #~ "дає змогу перевірити цілісність завантаженого програмного забезпечення." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Додайте новий ключ до в'язки довірених ключів. Перевірте, що ви отримали " #~ "ключ безпечним каналом та ви довіряєте власнику. " @@ -941,8 +1019,8 @@ msgstr "" #~ msgstr "Максимальний розмір (Мб):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" #~ "Відновити початкові ключі, що постачались з дистрибутивом. Встановлені " #~ "користувачем ключі не будуть змінені." @@ -974,13 +1052,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Доступні оновлення</b></big>\n" #~ "\n" -#~ "Знайдено наступні пакети для оновлення. Їх можна оновити натиснувши кнопку " -#~ "Встановити." +#~ "Знайдено наступні пакети для оновлення. Їх можна оновити натиснувши " +#~ "кнопку Встановити." #~ msgid "Cancel downloading the changelog" #~ msgstr "Скасувати завантаження записів changelog" @@ -1067,9 +1145,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Версія %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Завантаження змін..." - #~ msgid "There are no updated packages" #~ msgstr "Немає оновлених пакетів" @@ -1086,7 +1161,8 @@ msgstr "" #~ msgstr[2] "Ви виділили %s пакетів оновлення, розмір %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Ви виділили %s з %s пакетів оновлення, загальний розмір %s" #~ msgstr[1] "Ви виділили %s з %s пакетів оновлення, загальний розмір %s" #~ msgstr[2] "Ви виділили %s з %s пакетів оновлення, загальний розмір %s" @@ -1095,11 +1171,11 @@ msgstr "" #~ msgstr "Застосовуються оновлення." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Одночасно можна запускати лише один менеджер пакетів. Спочатку закрийте іншу " -#~ "програму.close this other application first." +#~ "Одночасно можна запускати лише один менеджер пакетів. Спочатку закрийте " +#~ "іншу програму.close this other application first." #~ msgid "Updating package list..." #~ msgstr "Оновлення списку пакетів..." @@ -1115,22 +1191,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Поновіть систему на більш нову версію Ubuntu Linux. Для встановленої версії " -#~ "не випускаються виправлення безпеки та інші критичні оновлення. Дивіться " -#~ "інформацію про оновлення на http://www.ubuntulinux.org" +#~ "Поновіть систему на більш нову версію Ubuntu Linux. Для встановленої " +#~ "версії не випускаються виправлення безпеки та інші критичні оновлення. " +#~ "Дивіться інформацію про оновлення на http://www.ubuntulinux.org" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Доступний новий випуск Ubuntu!" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Доступний новий випуск з кодовою назвою '%s'. Інструкції оновлення дивіться " -#~ "на http://www.ubuntulinux.org/" +#~ "Доступний новий випуск з кодовою назвою '%s'. Інструкції оновлення " +#~ "дивіться на http://www.ubuntulinux.org/" #~ msgid "Never show this message again" #~ msgstr "Не показуйте це повідомлення знову" @@ -1142,4 +1218,4 @@ msgstr "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет."
\ No newline at end of file +#~ "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." diff --git a/po/update-manager.pot b/po/update-manager.pot index 838cf650..7ee20ee1 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-04-03 11:03+0200\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -479,7 +479,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -502,7 +502,7 @@ msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Check for available updates" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 @@ -787,7 +787,7 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" @@ -843,11 +843,6 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - -#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:20+0000\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -16,39 +16,37 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: LocFactoryEditor 1.2.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." -msgstr "" -"Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." +msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -82,6 +80,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -93,34 +92,36 @@ msgid "" "this as a bug. " msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -133,42 +134,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -176,18 +178,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -200,159 +203,184 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "Đang cài đặt bản cập nhật..." +msgid "Applying changes" +msgstr "Đang tài về các thay đổi..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -360,6 +388,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -383,8 +412,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -397,38 +426,51 @@ msgid "Details" msgstr "<b>Chi tiết</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Tải lại" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -442,7 +484,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -461,53 +503,56 @@ msgid "Changes" msgstr "Đổi" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "Đang kiểm tra có cập nhật..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Mô tả" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Bản cập nhật phần mềm" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." @@ -579,7 +624,7 @@ msgid "_Check for updates automatically:" msgstr "Kiểm tra có cập nhật sau mỗi" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -610,12 +655,13 @@ msgid "<b>Comment:</b>" msgstr "<b>Ghi chú :</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>Bản phát hành:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Thành phần</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>Phần:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>Bản phát hành:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -633,8 +679,8 @@ msgstr "<b>Địa chỉ định vị:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -671,8 +717,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -720,112 +765,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Bản cập nhật Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.04" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Bản cập nhật Ubuntu 5.10" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "Bản quyền bị giới hạn" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 « Sarge »" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Bản cập nhật bảo mặt ổn định Debian" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Thử ra Debian" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Không Mỹ Debian (Bất định)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "Được hỗ trợ một cách chính thức" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Đang cài đặt bản cập nhật..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "Đang kiểm tra có cập nhật..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Phần:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "Được hỗ trợ một cách chính thức" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Tải lại thông tin gói từ máy phục vụ." @@ -865,9 +942,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ngày" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Thành phần</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Kho</b>" @@ -885,12 +959,12 @@ msgstr "" #~ msgstr "" #~ "<big><b>Khóa xác thực</b></big>\n" #~ "\n" -#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép bạn " -#~ "thẩm tra toàn vẹn của phần mềm đã tải về." +#~ "Bạn có thể thêm và gỡ bỏ khóa xác thực dùng hộp thoại này. Khóa cho phép " +#~ "bạn thẩm tra toàn vẹn của phần mềm đã tải về." #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " #~ msgstr "" #~ "Thêm tập tin khóa mới vào vòng khóa tin cây. Hãy đảm bảo bạn đã nhận khóa " #~ "này qua kênh bảo mật, và bạn tin cây người sở hữu khóa này. " @@ -920,11 +994,11 @@ msgstr "" #~ msgstr "Cỡ tối đa, theo MB:" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "" -#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành động " -#~ "này sẽ không sửa đổi khóa nào tự cài đặt." +#~ "Phục hồi các khóa mặc định có sẵn trong bản phát hành. Tuy nhiên, hành " +#~ "động này sẽ không sửa đổi khóa nào tự cài đặt." #~ msgid "Set _maximum size for the package cache" #~ msgstr "Đặt cỡ tối _đa cho bộ nhớ tạm gói" @@ -953,13 +1027,13 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Bản nâng cấp công bố</b></big>\n" #~ "\n" -#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn giản " -#~ "hãy sử dụng nút « Cài đặt »." +#~ "Tìm thấy có thể nâng cấp những gói theo đây. Để nâng cấp gói, chỉ đơn " +#~ "giản hãy sử dụng nút « Cài đặt »." #~ msgid "Cancel downloading the changelog" #~ msgstr "Thôi tải về Bản ghi đổi..." @@ -1033,9 +1107,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Phiên bản %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Đang tài về các thay đổi..." - #~ msgid "There are no updated packages" #~ msgstr "Không có gói nào đã cập nhật." @@ -1048,18 +1119,19 @@ msgstr "" #~ msgstr[0] "Bạn đã chọn tất cả %s gói đã cập nhật: cỡ tổng là %s" #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "Bạn đã chọn %s trong %s gói đã cập nhật: cỡ tổng là %s" #~ msgid "The updates are being applied." #~ msgstr "Đang áp dụng những bản cập nhật." #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "" -#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. Vui " -#~ "lòng đóng ứng dụng khác trước khi tiếp tục." +#~ "Bạn có thể chạy chỉ một ứng dụng quản lý gói trong một thời gian thôi. " +#~ "Vui lòng đóng ứng dụng khác trước khi tiếp tục." #~ msgid "Updating package list..." #~ msgstr "Đạng cập nhật danh sách gói..." @@ -1075,22 +1147,22 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản hiện " -#~ "thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem " +#~ "Xin hãy nâng cấp đến một phiên bản Linux Ubuntu mới hơn, vì phiên bản " +#~ "hiện thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem " #~ "<http://www.ubuntulinux.org> để tìm thông tin nâng cấp." #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Có một bản phát hành Ubuntu mới công bố." #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." #~ msgstr "" -#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem " -#~ "<http://www.ubuntulinux.org> để tìm hướng dẫn nâng cấp." +#~ "Có một bản phát hành mới có tên mã « %s ». Hãy xem <http://www." +#~ "ubuntulinux.org> để tìm hướng dẫn nâng cấp." #~ msgid "Never show this message again" #~ msgstr "Đừng hiện thông điệp này lần nữa." @@ -1102,5 +1174,5 @@ msgstr "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." #~ msgstr "" -#~ "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt động " -#~ "chưa."
\ No newline at end of file +#~ "Không tải thay đổi về được. Bạn hãy kiểm tra có kết nối đến Mạng hoạt " +#~ "động chưa." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-18 12:11+0000\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\n" @@ -17,38 +17,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -82,6 +81,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -92,33 +92,35 @@ msgid "" "this as a bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -131,41 +133,42 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -173,18 +176,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -197,159 +201,183 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -#, fuzzy -msgid "Installing updates" -msgstr "Seka zonke izihlaziyo" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -357,6 +385,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -380,8 +409,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -393,38 +422,50 @@ msgid "Details" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +msgid "_Replace" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -438,7 +479,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -457,53 +498,57 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Description" +msgid "Check the software channels for new updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Release Notes" +msgid "Description" msgstr "" #: ../data/UpdateManager.glade.h:13 -msgid "Show details" +msgid "Release Notes" msgstr "" #: ../data/UpdateManager.glade.h:14 -msgid "Show progress of single files" +msgid "Show details" msgstr "" #: ../data/UpdateManager.glade.h:15 +msgid "Show progress of single files" +msgstr "" + +#: ../data/UpdateManager.glade.h:16 #, fuzzy msgid "Software Updates" msgstr "Bonisa izihlaziyo" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" @@ -572,7 +617,7 @@ msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -604,11 +649,12 @@ msgid "<b>Comment:</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:12 @@ -626,8 +672,8 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." @@ -657,9 +703,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -707,101 +751,123 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Seka zonke izihlaziyo" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Bonisa izihlaziyo" @@ -841,8 +907,8 @@ msgstr "" #~ msgstr "" #~ "<span weight=\"bold\" size=\"larger\">Ulwazi oluhlaziyiweyo</span>\n" #~ "\n" -#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda funda " -#~ "olu lwazi lulandelayo ngocoselelo." +#~ "Kukho iinkqubo zekhompyutha zasemva kohlaziyo zolwazi olukhoyo. Nceda " +#~ "funda olu lwazi lulandelayo ngocoselelo." #~ msgid "Run now" -#~ msgstr "Phumeza inkqubo ngoku"
\ No newline at end of file +#~ msgstr "Phumeza inkqubo ngoku" diff --git a/po/zh_CN.po b/po/zh_CN.po index dadb16bb..49aefbdc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-26 12:31+0000\n" "Last-Translator: firingstone <firingstone@gmail.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -16,38 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "每%s天" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "%s天后" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "导入密钥" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "在导入所选文件时出错" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是GPG密钥文件或者已经损坏." -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "删除密钥时候出错" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +57,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "请输入光盘的名称" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" @@ -74,7 +73,9 @@ msgstr "破损的软件包" 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 "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者apt-get修复它们。" +msgstr "" +"你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" +"apt-get修复它们。" #: ../DistUpgrade/DistUpgradeCache.py:135 msgid "Can't upgrade required meta-packages" @@ -84,6 +85,7 @@ msgstr "不能升级要求的元包" msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "无法计算升级" @@ -94,33 +96,37 @@ msgid "" "this as a bug. " msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 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 "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软件包的列表。" +msgstr "" +"无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" +"件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -128,68 +134,76 @@ msgid "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." msgstr "" -"你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-" -"desktop软件包所以无法确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中的一个。" +"你的系统没有一个ubuntu-desktop,kubuntu-desktop或eubuntu-desktop软件包所以无法" +"确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中" +"的一个。" #: ../DistUpgrade/DistUpgradeControler.py:42 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "未找到有效记录" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "在检查你的源的信息时未能找到有效的升级记录\n" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " "trash and remove temporary packages of former installations using 'sudo apt-" "get clean'." -msgstr "升级已被取消。请清理出至少%s的磁盘空间。清空你的回收站并通过'sudo apt-get clean'命令来删除之前安装的临时软件包。" +msgstr "" +"升级已被取消。请清理出至少%s的磁盘空间。清空你的回收站并通过'sudo apt-get " +"clean'命令来删除之前安装的临时软件包。" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 +#, fuzzy msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." -msgstr "升级现在取消。你的系统可能处于不稳定状态。请试着用'sudo apt-get install -f'或者新立得来修复你的系统。" +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." +msgstr "" +"升级现在取消。你的系统可能处于不稳定状态。请试着用'sudo apt-get install -f'或" +"者新立得来修复你的系统。" #: ../DistUpgrade/DistUpgradeControler.py:230 msgid "Could not download the upgrades" @@ -201,156 +215,184 @@ msgid "" "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#: ../DistUpgrade/DistUpgradeControler.py:273 +#, fuzzy +msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "系统更新完毕" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "请将'%s'插入光驱'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "下载完成" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "正在下载文件%li来自%li速度是%s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "还剩%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 -#, python-format -msgid "Downloading file %li of %li at unknown speed" -msgstr "正在下载文件%li来自%li速度未知" +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 +#, fuzzy, python-format +msgid "Downloading file %li of %li" +msgstr "正在下载文件%li来自%li速度是%s/s" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "安装更新" +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 +#, fuzzy +msgid "Applying changes" +msgstr "正在下载更改..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 msgid "The upgrade aborts now. Please report this bug." msgstr "升级被取消。请报告这个bug。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -"请报告这个bug并在你的报告中包括这些文件~/dist-upgrade.log和~/dist-upgrade-apt.log。升级现在取消。 " +"请报告这个bug并在你的报告中包括这些文件~/dist-upgrade.log和~/dist-upgrade-" +"apt.log。升级现在取消。 " -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s软件包将被删除。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s新的软件包将被安装。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s软件包将被升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "你下载了总体的%s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "升级会持续几个小时且不能在此后的任何时候被终止" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "不能找到任何升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "你的系统已经升级。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>删除%s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 #, python-format msgid "Install %s" msgstr "安装%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 #, python-format msgid "Upgrade %s" msgstr "升级%s" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "需要重启" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "升级已经完成并需要重启。你要现在重启么？" @@ -358,6 +400,7 @@ msgstr "升级已经完成并需要重启。你要现在重启么？" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -382,9 +425,10 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>开始升级？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 +#, fuzzy msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">升级到 Ubuntu \"Dapper\" 6.04</span>" @@ -397,38 +441,51 @@ msgid "Details" msgstr "详细信息" #: ../DistUpgrade/DistUpgrade.glade.h:10 +msgid "Difference between the files" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:11 msgid "Downloading and installing the upgrades" msgstr "下载并安装升级" -#: ../DistUpgrade/DistUpgrade.glade.h:11 +#: ../DistUpgrade/DistUpgrade.glade.h:12 msgid "Modifying the software channels" msgstr "调整软件途径" -#: ../DistUpgrade/DistUpgrade.glade.h:12 +#: ../DistUpgrade/DistUpgrade.glade.h:13 msgid "Preparing the upgrade" msgstr "正在准备升级" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 msgid "Restarting the system" msgstr "正在重启系统" -#: ../DistUpgrade/DistUpgrade.glade.h:14 +#: ../DistUpgrade/DistUpgrade.glade.h:15 msgid "Terminal" msgstr "终端" -#: ../DistUpgrade/DistUpgrade.glade.h:15 +#: ../DistUpgrade/DistUpgrade.glade.h:16 msgid "Upgrading Ubuntu" msgstr "升级Ubuntu" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "重新载入(_R)" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 msgid "_Report Bug" msgstr "报告Bug(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:17 +#: ../DistUpgrade/DistUpgrade.glade.h:20 msgid "_Restart Now" msgstr "现在重启(_R)" -#: ../DistUpgrade/DistUpgrade.glade.h:18 +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "继续升级(_R)" @@ -441,11 +498,13 @@ msgid "" msgstr "" "<b><big>你必须手动检测升级</big></b>\n" "\n" -"你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改变." +"你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改" +"变." #: ../data/UpdateManager.glade.h:4 +#, fuzzy msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -467,52 +526,57 @@ msgid "Changes" msgstr "更改" #: ../data/UpdateManager.glade.h:10 -msgid "Check for available updates" -msgstr "检查有效的更新" +#, fuzzy +msgid "Chec_k" +msgstr "检查（_C）" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "描述" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "发布说明" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "显示详情" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "显示单个文件进度" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "软件更新" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "升级(_p)" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "升级到最新版本的Ubuntu" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "检查（_C）" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "在以后隐藏该信息(_H)" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "安装更新(_I)" @@ -557,7 +621,9 @@ msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically. The software package \"unattended-upgrades\" needs to be " "installed therefor" -msgstr "只有来自官方Ubuntu服务器的安全更新才会被自动安装。为此，名为\"unattended-upgrades\"软件包需要被安装。" +msgstr "" +"只有来自官方Ubuntu服务器的安全更新才会被自动安装。为此，名为\"unattended-" +"upgrades\"软件包需要被安装。" #: ../data/SoftwareProperties.glade.h:11 msgid "Restore _Defaults" @@ -576,7 +642,8 @@ msgid "_Check for updates automatically:" msgstr "自动检查更新(_C)" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +#, fuzzy +msgid "_Download updates in the background, but do not install them" msgstr "在后台下载更新，但是不安装(_D)" #: ../data/SoftwareProperties.glade.h:16 @@ -609,12 +676,13 @@ msgid "<b>Comment:</b>" msgstr "<b>注释：</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>发行版：</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>组件</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>节：</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>发行版：</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" @@ -630,14 +698,15 @@ msgstr "<b>URI：</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>输入你想增加的完整的频道 APT 命令行</b></big>\n" -"APT 命令行包含频道的类型，位置和部分，例如：<i>\"deb http://ftp.debian.org sarge main\"</i>。" +"APT 命令行包含频道的类型，位置和部分，例如：<i>\"deb http://ftp.debian.org " +"sarge main\"</i>。" #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -665,8 +734,7 @@ msgstr "正在扫描CD-ROM" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "添加路径(_A)" +msgstr "添加路径(_A)" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -689,7 +757,9 @@ msgid "" "If automatic checking for updates is disabeld, you have to reload the " "channel list manually. This option allows to hide the reminder shown in this " "case." -msgstr "如果自动检查更新被禁用，你将不得不手动重载频道列表。本选项允许隐藏此种情况下要出现的提醒语。" +msgstr "" +"如果自动检查更新被禁用，你将不得不手动重载频道列表。本选项允许隐藏此种情况下" +"要出现的提醒语。" #: ../data/update-manager.schemas.in.h:2 msgid "Remind to reload the channel list" @@ -713,101 +783,137 @@ msgstr "储存包含变动和描述列表的扩展器的状态" msgid "The window size" msgstr "窗口大小" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" -msgstr "" -"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 6.04 'Dapper Drake'" +#. Description #: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.04 Security Updates" +#, fuzzy +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 6.04 安全更新" +#. Description #: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.04 Updates" +#, fuzzy +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 6.04 更新" +#. Description #: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.04 Backports" +#, fuzzy +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 6.04 移植" +#. Description #: ../channels/Ubuntu.info.in:74 msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 'Breezy Badger'" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全更新" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:125 msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 移植" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支持" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "版权限制" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "社区维护(Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "非自由(Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" +#. Description #: ../channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" 安全更新" +#. Description #: ../channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (测试)" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.us.debian.org/debian/" +#. Description #: ../channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (非稳定)" -#: ../channels/Debian.info.in:51 -msgid "Oficially supported" -msgstr "官方支持" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "带有非自由依赖关系的DFSG兼容软件" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" +#~ msgid "Downloading file %li of %li at unknown speed" +#~ msgstr "正在下载文件%li来自%li速度未知" + +#~ msgid "Installing updates" +#~ msgstr "安装更新" + +#~ msgid "Check for available updates" +#~ msgstr "检查有效的更新" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>节：</b>" + +#~ msgid "Oficially supported" +#~ msgstr "官方支持" + #, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "从服务器重新装入软件包信息。" @@ -839,9 +945,6 @@ msgstr "非DFSG兼容软件" #~ msgid "<b>Packages to install:</b>" #~ msgstr "要安装的软件包：" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>组件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>仓库</b>" @@ -887,9 +990,6 @@ msgstr "非DFSG兼容软件" #~ msgid "Version %s: \n" #~ msgstr "版本 %s： \n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下载更改..." - #~ msgid "The updates are being applied." #~ msgstr "更新已经应用。" @@ -955,4 +1055,4 @@ msgstr "非DFSG兼容软件" #~ msgstr "美国限制出口的软件" #~ msgid "Repositories changed" -#~ msgstr "仓库已变更"
\ No newline at end of file +#~ msgstr "仓库已变更" diff --git a/po/zh_HK.po b/po/zh_HK.po index 9d70cc15..8b89dbb0 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:20+0000\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -15,38 +15,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -80,6 +79,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -91,34 +91,36 @@ msgid "" "this as a bug. " msgstr "你選定的密碼匙無法移除，請匯報問題。 " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "你選定的密碼匙無法移除，請匯報問題。 " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -131,42 +133,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -174,18 +177,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -198,162 +202,187 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "正在安裝軟件更新..." +msgid "Applying changes" +msgstr "正在下載更改紀錄..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -361,6 +390,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -384,8 +414,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -398,38 +428,51 @@ msgid "Details" msgstr "<b>細節</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "重新載入" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -443,7 +486,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -462,53 +505,56 @@ msgid "Changes" msgstr "更改紀錄" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "正在檢查更新套件..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "軟件更新" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." @@ -580,7 +626,7 @@ msgid "_Check for updates automatically:" msgstr "檢查軟件更新間隔：" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -611,12 +657,13 @@ msgid "<b>Comment:</b>" msgstr "<b>備註:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>發行版本:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>元件</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>分類:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>發行版本:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -634,16 +681,16 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n" "\n" -"該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp.debian.org sarge " -"main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。" +"該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp." +"debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。" #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -671,9 +718,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -721,112 +766,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 安全性更新" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "官方支援" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "版權受限" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 “Sarge”" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 穩定版安全性更新" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian 測試版" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (不穩定版)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "官方支援" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "正在安裝軟件更新..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "正在檢查更新套件..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>分類:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "由伺服器重新載入套件資料。" @@ -866,9 +943,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "日" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>元件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>軟件庫</b>" @@ -886,12 +960,15 @@ msgstr "" #~ msgstr "" #~ "<big><b>認證用密碼匙</b></big>\n" #~ "\n" -#~ "你可以在本對話窗內加減認證用的密碼匙。這些密碼匙可以用來檢查下載的軟件是否完整。" +#~ "你可以在本對話窗內加減認證用的密碼匙。這些密碼匙可以用來檢查下載的軟件是否" +#~ "完整。" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " -#~ msgstr "將新的密碼匙檔加入你信任的密碼匙圈之內。請確保該密碼匙是經安全的途徑獲得的，而且屬於你信任的擁有者。 " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " +#~ msgstr "" +#~ "將新的密碼匙檔加入你信任的密碼匙圈之內。請確保該密碼匙是經安全的途徑獲得" +#~ "的，而且屬於你信任的擁有者。 " #~ msgid "Add repository..." #~ msgstr "加入軟件庫..." @@ -918,9 +995,10 @@ msgstr "" #~ msgstr "大小上限 (MB):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." -#~ msgstr "將發行版本提供的預設密碼匙還原。這個程序不會更改用戶自行安裝的密碼匙。" +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." +#~ msgstr "" +#~ "將發行版本提供的預設密碼匙還原。這個程序不會更改用戶自行安裝的密碼匙。" #~ msgid "Set _maximum size for the package cache" #~ msgstr "指定套件快取的大小上限(_M)" @@ -949,8 +1027,8 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" @@ -1025,9 +1103,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "版本 %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下載更改紀錄..." - #~ msgid "There are no updated packages" #~ msgstr "沒有任何套件需要更新" @@ -1043,7 +1118,8 @@ msgstr "" #, fuzzy #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "你選取了 %2$s 個更新套件中的 %1$s 個，大小為 %3$s" #~ msgstr[1] "你選取了 %2$s 個更新套件中的 %1$s 個，大小總共為 %3$s" @@ -1051,8 +1127,8 @@ msgstr "" #~ msgstr "現在安裝更新套件。" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "你在任何時候只可以執行一個套件管理員程式。請關閉其它程式。" #~ msgid "Updating package list..." @@ -1069,19 +1145,21 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "請升級至新版本的 Ubuntu Linux。你現在用的版本不會再有任何安全性更新或重要的更新。有關升級的資料，請瀏覽 " -#~ "http://www.ubuntulinux.org 。" +#~ "請升級至新版本的 Ubuntu Linux。你現在用的版本不會再有任何安全性更新或重要" +#~ "的更新。有關升級的資料，請瀏覽 http://www.ubuntulinux.org 。" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntu 已推出新版本！" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." -#~ msgstr "名稱為 “%s” 的新版本已經推出。請瀏覽 http://www.ubuntulinux.org/ 獲取有關升級的指引。" +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." +#~ msgstr "" +#~ "名稱為 “%s” 的新版本已經推出。請瀏覽 http://www.ubuntulinux.org/ 獲取有關" +#~ "升級的指引。" #~ msgid "Never show this message again" #~ msgstr "以後不再顯示此訊息" @@ -1092,4 +1170,4 @@ msgstr "" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。"
\ No newline at end of file +#~ msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" diff --git a/po/zh_TW.po b/po/zh_TW.po index eb026544..02a9cb7f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-22 23:28+0000\n" +"POT-Creation-Date: 2006-04-07 21:25+0200\n" "PO-Revision-Date: 2006-03-23 00:20+0000\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -15,38 +15,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:110 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:140 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:413 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:392 +#: ../SoftwareProperties/SoftwareProperties.py:423 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:393 +#: ../SoftwareProperties/SoftwareProperties.py:424 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:405 +#: ../SoftwareProperties/SoftwareProperties.py:436 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:406 -msgid "" -"The key you selected could not be removed. Please report this as a bug." +#: ../SoftwareProperties/SoftwareProperties.py:437 +msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:478 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:504 +#: ../SoftwareProperties/SoftwareProperties.py:535 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:520 +#: ../SoftwareProperties/SoftwareProperties.py:551 msgid "Please insert a disc in the drive:" msgstr "" @@ -80,6 +79,7 @@ msgstr "" msgid "A essential package would have to be removed" msgstr "" +#. FIXME: change the text to something more useful #: ../DistUpgrade/DistUpgradeCache.py:145 msgid "Could not calculate the upgrade" msgstr "" @@ -91,34 +91,36 @@ msgid "" "this as a bug. " msgstr "您選定的金鑰無法移除，請匯報問題。 " -#: ../DistUpgrade/DistUpgradeCache.py:168 +#. FIXME: maybe ask a question here? instead of failing? +#: ../DistUpgrade/DistUpgradeCache.py:169 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:170 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:232 +#: ../DistUpgrade/DistUpgradeCache.py:233 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "您選定的金鑰無法移除，請匯報問題。 " -#: ../DistUpgrade/DistUpgradeCache.py:240 +#. FIXME: provide a list +#: ../DistUpgrade/DistUpgradeCache.py:241 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:242 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 " @@ -131,42 +133,43 @@ msgstr "" msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:107 +#. FIXME: offer to write a new self.sources.list entry +#: ../DistUpgrade/DistUpgradeControler.py:106 msgid "No valid entry found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:108 +#: ../DistUpgrade/DistUpgradeControler.py:107 msgid "" "While scaning your repository information no valid entry for the upgrade was " "found.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:125 +#: ../DistUpgrade/DistUpgradeControler.py:124 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:126 +#: ../DistUpgrade/DistUpgradeControler.py:125 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:171 +#: ../DistUpgrade/DistUpgradeControler.py:170 #, fuzzy msgid "Error during update" msgstr "移除金鑰時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:172 +#: ../DistUpgrade/DistUpgradeControler.py:171 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:191 +#: ../DistUpgrade/DistUpgradeControler.py:190 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:192 +#: ../DistUpgrade/DistUpgradeControler.py:191 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -174,18 +177,19 @@ msgid "" "get clean'." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:197 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:214 +#. installing the packages failed, can't be retried +#: ../DistUpgrade/DistUpgradeControler.py:213 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:215 +#: ../DistUpgrade/DistUpgradeControler.py:214 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"The upgrade aborts now. Your system can be in an unusable state. A recovery " +"is now run (dpkg --configure -a)." msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:230 @@ -198,162 +202,187 @@ msgid "" "installation media and try again. " msgstr "" +#: ../DistUpgrade/DistUpgradeControler.py:273 +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:274 +msgid "_Skip This Step" +msgstr "" + #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:284 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#. then open the cache (again) +#: ../DistUpgrade/DistUpgradeControler.py:299 +#: ../DistUpgrade/DistUpgradeControler.py:325 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:317 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:331 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:335 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:342 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:347 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#. print "mediaChange %s %s" % (medium, drive) +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 msgid "Download is complete" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:106 +#: ../DistUpgrade/DistUpgradeViewGtk.py:107 #, python-format msgid "Downloading file %li of %li at %s/s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 +#: ../DistUpgrade/DistUpgradeViewGtk.py:216 #, python-format msgid "%s remaining" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, python-format -msgid "Downloading file %li of %li at unknown speed" +msgid "Downloading file %li of %li" msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#. -> longer term, move this code into python-apt +#: ../DistUpgrade/DistUpgradeViewGtk.py:140 #, fuzzy -msgid "Installing updates" -msgstr "正在安裝軟體更新..." +msgid "Applying changes" +msgstr "正在下載更改紀錄..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:157 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:158 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:171 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:188 +msgid "The 'diff' command was not found" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:296 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:297 msgid "" -"Please report this as a bug and include the files ~/dist-upgrade.log and " -"~/dist-upgrade-apt.log in your report. The upgrade aborts now. " +"Please report this as a bug and include the files ~/dist-upgrade.log and ~/" +"dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:386 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:392 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:398 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:405 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:409 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:412 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#. FIXME: this should go into DistUpgradeController +#: ../DistUpgrade/DistUpgradeViewGtk.py:418 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:419 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:434 +#, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:436 +#, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 -#, fuzzy +#: ../DistUpgrade/DistUpgradeViewGtk.py:438 +#, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" @@ -361,6 +390,7 @@ msgstr "" #. testcode to see if the bullets look nice in the dialog #. for i in range(4): #. view.setStep(i+1) +#. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 #: ../data/SoftwarePropertiesDialogs.glade.h:1 msgid " " @@ -384,8 +414,8 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " -"6.04</span>" +"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.06</" +"span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -398,38 +428,51 @@ msgid "Details" msgstr "<b>細節</b>" #: ../DistUpgrade/DistUpgrade.glade.h:10 -msgid "Downloading and installing the upgrades" +msgid "Difference between the files" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:11 -msgid "Modifying the software channels" +msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:12 -msgid "Preparing the upgrade" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:13 -msgid "Restarting the system" +msgid "Preparing the upgrade" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:14 -msgid "Terminal" +msgid "Restarting the system" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:15 -msgid "Upgrading Ubuntu" +msgid "Terminal" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:16 -msgid "_Report Bug" +msgid "Upgrading Ubuntu" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:17 -msgid "_Restart Now" +msgid "_Keep" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "重新載入" + +#: ../DistUpgrade/DistUpgrade.glade.h:19 +msgid "_Report Bug" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:20 +msgid "_Restart Now" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:21 msgid "_Resume Upgrade" msgstr "" @@ -443,7 +486,7 @@ msgstr "" #: ../data/UpdateManager.glade.h:4 msgid "" -"<big><b>Checking for available updates</b></big>\n" +"<big><b>Analysing your system</b></big>\n" "\n" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." @@ -462,53 +505,56 @@ msgid "Changes" msgstr "更改紀錄" #: ../data/UpdateManager.glade.h:10 -#, fuzzy -msgid "Check for available updates" -msgstr "正在檢查更新套件..." +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 +msgid "Check the software channels for new updates" +msgstr "" + +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "詳細說明" -#: ../data/UpdateManager.glade.h:12 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/UpdateManager.glade.h:14 msgid "Show details" msgstr "" -#: ../data/UpdateManager.glade.h:14 +#: ../data/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "軟體更新" -#: ../data/UpdateManager.glade.h:16 +#: ../data/UpdateManager.glade.h:17 msgid "" "Software updates can correct errors, eliminate security vulnerabilities, and " "provide new features to you." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟體更新..." @@ -580,7 +626,7 @@ msgid "_Check for updates automatically:" msgstr "檢查軟體更新間隔：" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -611,12 +657,13 @@ msgid "<b>Comment:</b>" msgstr "<b>備註:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:10 -msgid "<b>Distribution:</b>" -msgstr "<b>發行版本:</b>" +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>元件</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Sections:</b>" -msgstr "<b>分類:</b>" +msgid "<b>Distribution:</b>" +msgstr "<b>發行版本:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy @@ -634,16 +681,16 @@ msgstr "<b>URI:</b>" #: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to " -"add</b></big>\n" +"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"big>\n" "\n" "The APT line contains the type, location and sections of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入整行您想加入的 APT 軟體庫位置</b></big>\n" "\n" -"該行的內容包括 APT 軟體庫的類型、位置和內容，例如： <i>\"deb http://ftp.debian.org sarge " -"main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。" +"該行的內容包括 APT 軟體庫的類型、位置和內容，例如： <i>\"deb http://ftp." +"debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。" #: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" @@ -671,9 +718,7 @@ msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" -msgid_plural "_Add Channels" -msgstr[0] "" -msgstr[1] "" +msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" @@ -721,112 +766,144 @@ msgstr "" msgid "The window size" msgstr "" +#. ChangelogURI #: ../channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 更新" +#. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 安全性更新" +#. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:74 #, fuzzy msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" +#. Description #: ../channels/Ubuntu.info.in:91 msgid "Ubuntu 5.10 Security Updates" msgstr "Ubuntu 5.10 安全性更新" +#. Description #: ../channels/Ubuntu.info.in:108 msgid "Ubuntu 5.10 Updates" msgstr "Ubuntu 5.10 更新" +#. Description #: ../channels/Ubuntu.info.in:125 #, fuzzy msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" -#: ../channels/Ubuntu.info.in:128 +#. CompDescription +#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "官方支援" +#. CompDescription #: ../channels/Ubuntu.info.in:131 msgid "Restricted copyright" msgstr "版權受限" +#. CompDescription #: ../channels/Ubuntu.info.in:134 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" +#. CompDescription #: ../channels/Ubuntu.info.in:137 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" +#. ChangelogURI #: ../channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "" +#. Description #: ../channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 “Sarge”" +#. BaseURI #: ../channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" +#. Description #: ../channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 穩定版安全性更新" +#. Description #: ../channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian 測試版" +#. BaseURI #: ../channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" +#. Description #: ../channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (不穩定版)" -#: ../channels/Debian.info.in:51 -#, fuzzy -msgid "Oficially supported" -msgstr "官方支援" - +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" +#. CompDescription #: ../channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "正在安裝軟體更新..." + +#, fuzzy +#~ msgid "Check for available updates" +#~ msgstr "正在檢查更新套件..." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>分類:</b>" + +#, fuzzy +#~ msgid "Oficially supported" +#~ msgstr "官方支援" + +#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "由伺服器重新載入套件資料。" @@ -866,9 +943,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "日" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>元件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>軟體庫</b>" @@ -886,12 +960,15 @@ msgstr "" #~ msgstr "" #~ "<big><b>認證用金鑰</b></big>\n" #~ "\n" -#~ "您可以在本對話窗內加減認證用的金鑰。這些金鑰可以用來檢查下載的軟體是否完整。" +#~ "您可以在本對話窗內加減認證用的金鑰。這些金鑰可以用來檢查下載的軟體是否完" +#~ "整。" #~ msgid "" -#~ "Add a new key file to the trusted keyring. Make sure that you received the " -#~ "key over a secure channel and that you trust the owner. " -#~ msgstr "將新的金鑰檔加入您信任的鑰匙圈之內。請確保該金鑰是經安全的途徑獲得的，而且屬於您信任的擁有者。 " +#~ "Add a new key file to the trusted keyring. Make sure that you received " +#~ "the key over a secure channel and that you trust the owner. " +#~ msgstr "" +#~ "將新的金鑰檔加入您信任的鑰匙圈之內。請確保該金鑰是經安全的途徑獲得的，而且" +#~ "屬於您信任的擁有者。 " #~ msgid "Add repository..." #~ msgstr "加入軟體庫..." @@ -918,8 +995,8 @@ msgstr "" #~ msgstr "大小上限 (MB):" #~ msgid "" -#~ "Restore the default keys shipped with the distribution. This will not change " -#~ "user installed keys." +#~ "Restore the default keys shipped with the distribution. This will not " +#~ "change user installed keys." #~ msgstr "將發行版本提供的預設金鑰還原。這個程序不會更改用戶自行安裝的金鑰。" #~ msgid "Set _maximum size for the package cache" @@ -949,8 +1026,8 @@ msgstr "" #~ msgid "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" -#~ "The following packages are found to be upgradable. You can upgrade them by " -#~ "using the Install button." +#~ "The following packages are found to be upgradable. You can upgrade them " +#~ "by using the Install button." #~ msgstr "" #~ "<big><b>Available Updates</b></big>\n" #~ "\n" @@ -1025,9 +1102,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "版本 %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下載更改紀錄..." - #~ msgid "There are no updated packages" #~ msgstr "沒有任何套件需要更新" @@ -1043,7 +1117,8 @@ msgstr "" #, fuzzy #~ msgid "You have selected %s out of %s updated package, size %s" -#~ msgid_plural "You have selected %s out of %s updated packages, total size %s" +#~ msgid_plural "" +#~ "You have selected %s out of %s updated packages, total size %s" #~ msgstr[0] "您選取了 %2$s 個更新套件中的 %1$s 個，大小為 %3$s" #~ msgstr[1] "您選取了 %2$s 個更新套件中的 %1$s 個，大小總共為 %3$s" @@ -1051,8 +1126,8 @@ msgstr "" #~ msgstr "現在安裝更新套件。" #~ msgid "" -#~ "You can run only one package management application at the same time. Please " -#~ "close this other application first." +#~ "You can run only one package management application at the same time. " +#~ "Please close this other application first." #~ msgstr "您在任何時候只可以執行一個套件管理員程式。請關閉其它程式。" #~ msgid "Updating package list..." @@ -1069,19 +1144,21 @@ msgstr "" #~ msgid "" #~ "Please upgrade to a newer version of Ubuntu Linux. The version you are " -#~ "running will no longer get security fixes or other critical updates. Please " -#~ "see http://www.ubuntulinux.org for upgrade information." +#~ "running will no longer get security fixes or other critical updates. " +#~ "Please see http://www.ubuntulinux.org for upgrade information." #~ msgstr "" -#~ "請升級至新版本的 Ubuntu Linux。您現在用的版本不會再有任何安全性更新或重要的更新。有關升級的資訊，請瀏覽 " -#~ "http://www.ubuntulinux.org 。" +#~ "請升級至新版本的 Ubuntu Linux。您現在用的版本不會再有任何安全性更新或重要" +#~ "的更新。有關升級的資訊，請瀏覽 http://www.ubuntulinux.org 。" #~ msgid "There is a new release of Ubuntu available!" #~ msgstr "Ubuntu 已推出新版本！" #~ msgid "" -#~ "A new release with the codename '%s' is available. Please see " -#~ "http://www.ubuntulinux.org/ for upgrade instructions." -#~ msgstr "名稱為 “%s” 的新版本已經推出。請瀏覽 http://www.ubuntulinux.org/ 獲取有關升級的指引。" +#~ "A new release with the codename '%s' is available. Please see http://www." +#~ "ubuntulinux.org/ for upgrade instructions." +#~ msgstr "" +#~ "名稱為 “%s” 的新版本已經推出。請瀏覽 http://www.ubuntulinux.org/ 獲取有關" +#~ "升級的指引。" #~ msgid "Never show this message again" #~ msgstr "以後不再顯示此訊息" @@ -1092,4 +1169,4 @@ msgstr "" #~ msgid "" #~ "Failed to download changes. Please check if there is an active internet " #~ "connection." -#~ msgstr "無法下載更改紀錄。請檢查網路連線是否正常。"
\ No newline at end of file +#~ msgstr "無法下載更改紀錄。請檢查網路連線是否正常。" |