diff options
| -rwxr-xr-x | DistUpgrade/build-dist.sh | 18 | ||||
| -rw-r--r-- | po/bg.po | 291 | ||||
| -rw-r--r-- | po/da.po | 252 | ||||
| -rw-r--r-- | po/de.po | 288 | ||||
| -rw-r--r-- | po/el.po | 263 | ||||
| -rw-r--r-- | po/en_CA.po | 285 | ||||
| -rw-r--r-- | po/en_GB.po | 285 | ||||
| -rw-r--r-- | po/es.po | 285 | ||||
| -rw-r--r-- | po/fi.po | 282 | ||||
| -rw-r--r-- | po/fr.po | 285 | ||||
| -rw-r--r-- | po/gl.po | 291 | ||||
| -rw-r--r-- | po/he.po | 291 | ||||
| -rw-r--r-- | po/hu.po | 285 | ||||
| -rw-r--r-- | po/it.po | 291 | ||||
| -rw-r--r-- | po/ja.po | 285 | ||||
| -rw-r--r-- | po/lt.po | 291 | ||||
| -rw-r--r-- | po/mk.po | 291 | ||||
| -rw-r--r-- | po/nb.po | 285 | ||||
| -rwxr-xr-x | po/ne.po | 285 | ||||
| -rw-r--r-- | po/nl.po | 254 | ||||
| -rw-r--r-- | po/no.po | 285 | ||||
| -rw-r--r-- | po/pa.po | 269 | ||||
| -rw-r--r-- | po/pl.po | 285 | ||||
| -rw-r--r-- | po/pt.po | 282 | ||||
| -rw-r--r-- | po/pt_BR.po | 287 | ||||
| -rw-r--r-- | po/ro.po | 279 | ||||
| -rw-r--r-- | po/rw.po | 288 | ||||
| -rw-r--r-- | po/sv.po | 294 | ||||
| -rw-r--r-- | po/uk.po | 291 | ||||
| -rw-r--r-- | po/update-manager.pot | 254 | ||||
| -rw-r--r-- | po/vi.po | 291 | ||||
| -rw-r--r-- | po/xh.po | 264 | ||||
| -rw-r--r-- | po/zh_CN.po | 282 | ||||
| -rw-r--r-- | po/zh_HK.po | 291 | ||||
| -rw-r--r-- | po/zh_TW.po | 291 |
35 files changed, 5756 insertions, 3860 deletions
diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh index f18dc2ce..f48c4e39 100755 --- a/DistUpgrade/build-dist.sh +++ b/DistUpgrade/build-dist.sh @@ -10,6 +10,7 @@ TARGETDIR=../dist-upgrade-build SOURCEDIR=`pwd` DIST=dapper +MAINTAINER="Michael Vogt <michael.vogt@ubuntu.com>" NOTES=ReleaseAnouncement version=$(date +%Y%m%d.%H%M) @@ -33,11 +34,20 @@ TARBALL="dist-upgrader_"$version"_all.tar.gz" tar czvf $TARBALL $version # now create a changes file -CHANGES="dist-upgrader_$version.changes" -echo "Format: 1.7" > $CHANGES +CHANGES="dist-upgrader_"$version"_all.changes" +echo > $CHANGES +echo "Origin: Ubuntu/$DIST" >> $CHANGES +echo "Format: 1.7" >> $CHANGES echo "Date: `date -R`" >> $CHANGES echo "Architecture: all">>$CHANGES echo "Version: $version" >>$CHANGES -echo "Distribution: dapper" >>$CHANGES +echo "Distribution: $DIST" >>$CHANGES +echo "Source: dist-upgrader" >> $CHANGES +echo "Binary: dist-upgrader" >> $CHANGES +echo "Urgency: low" >> $CHANGES +echo "Maintainer: $MAINTAINER" >> $CHANGES +echo "Changed-By: $MAINTAINER" >> $CHANGES +echo "Changes: " >> $CHANGES +echo " * new upstream version" >> $CHANGES echo "Files: " >> $CHANGES -echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader $TARBALL" >> $CHANGES +echo " `md5sum $TARBALL | awk '{print $1}'` `stat --format=%s $TARBALL` raw-dist-upgrader - $TARBALL" >> $CHANGES @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-07-22 19:24+0300\n" "Last-Translator: Rostislav \"zbrox\" Raykov <zbrox@i-space.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -17,39 +17,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -57,11 +57,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -98,23 +98,23 @@ msgstr "" "грешка." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 +124,11 @@ msgstr "" "грешка." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -196,29 +196,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -226,54 +234,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Друга програма за управление на пакетите е стартирана." -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Обновлението е завършено" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -281,97 +289,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Инсталиране на обновленията..." +msgid "Applying changes" +msgstr "Сваляне на промените..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ключове</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Инсталиране" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -417,45 +433,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -482,58 +510,61 @@ msgid "Changes" msgstr "Промени" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Описание" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Проверка за обновления..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Презареждане от сървъра на информацията за пакетите." +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Инсталиране на обновленията..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Презареждане" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -601,7 +632,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,36 +644,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Ключове</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибуция:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Раздели:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Раздели:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Вид:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -658,15 +700,15 @@ msgstr "" "Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете " "подробно описание на синтаксиса в документацията." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Ред за APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -674,22 +716,27 @@ msgstr "" "Двоични\n" "Изходен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Лично" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Презареждане" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -736,25 +783,25 @@ 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 @@ -780,9 +827,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 обновления" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Официално поддържан" #. CompDescription @@ -840,6 +887,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription +#: ../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 "" @@ -850,6 +903,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Инсталиране на обновленията..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Презареждане от сървъра на информацията за пакетите." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Раздели:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Обновления на софтуера" @@ -885,9 +949,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ден/дни" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Хранилище</b>" @@ -1070,9 +1131,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Версия %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Сваляне на промените..." - #~ msgid "There are no updated packages" #~ msgstr "Няма пакети за обновяване" @@ -1105,9 +1163,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Обновяване на списъка с пакетите..." -#~ msgid "Checking for updates..." -#~ msgstr "Проверка за обновления..." - #~ msgid "There are no updates available." #~ msgstr "Няма налични обновления." @@ -1,34 +1,34 @@ -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -36,11 +36,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -74,34 +74,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -168,29 +168,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -198,52 +206,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -251,93 +259,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, 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 "" @@ -382,45 +398,56 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -447,53 +474,57 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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 can correct errors, eliminate security vulnerabilities, and " -"provide new features to you." +msgid "Software Updates" msgstr "" #: ../data/UpdateManager.glade.h:17 -msgid "U_pgrade" +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." msgstr "" #: ../data/UpdateManager.glade.h:18 -msgid "Upgrade to the latest version of Ubuntu" +msgid "U_pgrade" msgstr "" #: ../data/UpdateManager.glade.h:19 -msgid "_Hide this information in the future" +msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:20 -msgid "_Install Updates" +msgid "_Check" msgstr "" #: ../data/UpdateManager.glade.h:21 -msgid "_Reload" +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" msgstr "" #: ../data/SoftwareProperties.glade.h:1 @@ -556,7 +587,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 @@ -568,34 +599,44 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Channel</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 -msgid "<b>Distribution:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -604,36 +645,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -679,22 +724,22 @@ 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 @@ -718,8 +763,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -774,6 +819,11 @@ 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 "" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2006-03-10 17:54+0100\n" "Last-Translator: Frank Arnold <frank@scirocco-5v-turbo.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -17,41 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "Alle %s Tage" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "Nach %s Tagen" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -62,11 +62,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "Bitte geben Sie einen Namen für die CD ein" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie die CD in das Laufwerk" @@ -103,23 +103,23 @@ msgstr "" "hierfür einen Fehlerbericht." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -129,11 +129,11 @@ msgstr "" "hierfür einen Fehlerbericht." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -201,29 +201,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -231,54 +239,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Ein andere Paketverwaltung läuft bereits" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Aktualisierung fertiggestellt" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -286,98 +294,106 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Aktualisierungen werden installiert..." +msgid "Applying changes" +msgstr "Änderungen werden heruntergeladen..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Das System enthält defekte Pakete!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Details</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Installieren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Aktualisierung fertiggestellt" -#: ../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 "" @@ -424,46 +440,59 @@ 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 "" +# »Aktualisieren« könnte hier verwirrend sein -fa- #: ../DistUpgrade/DistUpgrade.glade.h:18 #, fuzzy +msgid "_Replace" +msgstr "Neu laden" + +#: ../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 "Aktualisierung fertiggestellt" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -490,60 +519,61 @@ msgid "Changes" msgstr "Änderungen" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Beschreibung" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Aktuelle Paketinformationen vom Server beziehen." +msgid "Description" +msgstr "Beschreibung" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Aktualisierung fertiggestellt" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Installieren" -# »Aktualisieren« könnte hier verwirrend sein -fa- -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Neu laden" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -614,7 +644,7 @@ 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" +msgid "_Download updates in the background, but do not install them" msgstr "" #: ../data/SoftwareProperties.glade.h:16 @@ -626,36 +656,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Details</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenten</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sparten:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sektionen:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -671,15 +712,15 @@ msgstr "" "<i>»deb http://ftp.debian.org sarge main«</i>. Eine ausführliche " "Beschreibung des Syntax ist in der Dokumentation zu finden." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT-Zeile:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "Kanal hinzufügen" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -687,22 +728,28 @@ msgstr "" "Binär\n" "Quellcode" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "Kanal bearbeiten" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Benutzerdefiniert" +# »Aktualisieren« könnte hier verwirrend sein -fa- +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Neu laden" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -752,25 +799,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. Description @@ -798,9 +845,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Offiziell unterstützt" #. CompDescription @@ -856,6 +903,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Offiziell unterstützt" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -866,6 +919,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Aktualisierungen werden installiert..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Aktuelle Paketinformationen vom Server beziehen." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sparten:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Software-Aktualisierungen" @@ -924,9 +988,6 @@ msgstr "" #~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen " #~ "werden." -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenten</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -1046,9 +1107,6 @@ msgstr "" #~ 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." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-05 14:33+0200\n" "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n" "Language-Team: Greek <team@gnome.gr>\n" @@ -16,37 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,34 +92,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -186,29 +186,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -216,52 +224,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -269,93 +277,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ενότητες:</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, 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 "" @@ -401,45 +417,56 @@ 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 msgid "_Resume Upgrade" msgstr "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -466,53 +493,57 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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 can correct errors, eliminate security vulnerabilities, and " -"provide new features to you." +msgid "Software Updates" msgstr "" #: ../data/UpdateManager.glade.h:17 -msgid "U_pgrade" +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." msgstr "" #: ../data/UpdateManager.glade.h:18 -msgid "Upgrade to the latest version of Ubuntu" +msgid "U_pgrade" msgstr "" #: ../data/UpdateManager.glade.h:19 -msgid "_Hide this information in the future" +msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:20 -msgid "_Install Updates" +msgid "_Check" msgstr "" #: ../data/UpdateManager.glade.h:21 -msgid "_Reload" +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" msgstr "" #: ../data/SoftwareProperties.glade.h:1 @@ -581,7 +612,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 @@ -593,36 +624,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Ενότητες:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Σχόλιο:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Συστατικά</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Διανομή:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Ενότητες:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Ενότητες:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Τύπος:</b> " -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -638,36 +680,40 @@ msgstr "" "repository, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>. " "Μπορείτε να βρείτε λεπτομερήςπεριγραφή του τρόπου σύνταξης στην τεκμηρίωση." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Γραμμή APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -713,22 +759,22 @@ 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 @@ -752,8 +798,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -808,6 +854,11 @@ 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 "" @@ -817,6 +868,9 @@ msgstr "" msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Ενότητες:</b>" + #, fuzzy #~ msgid "<b>Sources</b>" #~ msgstr "<b>Πηγές λογισμικού</b>" @@ -825,9 +879,6 @@ msgstr "" #~ msgid "<b>Packages to install:</b>" #~ msgstr "<b>Ενότητες:</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Συστατικά</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" diff --git a/po/en_CA.po b/po/en_CA.po index 31c7d3ed..9db0fa60 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-04-03 01:26-0500\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -16,38 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -95,23 +95,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -120,11 +120,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -192,29 +192,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -222,54 +230,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -277,97 +285,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installing updates..." +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, 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:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Details</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Install" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Upgrade finished" -#: ../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 "" @@ -413,46 +429,58 @@ 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" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -479,59 +507,61 @@ msgid "Changes" msgstr "Changes" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Description" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Reload the package information from the server." +msgid "Description" +msgstr "Description" #: ../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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Reload" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -601,7 +631,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,36 +643,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Details</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sections:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -658,15 +699,15 @@ msgstr "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " "detailed description of the syntax in the documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -674,22 +715,27 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Custom" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Reload" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -736,25 +782,25 @@ 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 @@ -782,9 +828,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officially supported" #. CompDescription @@ -840,6 +886,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../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 "" @@ -850,6 +902,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installing updates..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Reload the package information from the server." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Software Updates" @@ -902,9 +965,6 @@ msgstr "" #~ "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>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -1018,9 +1078,6 @@ 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." diff --git a/po/en_GB.po b/po/en_GB.po index 71f00bd5..96e8f28c 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-04-19 22:51-0400\n" "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n" "Language-Team: \n" @@ -16,38 +16,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -95,23 +95,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -120,11 +120,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -192,29 +192,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -222,55 +230,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -278,97 +286,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installing updates..." +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, 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:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Details</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Install" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Upgrade finished" -#: ../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 "" @@ -414,45 +430,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -479,58 +507,60 @@ msgid "Changes" msgstr "Changes" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Description" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Reload the package information from the server." +msgid "Description" +msgstr "Description" #: ../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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Reload" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -602,7 +632,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 @@ -614,36 +644,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Details</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sections:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -659,15 +700,15 @@ msgstr "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " "detailed description of the syntax in the documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -675,22 +716,27 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Custom" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Reload" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -737,25 +783,25 @@ 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 @@ -781,9 +827,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Officially supported" #. CompDescription @@ -841,6 +887,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription +#: ../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 "" @@ -851,6 +903,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installing updates..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Reload the package information from the server." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Software Updates" @@ -884,9 +947,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>" @@ -1072,9 +1132,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" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-04-04 15:00+0200\n" "Last-Translator: Jorge Bernal <koke@amedias.org>\n" "Language-Team: Spanish <traductores@gnome.org>\n" @@ -19,41 +19,41 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Hubo un error al importar el fichero seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -61,11 +61,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,23 +102,23 @@ msgstr "" "como un fallo." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -128,11 +128,11 @@ msgstr "" "como un fallo." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -200,29 +200,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -230,54 +238,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Ya hay otro gestor de paquetes en ejecución" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Actualización finalizada" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -285,98 +293,106 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Instalando actualizaciones..." +msgid "Applying changes" +msgstr "Descargando informe de cambios..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " "como un fallo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "¡Su sistema tiene paquetes rotos!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detalles:</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instalar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Actualización finalizada" -#: ../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 "" @@ -422,46 +438,58 @@ 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 +#, fuzzy msgid "_Resume Upgrade" msgstr "Actualización finalizada" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -488,59 +516,61 @@ msgid "Changes" msgstr "Cambios" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descripción" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Recargar la información del paquete desde el servidor." +msgid "Description" +msgstr "Descripción" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Actualización finalizada" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Instalar" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Recargar" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -610,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 @@ -622,36 +652,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Detalles:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componentes</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribución:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Secciones:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Secciones:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -667,15 +708,15 @@ msgstr "" "por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Puede encontrar " "una descripción detallada de la sintaxis en la documentación." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Línea de APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -683,22 +724,27 @@ msgstr "" "Binario\n" "Fuente" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Personalizado" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Recargar" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -745,25 +791,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Actualizaciones de seguridad de Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Actualizaciones de Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Actualizaciones de Ubuntu 5.04" #. Description @@ -791,9 +837,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Actualizaciones de Ubuntu 5.04" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Soportado oficialmente" #. CompDescription @@ -849,6 +895,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Soportado oficialmente" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -859,6 +911,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Instalando actualizaciones..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Recargar la información del paquete desde el servidor." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Secciones:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Actualizaciones de software" @@ -912,9 +975,6 @@ msgstr "" #~ "El gestor de actualizaciones encontró los siguientes paquetes " #~ "actualizables. Puede actualizarlos usando el botón Instalar." -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Componentes</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repositorio</b>" @@ -1032,9 +1092,6 @@ msgstr "" #~ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-30 08:30+0200\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n" "Language-Team: Finnish <LL@li.org>\n" @@ -16,38 +16,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -95,23 +95,23 @@ msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -120,11 +120,11 @@ msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -192,29 +192,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -222,54 +230,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Toinen pakettienhallinta on käynnissä" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Päivitykset suoritettu" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -277,96 +285,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#, fuzzy +msgid "Applying changes" +msgstr "Ladataan muutoksia..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Järjestelmässä on rikkinäisiä paketteja!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Yksityiskohdat</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Asenna" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Päivitykset suoritettu" -#: ../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 "" @@ -412,46 +429,58 @@ msgid "Details" msgstr "<b>Yksityiskohdat</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 "Päivitä" + +#: ../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 "Päivitykset suoritettu" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -478,59 +507,61 @@ msgid "Changes" msgstr "Muutokset" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Kuvaus" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Lataa pakettitiedot uudelleen palvelimelta." +msgid "Description" +msgstr "Kuvaus" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Päivitykset suoritettu" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Asenna" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Päivitä" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -599,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 @@ -612,36 +643,47 @@ msgid " " msgstr " " #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Yksityiskohdat</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Kommentti:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponentit</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Jakelu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Osastot:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Osastot:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tyyppi:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -656,15 +698,15 @@ msgstr "" "\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät " "dokumentaatiosta." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT-rivi:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -672,22 +714,27 @@ msgstr "" "Binääri\n" "Lähdekoodi" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Muu" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Päivitä" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -734,25 +781,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. Description @@ -780,9 +827,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 turvallisuuspäivitykset" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Virallisesti tuettu" #. CompDescription @@ -838,6 +885,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Virallisesti tuettu" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -848,6 +901,13 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Lataa pakettitiedot uudelleen palvelimelta." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Osastot:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Ohjelmapäivitykset" @@ -900,9 +960,6 @@ msgstr "" #~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla " #~ "Asenna-painiketta." -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponentit</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Varasto</b>" @@ -1013,9 +1070,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Versio: %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Ladataan muutoksia..." - #~ msgid "The updates are being applied." #~ msgstr "Päivityksiä asennetaan." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -16,41 +16,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Erreur lors du chargement du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer " "ceci comme étant un bug." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +58,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -99,23 +99,23 @@ msgstr "" "ceci comme étant un bug." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -125,11 +125,11 @@ msgstr "" "ceci comme étant un bug." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -197,29 +197,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -227,54 +235,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Un autre gestionnaire de paquets est en fonctionnement" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Mise à jour terminée" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -282,98 +290,106 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installation des mises à jour..." +msgid "Applying changes" +msgstr "Téléchargement des changements..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer " "ceci comme étant un bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Votre système a des paquets cassés !" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Détails</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Mise à jour terminée" -#: ../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 "" @@ -419,46 +435,58 @@ msgid "Details" msgstr "<b>Détails</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 "Recharger" + +#: ../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 "Mise à jour terminée" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -485,59 +513,61 @@ msgid "Changes" msgstr "Changements" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Description" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Recharger les informations des paquets depuis le serveur" +msgid "Description" +msgstr "Description" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Mise à jour terminée" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Installer" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Recharger" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -607,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 @@ -620,36 +650,47 @@ msgid " " msgstr " " #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Détails</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Commentaire :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Composants</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sections :</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sections :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -665,15 +706,15 @@ msgstr "" "exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une " "description détaillée de la syntaxe dans la documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Ligne APT :" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -681,22 +722,27 @@ msgstr "" "Binaire\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Personnalisé" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Recharger" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -743,25 +789,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 Mises à jour de sécurité" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Mises à jour d'Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Mises à jour d'Ubuntu 5.04" #. Description @@ -789,9 +835,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Mises à jour d'Ubuntu 5.04" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Supportés officiellement" #. CompDescription @@ -847,6 +893,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Supportés officiellement" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -857,6 +909,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installation des mises à jour..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Recharger les informations des paquets depuis le serveur" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections :</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Mises à jour des logiciels" @@ -910,9 +973,6 @@ msgstr "" #~ "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>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Dépôt</b>" @@ -1031,9 +1091,6 @@ msgstr "" #~ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-12-02 15:59+0100\n" "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" "Language-Team: Galego\n" @@ -17,41 +17,41 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -59,11 +59,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -100,23 +100,23 @@ msgstr "" "erro." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -126,11 +126,11 @@ msgstr "" "erro." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -198,29 +198,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -228,54 +236,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -283,97 +291,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Instalando actualizacións..." +msgid "Applying changes" +msgstr "Descargando cambios..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, 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:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Claves</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instalar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Actualización rematada" -#: ../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 "" @@ -419,45 +435,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -484,58 +512,61 @@ msgid "Changes" msgstr "Cambios" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descrición" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Comprobando se hai actualizacións..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Recargar a información do paquete desde o servidor." +msgid "Description" +msgstr "Descrición" #: ../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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Recargar" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -603,7 +634,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 @@ -615,36 +646,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Claves</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Compoñentes</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribución:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Seccións:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Seccións:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -660,15 +702,15 @@ msgstr "" "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha " "descrición detallada da sintase na documentación." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Liña de APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -676,22 +718,27 @@ msgstr "" "Binario\n" "Fonte" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Personalizar" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Recargar" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -738,25 +785,25 @@ 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 @@ -782,9 +829,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Actualizacións de Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Soporte oficial" #. CompDescription @@ -842,6 +889,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Inestable)" #. CompDescription +#: ../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 "" @@ -852,6 +905,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Instalando actualizacións..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Recargar a información do paquete desde o servidor." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Seccións:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Actualizacións de software" @@ -888,9 +952,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>" @@ -1056,9 +1117,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" @@ -1091,9 +1149,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Actualizando a lista de paquetes..." -#~ msgid "Checking for updates..." -#~ msgstr "Comprobando se hai actualizacións..." - #~ msgid "There are no updates available." #~ msgstr "Non hai actualizacións dispoñibles." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-08-07 14:49+0300\n" "Last-Translator: Yuval Tanny\n" "Language-Team: Hebrew <he@li.org>\n" @@ -20,37 +20,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +58,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -97,23 +97,23 @@ msgid "" msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -121,11 +121,11 @@ msgid "" msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -193,29 +193,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -223,54 +231,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "מנהל חבילות אחר רץ" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "השדרוג הסתיים" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -278,95 +286,103 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "מתקין עדכונים..." +msgid "Applying changes" +msgstr "מוריד שינויים..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>מפתחות</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_התקן" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -412,45 +428,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -477,58 +505,61 @@ msgid "Changes" msgstr "שינויים" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "תיאור" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "בודק אם יש עדכונים..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "טען מחדש את המידע על החבילה מהשרת" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "טען מחדש" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -596,7 +627,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 @@ -608,36 +639,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>מפתחות</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>הערות:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>רכיבים</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>הפצה:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>מחלקה:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>מחלקה:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>סוג:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>כתובת:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -652,15 +694,15 @@ msgstr "" "org sarge main\"</i>\n" "אפשר למצוא הסבר מפורט על זה בתיעוד." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT שורת:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -668,22 +710,27 @@ msgstr "" "מקור\n" "בינארי" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_התאם אישית" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "טען מחדש" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -730,25 +777,25 @@ 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 @@ -774,9 +821,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "עדכונים - אובונטו 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "נתמך רשמית" #. CompDescription @@ -834,6 +881,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "דביאן לא ארה\"ב (לא יציב)" #. CompDescription +#: ../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 "" @@ -844,6 +897,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "מתקין עדכונים..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "טען מחדש את המידע על החבילה מהשרת" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>מחלקה:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "עדכוני תוכנה" @@ -879,9 +943,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ימים" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>רכיבים</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>מאגר</b>" @@ -1052,9 +1113,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "גרסה %s:\n" -#~ msgid "Downloading changes..." -#~ msgstr "מוריד שינויים..." - #~ msgid "There are no updated packages" #~ msgstr "אין חבילות מעודכנות" @@ -1086,9 +1144,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "מעדכן רשימת חבילות..." -#~ msgid "Checking for updates..." -#~ msgstr "בודק אם יש עדכונים..." - #~ msgid "There are no updates available." #~ 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-04-03 12:32+0200\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -17,38 +17,38 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -96,23 +96,23 @@ msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -121,11 +121,11 @@ msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -193,29 +193,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -223,54 +231,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Már fut egy másik csomagkezelő" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "A frissítés befejeződött" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -278,94 +286,102 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Frissítések telepítése..." +msgid "Applying changes" +msgstr "Módosítások letöltése..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "A rendszerén törött csomagok vannak!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Részletek</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Telepítés" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "A frissítés befejeződött" -#: ../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 "" @@ -411,46 +427,58 @@ msgid "Details" msgstr "<b>Részletek</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 "Újratöltés" + +#: ../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 "A frissítés befejeződött" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -477,59 +505,61 @@ msgid "Changes" msgstr "Módosítások" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Leírás" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról." +msgid "Description" +msgstr "Leírás" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "A frissítés befejeződött" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Újratöltés" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -599,7 +629,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,36 +641,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Részletek</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Megjegyzés:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Összetevők</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Disztribúció:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Csoportok:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Csoportok:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Típus:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -655,15 +696,15 @@ msgstr "" "\"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:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT sor:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -671,22 +712,27 @@ msgstr "" "Bináris\n" "Forrás" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Egyéni" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Újratöltés" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -733,25 +779,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 biztonsági frissítések" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.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 5.04 biztonsági frissítések" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.04 biztonsági frissítések" #. Description @@ -779,9 +825,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 biztonsági frissítések" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Hivatalosan támogatott" #. CompDescription @@ -837,6 +883,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Hivatalosan támogatott" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -847,6 +899,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Frissítések telepítése..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "A csomaginformációk ismételt letöltése a kiszolgálóról." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Csoportok:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Szoftverfrissítések" @@ -899,9 +962,6 @@ msgstr "" #~ "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>" @@ -1019,9 +1079,6 @@ msgstr "" #~ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-10-26 12:25+0200\n" "Last-Translator: Fabio Marzocca <thesaltydog@gmail.com>\n" "Language-Team: Italian <it@li.org>\n" @@ -17,41 +17,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Errore nell'importazione del file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Errore rimuovendo la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Per favore riporta questo come " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -59,11 +59,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -100,23 +100,23 @@ msgstr "" "bug." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -126,11 +126,11 @@ msgstr "" "bug." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -198,29 +198,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -228,54 +236,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Un altro gestore di pacchetti è in esecuzione" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Aggiornamento terminato" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -283,97 +291,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installazione degli aggiornamenti..." +msgid "Applying changes" +msgstr "Download modifiche in corso..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "La chiave selezionata non può essere rimossa. Per favore riporta questo come " "bug." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Chiavi</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Installa" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Aggiornamento terminato" -#: ../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 "" @@ -419,45 +435,57 @@ msgid "Details" msgstr "<b>Dettagli</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 "Ricarica" + +#: ../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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -484,58 +512,61 @@ msgid "Changes" msgstr "Modifiche" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descrizione" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Verifica degli aggiornamenti..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Ricarica le informazioni del pacchetto dal server" +msgid "Description" +msgstr "Descrizione" #: ../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 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." 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installazione degli aggiornamenti..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Ricarica" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -603,7 +634,7 @@ msgid "_Check for updates automatically:" msgstr "Verifica aggiornamenti ogni" #: ../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 @@ -615,36 +646,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Chiavi</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Commento:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componenti</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribuzione:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sezioni:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sezioni:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -660,15 +702,15 @@ msgstr "" "ad esempio <i>\"deb http://ftp.debian.org sarge main\"</i>. Puoi trovare una " "descrizione dettagliata della sintassi nella documentazione." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Riga APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -676,22 +718,27 @@ msgstr "" "Binari\n" "Sorgenti" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Personalizzato" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Ricarica" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -738,25 +785,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Aggiornamenti di Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Aggiornamenti di Ubuntu 5.10" #. Description @@ -782,9 +829,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Aggiornamenti di Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Supportato ufficialmente" #. CompDescription @@ -842,6 +889,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian·Non-US·(Unstable)" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Supportato ufficialmente" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -852,6 +905,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installazione degli aggiornamenti..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Ricarica le informazioni del pacchetto dal server" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sezioni:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Aggiornamenti Software" @@ -889,9 +953,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "giorni" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Componenti</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -1058,9 +1119,6 @@ msgstr "" #~ 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" @@ -1086,9 +1144,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Aggiornamento della lista dei pacchetti..." -#~ msgid "Checking for updates..." -#~ msgstr "Verifica degli aggiornamenti..." - #~ msgid "There are no updates available." #~ msgstr "Non ci sono aggiornamenti disponibili." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-10-12 17:28+0900\n" "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu-ja <ubuntu-ja-users@freeml.com>\n" @@ -17,38 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "キー削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -95,23 +95,23 @@ msgid "" msgstr "選択したキーを削除できませんでした。バグとして報告してください。" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 +119,11 @@ msgid "" msgstr "選択したキーを削除できませんでした。バグとして報告してください。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -191,29 +191,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -221,54 +229,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "他のパッケージマネージャが動いています" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "アップグレードが終了しました" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -276,96 +284,104 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "アップデートをインストール中..." +msgid "Applying changes" +msgstr "変更点を取得中..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "システムに壊れたパッケージがあります！" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>詳細</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "インストール(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -411,45 +427,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -476,58 +504,60 @@ msgid "Changes" msgstr "変更点" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "詳細" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "サーバからパッケージ情報を再度読み込む。" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "アップデートをインストール中..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "再読込" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -597,7 +627,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 @@ -609,36 +639,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>詳細</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>コメント:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>コンポーネント</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>ディストリビューション:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>セクション:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>セクション:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>タイプ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -653,15 +694,15 @@ msgstr "" "ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か" "れています。" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -669,22 +710,27 @@ msgstr "" "バイナリ\n" "ソース" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "カスタム(_C)" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "再読込" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -731,25 +777,25 @@ 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 @@ -775,9 +821,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 セキュリティアップデート" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "公式サポート" #. CompDescription @@ -833,6 +879,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../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 "" @@ -843,6 +895,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "アップデートをインストール中..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "サーバからパッケージ情報を再度読み込む。" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>セクション:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "ソフトウェアのアップデート" @@ -881,9 +944,6 @@ msgstr "" #~ msgid "Choose a key-file" #~ msgstr "キーファイルを選択" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>コンポーネント</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>リポジトリ</b>" @@ -1065,9 +1125,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "バージョン %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "変更点を取得中..." - #~ msgid "The updates are being applied." #~ 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-09-15 15:06+0300\n" "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -17,38 +17,38 @@ msgstr "" "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:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Importuojant pasirinktą bylą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Pasirinkta byla gali būti ne GPG rakto byla arba sugadinta byla." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -96,23 +96,23 @@ msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -121,11 +121,11 @@ msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -193,29 +193,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -223,54 +231,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Šiuo metu jau veikia kita paketų tvarkyklė" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Atnaujinimas baigtas" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -278,33 +286,41 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Diegiami atnaujinimai..." +msgid "Applying changes" +msgstr "Parsiunčiami pakeitimai..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -312,7 +328,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -320,7 +336,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:364 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -328,49 +344,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Raktai</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "Į_diegti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Atnaujinimas baigtas" -#: ../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 "" @@ -416,45 +432,57 @@ msgid "Details" msgstr "<b>Detalės</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 "Atnaujinti" + +#: ../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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -481,58 +509,61 @@ msgid "Changes" msgstr "Pakeitimai" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Aprašymas" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Ieškoma atnaujinimų..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Atnaujinti serverio paketų informaciją." +msgid "Description" +msgstr "Aprašymas" #: ../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 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." 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Diegiami atnaujinimai..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Atnaujinti" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -600,7 +631,7 @@ msgid "_Check for updates automatically:" msgstr "Tikrinti atnaujinimus kas" #: ../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,36 +643,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Raktai</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Komentaras:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponentai</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribucija:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Skyriai:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Skyriai:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tipas:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -656,15 +698,15 @@ msgstr "" "debian.org sarge main“</i>. Išsamesnį sintaksės aprašymą galite rasti " "dokumentacijoje." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT eilutė:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -672,22 +714,27 @@ msgstr "" "Dvejetainis\n" "Pradinis kodas" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Kita" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Atnaujinti" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -734,25 +781,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Ubuntu 5.04 atnaujinimai" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Ubuntu 5.04 saugumo atnaujinimai" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 atnaujinimai" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. Description @@ -778,9 +825,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 atnaujinimai" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Prižiūrima oficialiai" #. CompDescription @@ -838,6 +885,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Prižiūrima oficialiai" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -848,6 +901,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Diegiami atnaujinimai..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Atnaujinti serverio paketų informaciją." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Skyriai:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Programinės įrangos atnaujinimai" @@ -883,9 +947,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "dieną(as)" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponentai</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Saugykla</b>" @@ -1066,9 +1127,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Versija %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Parsiunčiami pakeitimai..." - #~ msgid "There are no updated packages" #~ msgstr "Nėra atnaujintų paketų" @@ -1104,9 +1162,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Atnaujinamas paketų sąrašas..." -#~ msgid "Checking for updates..." -#~ msgstr "Ieškoma atnaujinimų..." - #~ msgid "There are no updates available." #~ msgstr "Nėra atnaujinimų." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-03-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-07-20 01:21+0200\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -17,40 +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:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +58,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -99,23 +99,23 @@ msgstr "" "како бубачка." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -125,11 +125,11 @@ msgstr "" "како бубачка." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -197,29 +197,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -227,54 +235,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -282,34 +290,42 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Инсталирам надградби..." +msgid "Applying changes" +msgstr "Преземам промени..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -317,7 +333,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -325,7 +341,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:364 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -333,49 +349,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Копчиња</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Инсталирај" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -421,45 +437,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -486,58 +514,61 @@ msgid "Changes" msgstr "Промени" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Опис" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Проверувам за надградби..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Освежи ги информациите за пакетите на серверот." +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Освежи" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -605,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 @@ -617,36 +648,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Копчиња</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибуција:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Оддели:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Оддели:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Тип:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>Адреса:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -662,15 +704,15 @@ msgstr "" "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата " "можете да најдете детален опис на синтаксата." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT линија:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -678,22 +720,27 @@ msgstr "" "Бинарни\n" "Изворен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Сопствено" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Освежи" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -740,25 +787,25 @@ 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 @@ -784,9 +831,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Надградби за Убунту 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Официјално поддржано" #. CompDescription @@ -844,6 +891,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription +#: ../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 "" @@ -854,6 +907,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Инсталирам надградби..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Освежи ги информациите за пакетите на серверот." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Оддели:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Надградба на софтвер" @@ -889,9 +953,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "ден(а)" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Складиште</b>" @@ -1056,9 +1117,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Верзија %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Преземам промени..." - #~ msgid "There are no updated packages" #~ msgstr "Нема надградени пакети" @@ -1094,9 +1152,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Ја ажурирам листата на пакети..." -#~ msgid "Checking for updates..." -#~ msgstr "Проверувам за надградби..." - #~ msgid "There are no updates available." #~ 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-03-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+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" @@ -17,38 +17,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -96,23 +96,23 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -121,11 +121,11 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -193,29 +193,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -223,55 +231,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -279,97 +287,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installerer oppdateringer..." +msgid "Applying changes" +msgstr "Laster ned endringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Systemet har ødelagte pakker!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detaljer</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" -#: ../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 "" @@ -415,45 +431,57 @@ msgid "Details" msgstr "<b>Detaljer</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 "Oppdater" + +#: ../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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -480,58 +508,60 @@ msgid "Changes" msgstr "Endringer" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Beskrivelse" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Oppdater pakkeinformasjonen fra tjeneren." +msgid "Description" +msgstr "Beskrivelse" #: ../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 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." 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Oppdater" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -602,7 +632,7 @@ msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." #: ../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 @@ -614,36 +644,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Detaljer</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenter</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribusjon:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Seksjoner:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Seksjoner:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -658,15 +699,15 @@ msgstr "" "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en " "detaljert beskrivelse av syntaksen i dokumentasjonen." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT-linje:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -674,22 +715,27 @@ msgstr "" "Binær\n" "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Tilpasset" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Oppdater" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -736,25 +782,25 @@ 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 @@ -780,9 +826,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Offisielt støttet" #. CompDescription @@ -840,6 +886,12 @@ 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 "" @@ -850,6 +902,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installerer oppdateringer..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Seksjoner:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Programvareoppdateringer" @@ -883,9 +946,6 @@ msgstr "" #~ msgid "<b>Sources</b>" #~ msgstr "<b>Programvarekilder</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenter</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Arkiv</b>" @@ -1066,9 +1126,6 @@ msgstr "" #~ 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" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-07-03 16:06+0545\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -18,37 +18,37 @@ msgstr "" "X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2;plural=(n!=0)\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -95,23 +95,23 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 +119,11 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -191,29 +191,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -221,54 +229,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -276,96 +284,104 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "स्तरवृद्धिहरु स्थापना गर्दै" +msgid "Applying changes" +msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>विवरणहरु</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "स्थापना गर्नुहोस" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -411,45 +427,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -476,58 +504,60 @@ msgid "Changes" msgstr "परिवर्तनहरु" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "बर्णन" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "फेरि लोड गर्नुहोस" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -599,7 +629,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,36 +641,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>विवरणहरु</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>टिप्पणि:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>तत्वहरु</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>वितरण:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>सेक्सनहरु:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>सेक्सनहरु:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>प्रकार:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>युआरएल:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -655,15 +696,15 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा " "विस्तृत विवरण पाउन सक्नुहुन्छ" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "एपिटि हरफ:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -671,22 +712,27 @@ msgstr "" "बाइनरी\n" "स्रोत" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "अनुकुलन गर्नुहोस" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "फेरि लोड गर्नुहोस" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -733,25 +779,25 @@ 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 @@ -779,9 +825,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" #. CompDescription @@ -838,6 +884,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" #. CompDescription +#: ../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 "" @@ -848,6 +900,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>सेक्सनहरु:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "सफ्टवेयर अद्यावधिकहरु" @@ -881,9 +944,6 @@ msgstr "" #~ msgid "<b>Sources</b>" #~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>तत्वहरु</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>कोष</b>" @@ -1042,9 +1102,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "संस्करण %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "परिवर्तनहरु डाउनलोड गर्दै" - #, fuzzy #~ msgid "There are no updated packages" #~ 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-07-13 06:24+0100\n" "Last-Translator: Michiel Sikkes <michiels@gnome.org>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\n" @@ -16,37 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,34 +92,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -186,29 +186,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -216,52 +224,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -269,93 +277,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, 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 "" @@ -400,45 +416,56 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -465,53 +492,57 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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 can correct errors, eliminate security vulnerabilities, and " -"provide new features to you." +msgid "Software Updates" msgstr "" #: ../data/UpdateManager.glade.h:17 -msgid "U_pgrade" +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." msgstr "" #: ../data/UpdateManager.glade.h:18 -msgid "Upgrade to the latest version of Ubuntu" +msgid "U_pgrade" msgstr "" #: ../data/UpdateManager.glade.h:19 -msgid "_Hide this information in the future" +msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:20 -msgid "_Install Updates" +msgid "_Check" msgstr "" #: ../data/UpdateManager.glade.h:21 -msgid "_Reload" +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" msgstr "" #: ../data/SoftwareProperties.glade.h:1 @@ -574,7 +605,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 @@ -586,34 +617,44 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Channel</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 -msgid "<b>Distribution:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -622,36 +663,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -697,22 +742,22 @@ 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 @@ -736,8 +781,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -792,6 +837,11 @@ 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 "" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+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" @@ -17,38 +17,38 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -56,11 +56,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -96,23 +96,23 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -121,11 +121,11 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -193,29 +193,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -223,55 +231,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -279,97 +287,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Installerer oppdateringer..." +msgid "Applying changes" +msgstr "Laster ned endringer..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Systemet har ødelagte pakker!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detaljer</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" -#: ../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 "" @@ -415,45 +431,57 @@ msgid "Details" msgstr "<b>Detaljer</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 "Oppdater" + +#: ../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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -480,58 +508,60 @@ msgid "Changes" msgstr "Endringer" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Beskrivelse" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Oppdater pakkeinformasjonen fra tjeneren." +msgid "Description" +msgstr "Beskrivelse" #: ../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 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." 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Oppdater" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -602,7 +632,7 @@ msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." #: ../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 @@ -614,36 +644,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Detaljer</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenter</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribusjon:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Seksjoner:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Seksjoner:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -658,15 +699,15 @@ msgstr "" "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en " "detaljert beskrivelse av syntaksen i dokumentasjonen." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT-linje:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -674,22 +715,27 @@ msgstr "" "Binær\n" "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Tilpasset" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Oppdater" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -736,25 +782,25 @@ 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 @@ -780,9 +826,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Offisielt støttet" #. CompDescription @@ -840,6 +886,12 @@ 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 "" @@ -850,6 +902,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Installerer oppdateringer..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Oppdater pakkeinformasjonen fra tjeneren." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Seksjoner:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Programvareoppdateringer" @@ -883,9 +946,6 @@ msgstr "" #~ msgid "<b>Sources</b>" #~ msgstr "<b>Programvarekilder</b>" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenter</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Arkiv</b>" @@ -1066,9 +1126,6 @@ msgstr "" #~ 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" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-10-23 10:48-0200\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n" @@ -17,37 +17,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -93,34 +93,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -187,29 +187,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -217,53 +225,53 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -271,94 +279,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -#, fuzzy -msgid "Installing updates" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -404,46 +419,57 @@ 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 "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -470,59 +496,63 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/UpdateManager.glade.h:21 -msgid "_Reload" -msgstr "" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -590,7 +620,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 @@ -602,40 +632,50 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Comment:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 -msgid "<b>Distribution:</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:6 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 #, fuzzy -msgid "<b>Sections:</b>" +msgid "<b>Components:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 #, fuzzy msgid "<b>Type:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 #, fuzzy msgid "<b>URI:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -644,36 +684,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -720,22 +764,22 @@ 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 @@ -759,8 +803,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -815,6 +859,11 @@ 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 "" @@ -825,5 +874,13 @@ 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>" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-25 17:23+0100\n" "Last-Translator: Zygmunt Krynicki <zyga@www.suxx.pl>\n" "Language-Team: Polish <translators@gnomepl.org>\n" @@ -15,37 +15,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Błąd podczas importu wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -53,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,23 +92,23 @@ msgid "" msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -116,11 +116,11 @@ msgid "" msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -188,29 +188,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -218,54 +226,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Działa inny menadżer pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Aktualizowanie zakończone" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -273,96 +281,104 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Instalacja pakietów..." +msgid "Applying changes" +msgstr "Pobieranie informacji o zmianach..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Twój system zawiera uszkodzone pakiety!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Szczegóły</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instaluj" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Aktualizowanie zakończone" -#: ../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 "" @@ -408,46 +424,58 @@ msgid "Details" msgstr "<b>Szczegóły</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 "Wczytaj ponownie" + +#: ../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 "Aktualizowanie zakończone" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -474,59 +502,61 @@ msgid "Changes" msgstr "Zmiany" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Opis" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Wczytuje ponownie z serwera informacje o pakietach." +msgid "Description" +msgstr "Opis" #: ../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 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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Aktualizowanie zakończone" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Instaluj" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Wczytaj ponownie" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -596,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 @@ -608,36 +638,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Szczegóły</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Komentarz:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenty</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Dystrybucja:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sekcje:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sekcje:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -653,15 +694,15 @@ msgstr "" "<i>\"deb http://ftp.debian.org sarge main\"</i>. Szczegółowy opis składni " "znajduje się w dokumentacji APT" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Wiersz APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -669,22 +710,27 @@ msgstr "" "Binarne\n" "Źródłowe" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Zaawansowane" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Wczytaj ponownie" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -731,25 +777,25 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 #, fuzzy -msgid "Ubuntu 6.04 'Dapper Drake'" +msgid "Ubuntu 6.06 'Dapper Drake'" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Uaktualnienia Ubuntu 4.10" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Uaktualnienia Ubuntu 4.10" #. Description @@ -777,9 +823,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Uaktualnienia Ubuntu 4.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Wspierane oficjalnie" #. CompDescription @@ -835,6 +881,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Wspierane oficjalnie" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -845,6 +897,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Instalacja pakietów..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Wczytuje ponownie z serwera informacje o pakietach." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sekcje:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Aktualizacje oprogramowania" @@ -899,9 +962,6 @@ msgstr "" #~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować " #~ "klikając przycisk Instaluj." -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Komponenty</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repozytorium</b>" @@ -1020,9 +1080,6 @@ msgstr "" #~ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-29 13:36-0300\n" "Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n" @@ -14,40 +14,40 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "Todos os % dias" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "Depois de %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -58,11 +58,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" @@ -101,11 +101,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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,12 +115,12 @@ 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. " @@ -128,11 +128,11 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -215,33 +215,42 @@ msgstr "Impossível de calcular a actualização" #: ../DistUpgrade/DistUpgradeControler.py:215 #, 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 "" "Ocorreu algum problema durante a actualização. Provavelmente a instalação de " "alguns pacotes falhou. Tente 'sudo apt-get install -f' ou use o synaptic " "para corrigir o seu sistema." -#: ../DistUpgrade/DistUpgradeControler.py:230 +#: ../DistUpgrade/DistUpgradeControler.py:231 #, fuzzy msgid "Could not download the upgrades" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -251,52 +260,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, fuzzy, python-format msgid "Downloading file %li of %li at %s/s" msgstr "A fazer o download de ficheiro %li de %li com %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format msgid "%s remaining" msgstr "%s restantes" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, fuzzy, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida" @@ -304,25 +313,33 @@ msgstr "A fazer o download de ficheiro %li de %li a velocidade desconhecida" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "A instalar actualizações" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "A actualização abortará. Reporte este erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 #, fuzzy msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" @@ -332,72 +349,72 @@ msgstr "" "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:352 #, fuzzy, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Um pacote essencial teria que ser removido" msgstr[1] "Um pacote essencial teria que ser removido" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 #, fuzzy msgid "Could not find any upgrades" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "O seu sistema tem pacotes quebrados!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>A ser removido: %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instalar Actualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "A_ctualização" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Necessário reiniciar" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 #, fuzzy msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" @@ -447,46 +464,59 @@ 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 "" -#: ../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 "" -#: ../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 #, fuzzy msgid "_Resume Upgrade" msgstr "Efectuar Actualização?" #: ../data/UpdateManager.glade.h:1 +#, fuzzy msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -523,30 +553,35 @@ msgid "Changes" msgstr "Alterações" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descrição" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "Notas de lançamento" +#, fuzzy +msgid "Check for available updates" +msgstr "A efectuar o download e a instalar actualizações" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" -msgstr "Reler a última informação sobre actualizações" +msgid "Description" +msgstr "Descrição" #: ../data/UpdateManager.glade.h:13 +msgid "Release Notes" +msgstr "Notas de lançamento" + +#: ../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." @@ -554,26 +589,26 @@ 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 "" + +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Actualizações" -#: ../data/UpdateManager.glade.h:21 -msgid "_Reload" -msgstr "Reler" - #: ../data/SoftwareProperties.glade.h:1 msgid "<b>Channels</b>" msgstr "" @@ -634,7 +669,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 @@ -647,39 +683,49 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Componentes</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Comment:</b>" msgstr "<b>Componentes</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componentes</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -#, fuzzy -msgid "<b>Sections:</b>" -msgstr "<b>Fontes de Software</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Fontes de Software</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 #, fuzzy msgid "<b>Type:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -688,36 +734,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Linha do APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "Reler" + #: ../data/update-manager.desktop.in.h:1 #, fuzzy msgid "Show and install available updates" @@ -766,25 +816,25 @@ msgstr "" #. 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 5.04 Actualizações de Segurança" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Ubuntu 5.10 Actualizações" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Ubuntu 5.10 Actualizações" #. Description @@ -810,8 +860,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 Actualizações" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +#, fuzzy +msgid "Officially supported" msgstr "Suportado Oficialmente" #. CompDescription @@ -866,6 +917,11 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription +#: ../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" @@ -875,6 +931,16 @@ msgstr "Software compatível-DFSG com Dependências Não-Livres" msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" +#~ msgid "Installing updates" +#~ msgstr "A instalar actualizações" + +#~ msgid "Reload the latest information about updates" +#~ msgstr "Reler a última informação sobre actualizações" + +#, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Fontes de Software</b>" + #, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Actualizações de Software" diff --git a/po/pt_BR.po b/po/pt_BR.po index edc001b5..0ad1e2d3 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2006-02-19 17:39-0300\n" "Last-Translator: Carlos Eduardo Pedroza Santiviago <segfault@ubuntu.com>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" @@ -15,41 +15,41 @@ msgstr "" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "Após %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -60,11 +60,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -103,11 +103,11 @@ msgstr "" "favor reporte isto como um erro." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 +117,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. " @@ -131,11 +131,11 @@ msgstr "" "um erro." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -218,33 +218,42 @@ msgstr "Não foi possível calcular a atualização" #: ../DistUpgrade/DistUpgradeControler.py:215 #, 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 "" "Alguns problemas ocorreram durante a atualização. É bem provável que alguns " "pacotes falharam ao instalar. Tente 'sudo apt-get install -f' ou Synaptic " "para corrigir o seu sistema." -#: ../DistUpgrade/DistUpgradeControler.py:230 +#: ../DistUpgrade/DistUpgradeControler.py:231 #, fuzzy msgid "Could not download the upgrades" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +#, fuzzy +msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -254,52 +263,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, fuzzy, python-format msgid "Downloading file %li of %li at %s/s" msgstr "Obtendo arquivo %li de %li com %s/s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:107 +#: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format msgid "%s remaining" msgstr "Faltam %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:109 +#: ../DistUpgrade/DistUpgradeViewGtk.py:110 #, fuzzy, python-format msgid "Downloading file %li of %li at unknown speed" msgstr "Obtendo arquivo %li de %li com velocidade desconhecida" @@ -307,25 +316,34 @@ msgstr "Obtendo arquivo %li de %li com velocidade desconhecida" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "Instalando Atualizações" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#, fuzzy +msgid "Applying changes" +msgstr "Downloading changes..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "A atualização irá abortar. Por favor reporte o erro." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 #, fuzzy msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" @@ -335,72 +353,72 @@ msgstr "" "erro e inclua os arquivos ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu " "relatório. A atualização irá abortar agora." -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, fuzzy, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Um pacote essencial teria que ser removido" msgstr[1] "Um pacote essencial teria que ser removido" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 #, fuzzy msgid "Could not find any upgrades" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>A serem removidos: %s </b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instalar Atualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "At_ualizar" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 msgid "Reboot required" msgstr "Reinicialização requerida" -#: ../DistUpgrade/DistUpgradeView.py:68 +#: ../DistUpgrade/DistUpgradeView.py:76 #, fuzzy msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" @@ -450,47 +468,60 @@ 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 #, fuzzy msgid "Modifying the software channels" msgstr "Modificando os canais de programas" -#: ../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 "" -#: ../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 #, fuzzy msgid "_Resume Upgrade" msgstr "Realizar a Atualização?" #: ../data/UpdateManager.glade.h:1 +#, fuzzy msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -527,30 +558,35 @@ msgid "Changes" msgstr "Mudanças" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descrição" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "Notas de Versão" +#, fuzzy +msgid "Check for available updates" +msgstr "Obtendo e instalando as atualizações" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" -msgstr "Recarregar as últimas informações sobre atualizações" +msgid "Description" +msgstr "Descrição" #: ../data/UpdateManager.glade.h:13 +msgid "Release Notes" +msgstr "Notas de Versão" + +#: ../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." @@ -558,26 +594,26 @@ 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 "" + +#: ../data/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/UpdateManager.glade.h:21 -msgid "_Reload" -msgstr "_Recarregar" - #: ../data/SoftwareProperties.glade.h:1 msgid "<b>Channels</b>" msgstr "<b>Canais</b>" @@ -638,7 +674,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 @@ -652,36 +689,47 @@ msgid " " msgstr " " #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Canais</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Components</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Sections:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Sections:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -697,15 +745,15 @@ msgstr "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " "detailed description of the syntax in the documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -713,22 +761,26 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "_Custom" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "_Recarregar" + #: ../data/update-manager.desktop.in.h:1 #, fuzzy msgid "Show and install available updates" @@ -777,25 +829,25 @@ 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 5.04 Security Updates" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Atualizações do Ubuntu 5.10" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Atualizações do Ubuntu 5.10" #. Description @@ -821,8 +873,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Atualizações do Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +#, fuzzy +msgid "Officially supported" msgstr "Suportado Oficialmente" #. CompDescription @@ -877,6 +930,11 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription +#: ../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" @@ -886,6 +944,15 @@ msgstr "Programa compatível com a DFSG mas com dependências não-livres" msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" +#~ msgid "Installing updates" +#~ msgstr "Instalando Atualizações" + +#~ msgid "Reload the latest information about updates" +#~ msgstr "Recarregar as últimas informações sobre atualizações" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Sections:</b>" + #, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Modificando os canais de programas" @@ -993,9 +1060,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ "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>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Repository</b>" @@ -1109,9 +1173,6 @@ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-03 19:28+0200\n" "Last-Translator: Dan Damian <dand@gnome.ro>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n" @@ -16,37 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,34 +92,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -186,29 +186,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -216,54 +224,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Un alt manager de pachete rulează" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Actualizare completă" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -271,94 +279,103 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#, fuzzy +msgid "Applying changes" +msgstr "Descarc modificările..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sistemul dvs. este la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detalii</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Instalează" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Actualizare completă" -#: ../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 "" @@ -404,46 +421,57 @@ 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ă" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -470,58 +498,61 @@ msgid "Changes" msgstr "Modificări" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Descriere" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Reîncarcă informaţiile despre pachete de pe server." +msgid "Description" +msgstr "Descriere" #: ../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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Instalează" -#: ../data/UpdateManager.glade.h:21 -msgid "_Reload" -msgstr "" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -589,7 +620,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 @@ -602,36 +633,47 @@ msgid " " msgstr " " #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Detalii</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Comentariu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Componente</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribuţie:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Secţiuni:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Secţiuni:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Tip:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -647,15 +689,15 @@ msgstr "" "\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere " "detaliată a sintaxei în documentaţie." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Linie APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -663,22 +705,26 @@ msgstr "" "Binar\n" "Sursă" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -726,25 +772,25 @@ 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 @@ -772,9 +818,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Actualizări de securitate Ubuntu 5.04" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Pachete suportate oficial" #. CompDescription @@ -830,6 +876,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../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 "" @@ -840,6 +892,13 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Reîncarcă informaţiile despre pachete de pe server." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Secţiuni:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Actualizări software" @@ -883,9 +942,6 @@ msgstr "" #~ "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>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Locaţie</b>" @@ -963,9 +1019,6 @@ 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." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-31 20:55-0700\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -24,41 +24,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "ULL NAME <EMAIL@ADDRESS>\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 #, 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:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 #, fuzzy msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -66,11 +66,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -105,23 +105,23 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -129,11 +129,11 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -201,29 +201,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -231,54 +239,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -286,76 +294,85 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#, fuzzy +msgid "Applying changes" +msgstr "Amahinduka" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, 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:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sisitemu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<B B" @@ -364,21 +381,21 @@ msgstr "<B B" # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "Kwinjiza porogaramu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Byarangiye" -#: ../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 "" @@ -424,46 +441,59 @@ 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 "" +# sfx2/sdi\sfxslots.src:SID_RELOAD.text #: ../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" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -490,51 +520,58 @@ msgstr "" msgid "Changes" msgstr "Amahinduka" +#: ../data/UpdateManager.glade.h:10 +msgid "Chec_k" +msgstr "" + +#: ../data/UpdateManager.glade.h:11 +msgid "Check for available updates" +msgstr "" + # #-#-#-#-# basctl.pot (PACKAGE VERSION) #-#-#-#-# # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.RID_FT_DESCR.text # #-#-#-#-# basctl.pot (PACKAGE VERSION) #-#-#-#-# # basctl/source\basicide\moptions.src:RID_MACROOPTIONS.text -#: ../data/UpdateManager.glade.h:10 +#: ../data/UpdateManager.glade.h:12 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/UpdateManager.glade.h:11 +#: ../data/UpdateManager.glade.h:13 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri" - -#: ../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:21 msgid "_Hide this information in the future" msgstr "" @@ -542,17 +579,11 @@ msgstr "" # setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text # #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-# # setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" -# sfx2/sdi\sfxslots.src:SID_RELOAD.text -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Kongera Gutangiza" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -619,7 +650,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 @@ -631,41 +662,51 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Comment:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 #, fuzzy -msgid "<b>Distribution:</b>" +msgid "<b>Components:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 +#: ../data/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy -msgid "<b>Sections:</b>" +msgid "<b>Distribution:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 #, fuzzy msgid "<b>Type:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 #, fuzzy msgid "<b>URI:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -678,39 +719,45 @@ msgstr "" "Na Ibikubiyemo Bya a kugirango Urugero i HTTP FTP org i Gushaka a " "Isobanuramiterere Bya i in i" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 #, fuzzy msgid "APT line:" msgstr "Umurongo" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "" "Binary\n" "Source" msgstr "Inkomoko" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 #, fuzzy msgid "_Custom" msgstr "Guhanga" +# sfx2/sdi\sfxslots.src:SID_RELOAD.text +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Kongera Gutangiza" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -757,25 +804,25 @@ 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 @@ -803,8 +850,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "5" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -862,6 +909,11 @@ 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 "" @@ -872,6 +924,14 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri" + +#, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<B B" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Ibihuzagihe bya porogaramumudasobwa " @@ -925,10 +985,6 @@ msgstr "" #~ 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" @@ -1039,10 +1095,6 @@ msgstr "" #~ msgstr "Verisiyo" #, fuzzy -#~ msgid "Downloading changes..." -#~ msgstr "Amahinduka" - -#, fuzzy #~ msgid "The updates are being applied." #~ msgstr "Byashyizweho" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-26 15:14+0100\n" "Last-Translator: Christian Rose <menthos@menthos.com>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -16,38 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 #, fuzzy msgid "Import key" msgstr "Viktighet" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -94,34 +94,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 #, fuzzy, python-format msgid "Can't install '%s'" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:234 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -190,15 +190,15 @@ msgstr "inte installerad" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -206,14 +206,23 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 #, fuzzy -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr " Ta bort paket " -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +#, fuzzy +msgid "_Remove" +msgstr "Ta bort" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -221,55 +230,55 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "En annan pakethanterare körs" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Uppgraderingar" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../DistUpgrade/DistUpgradeViewGtk.py:78 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:95 +#: ../DistUpgrade/DistUpgradeViewGtk.py:96 #, fuzzy msgid "Download is complete" msgstr "Hämtning misslyckades" -#: ../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 #, 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" msgstr "" @@ -277,97 +286,105 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Letar efter uppdateringar..." +msgid "Applying changes" +msgstr "Hämtar ändringar..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, fuzzy, python-format msgid "Could not install '%s'" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 #, fuzzy msgid "Could not find any upgrades" msgstr "inte installerad" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "Ditt system har trasiga paket!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detaljer</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "Installera" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Uppgraderingar" -#: ../DistUpgrade/DistUpgradeView.py:67 +#: ../DistUpgrade/DistUpgradeView.py:75 #, fuzzy msgid "Reboot required" msgstr "Krav" -#: ../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 "" @@ -412,48 +429,60 @@ msgid "Details" msgstr "Detaljer" #: ../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 "Modifying the software channels" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:13 #, fuzzy msgid "Preparing the upgrade" msgstr "Förbereder transaktion" -#: ../DistUpgrade/DistUpgrade.glade.h:13 +#: ../DistUpgrade/DistUpgrade.glade.h:14 #, fuzzy msgid "Restarting the system" msgstr "Uppdaterar system" -#: ../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 "" -#: ../DistUpgrade/DistUpgrade.glade.h:16 +#: ../DistUpgrade/DistUpgrade.glade.h:17 +msgid "_Keep" +msgstr "" + +#: ../DistUpgrade/DistUpgrade.glade.h:18 +#, fuzzy +msgid "_Replace" +msgstr "Läs om" + +#: ../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 #, fuzzy msgid "_Resume Upgrade" msgstr "Uppgraderingar" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -481,60 +510,62 @@ msgid "Changes" msgstr "Ändringar" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Beskrivning" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Läs om paketinformationen från servern." +msgid "Description" +msgstr "Beskrivning" #: ../data/UpdateManager.glade.h:13 +msgid "Release Notes" +msgstr "" + +#: ../data/UpdateManager.glade.h:14 #, fuzzy msgid "Show details" msgstr "Detaljer" -#: ../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 "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." msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Uppgraderingar" -#: ../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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Letar efter uppdateringar..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Läs om" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -601,7 +632,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,37 +644,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "Kanaler" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Komponenter</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -#, fuzzy -msgid "<b>Sections:</b>" -msgstr "<b>Val</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Val</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -652,16 +693,16 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT-rad:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy msgid "Add Channel" msgstr "Alla kanaler" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -669,24 +710,29 @@ msgstr "" "Binär\n" "Källkod" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 #, fuzzy msgid "Edit Channel" msgstr "Kanal" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 #, fuzzy msgid "_Add Channel" msgstr "Alla kanaler" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "An_passad" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Läs om" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -733,25 +779,26 @@ msgstr "" #. Description #: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.04 'Dapper Drake'" -msgstr "" +#, fuzzy +msgid "Ubuntu 6.06 'Dapper Drake'" +msgstr "Brådskande uppdateringar" #. Description #: ../channels/Ubuntu.info.in:23 #, fuzzy -msgid "Ubuntu 6.04 Security Updates" +msgid "Ubuntu 6.06 Security Updates" msgstr "Brådskande uppdateringar" #. Description #: ../channels/Ubuntu.info.in:40 #, fuzzy -msgid "Ubuntu 6.04 Updates" +msgid "Ubuntu 6.06 Updates" msgstr "Brådskande uppdateringar" #. Description #: ../channels/Ubuntu.info.in:57 #, fuzzy -msgid "Ubuntu 6.04 Backports" +msgid "Ubuntu 6.06 Backports" msgstr "Brådskande uppdateringar" #. Description @@ -779,9 +826,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Brådskande uppdateringar" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Stöds officiellt" #. CompDescription @@ -836,6 +883,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../channels/Debian.info.in:51 +#, fuzzy +msgid "Oficially supported" +msgstr "Stöds officiellt" + +#. CompDescription #: ../channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" @@ -847,6 +900,18 @@ msgid "Non-DFSG-compatible Software" msgstr "Tillgängliga program" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Letar efter uppdateringar..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Läs om paketinformationen från servern." + +#, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Val</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Programvaruuppdateringar" @@ -900,9 +965,6 @@ msgstr "Tillgängliga program" #~ 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>" @@ -963,9 +1025,6 @@ msgstr "Tillgängliga program" #~ 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." @@ -2012,9 +2071,6 @@ msgstr "Tillgängliga program" #~ 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" @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-08-08 11:46+0300\n" "Last-Translator: Maxim Dziumanenko <mvd@mylinux.ua>\n" "Language-Team: Ukrainian <uk@li.org>\n" @@ -15,37 +15,37 @@ msgstr "" "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:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -53,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,23 +92,23 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -116,11 +116,11 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -188,29 +188,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -218,54 +226,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "Вже активний інший менеджер пакетів" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -273,32 +281,40 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "Встановлення оновлень..." +msgid "Applying changes" +msgstr "Завантаження змін..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -306,7 +322,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:317 +#: ../DistUpgrade/DistUpgradeViewGtk.py:358 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -314,7 +330,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:323 +#: ../DistUpgrade/DistUpgradeViewGtk.py:364 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -322,49 +338,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:330 +#: ../DistUpgrade/DistUpgradeViewGtk.py:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Клавіші</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Встановити" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -410,45 +426,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -475,58 +503,61 @@ msgid "Changes" msgstr "Зміни" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Опис" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Перевірка оновлень ..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Перезавантажити з сервера інформацію про пакет" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Перезавантажити" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -594,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 @@ -606,36 +637,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Клавіші</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Компоненти</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибутив:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Розділи:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Розділи:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Тип:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -651,15 +693,15 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у " "документації." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Рядок APT" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -667,22 +709,27 @@ msgstr "" "Двійкові\n" "вихідні" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "В_ласний" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Перезавантажити" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -729,25 +776,25 @@ 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 @@ -773,9 +820,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Оновлення Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Офіціально підтримуються" #. CompDescription @@ -833,6 +880,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian поза США (Нестабільний)" #. CompDescription +#: ../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 "" @@ -843,6 +896,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Встановлення оновлень..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Перезавантажити з сервера інформацію про пакет" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Розділи:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Оновлення програм" @@ -878,9 +942,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "діб" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>Компоненти</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>Репозиторій</b>" @@ -1059,9 +1120,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "Версія %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "Завантаження змін..." - #~ msgid "There are no updated packages" #~ msgstr "Немає оновлених пакетів" @@ -1097,9 +1155,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Оновлення списку пакетів..." -#~ msgid "Checking for updates..." -#~ msgstr "Перевірка оновлень ..." - #~ msgid "There are no updates available." #~ msgstr "Немає доступних оновлень." diff --git a/po/update-manager.pot b/po/update-manager.pot index 26fb937c..ae488ceb 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-03-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+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" @@ -17,37 +17,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -93,34 +93,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -187,29 +187,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -217,52 +225,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -270,93 +278,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, 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 "" @@ -401,45 +417,56 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -466,53 +493,57 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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 can correct errors, eliminate security vulnerabilities, and " -"provide new features to you." +msgid "Software Updates" msgstr "" #: ../data/UpdateManager.glade.h:17 -msgid "U_pgrade" +msgid "" +"Software updates can correct errors, eliminate security vulnerabilities, and " +"provide new features to you." msgstr "" #: ../data/UpdateManager.glade.h:18 -msgid "Upgrade to the latest version of Ubuntu" +msgid "U_pgrade" msgstr "" #: ../data/UpdateManager.glade.h:19 -msgid "_Hide this information in the future" +msgid "Upgrade to the latest version of Ubuntu" msgstr "" #: ../data/UpdateManager.glade.h:20 -msgid "_Install Updates" +msgid "_Check" msgstr "" #: ../data/UpdateManager.glade.h:21 -msgid "_Reload" +msgid "_Hide this information in the future" +msgstr "" + +#: ../data/UpdateManager.glade.h:22 +msgid "_Install Updates" msgstr "" #: ../data/SoftwareProperties.glade.h:1 @@ -575,7 +606,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 @@ -587,34 +618,44 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Channel</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 -msgid "<b>Distribution:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 msgid "<b>Sections</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -623,36 +664,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -698,22 +743,22 @@ 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 @@ -737,8 +782,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -793,6 +838,11 @@ 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-08-26 18:15+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -16,37 +16,37 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: LocFactoryEditor 1.2.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 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:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -54,11 +54,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -93,23 +93,23 @@ msgid "" 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." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -117,11 +117,11 @@ msgid "" 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." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -189,29 +189,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -219,54 +227,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, 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:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -274,92 +282,100 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, 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:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, 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:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Khóa</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "_Cài đặt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Nâng cấp xong" -#: ../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 "" @@ -405,45 +421,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -470,58 +498,61 @@ msgid "Changes" msgstr "Đổi" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "Mô tả" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "Đang kiểm tra có cập nhật..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "Tải lại thông tin gói từ máy phục vụ." +msgid "Description" +msgstr "Mô tả" #: ../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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "Tải lại" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -589,7 +620,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 @@ -601,36 +632,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>Khóa</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>Ghi chú :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>Thành phần</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>Bản phát hành:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>Phần:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>Phần:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>Kiểu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>Địa chỉ định vị:</b> " -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -645,15 +687,15 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. Bạn có thể tìm mô tả chi tiết của cú " "pháp này trong tài liệu hướng dẫn." -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "Dòng APTL" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -661,22 +703,27 @@ msgstr "" "Nhị phân\n" "Nguồn" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "Tự _chọn" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "Tải lại" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -723,25 +770,25 @@ 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 @@ -767,9 +814,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Bản cập nhật Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" #. CompDescription @@ -827,6 +874,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Không Mỹ Debian (Bất định)" #. CompDescription +#: ../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 "" @@ -837,6 +890,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Đang cài đặt bản cập nhật..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "Tải lại thông tin gói từ máy phục vụ." + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>Phần:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Bản cập nhật phần mềm" @@ -872,9 +936,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>" @@ -1041,9 +1102,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." @@ -1073,9 +1131,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "Đạng cập nhật danh sách gói..." -#~ msgid "Checking for updates..." -#~ msgstr "Đang kiểm tra có cập nhật..." - #~ msgid "There are no updates available." #~ msgstr "Không có bản cập nhật công bố." @@ -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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-30 13:25+0200\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\n" @@ -17,37 +17,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -55,11 +55,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -93,34 +93,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -187,29 +187,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -217,52 +225,52 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -270,94 +278,101 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -#, fuzzy -msgid "Installing updates" -msgstr "Seka zonke izihlaziyo" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +msgid "Applying changes" +msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "Bonisa izihlaziyo" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, 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 "" @@ -402,45 +417,56 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -467,57 +493,61 @@ msgid "Changes" msgstr "" #: ../data/UpdateManager.glade.h:10 -msgid "Description" +msgid "Chec_k" msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -msgid "Reload the latest information about updates" +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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/UpdateManager.glade.h:21 -msgid "_Reload" -msgstr "" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -582,7 +612,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,37 +624,48 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Comment:</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 -msgid "<b>Distribution:</b>" -msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" +#: ../data/SoftwarePropertiesDialogs.glade.h:11 +msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -633,36 +674,40 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +msgid "_Reload" +msgstr "" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -709,22 +754,22 @@ 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 @@ -748,8 +793,8 @@ msgid "Ubuntu 5.10 Backports" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 -msgid "Oficially supported" +#: ../channels/Ubuntu.info.in:128 +msgid "Officially supported" msgstr "" #. CompDescription @@ -804,6 +849,11 @@ 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 "" @@ -814,6 +864,10 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "Seka zonke izihlaziyo" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "Bonisa izihlaziyo" diff --git a/po/zh_CN.po b/po/zh_CN.po index 974c8712..c49c8196 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-03-21 22:00+0800\n" "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -15,37 +15,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -53,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -91,34 +91,34 @@ msgid "" msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -185,29 +185,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -215,54 +223,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "正在运行另外一个软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "更新已经完成" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -270,94 +278,103 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 -msgid "Installing updates" -msgstr "" +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 +#, fuzzy +msgid "Applying changes" +msgstr "正在下载更改..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 msgid "The upgrade aborts now. Please report this bug." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 #, fuzzy msgid "Your system has already been upgraded." msgstr "您的系统有损坏的软件包！" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>细节</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "安装(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -403,46 +420,58 @@ 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 +#, fuzzy msgid "_Resume Upgrade" msgstr "更新已经完成" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -469,59 +498,61 @@ msgid "Changes" msgstr "更改" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "描述" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" +msgid "Check for available updates" msgstr "" #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "从服务器重新装入软件包信息。" +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 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 #, 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "安装(_I)" -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "重新装入" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -590,7 +621,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 @@ -602,36 +633,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>细节</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>注释：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>组件</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>发行版：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>节：</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>节：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>类型：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" "big>\n" @@ -640,15 +682,15 @@ msgid "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT 行：" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -656,22 +698,27 @@ msgstr "" "二进制\n" "源代码" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "自定义(_C)" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "重新装入" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -718,25 +765,25 @@ 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 @@ -764,9 +811,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.04 安全更新" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "官方支持" #. CompDescription @@ -822,6 +869,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription +#: ../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 "" @@ -832,6 +885,13 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "从服务器重新装入软件包信息。" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>节：</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "软件更新" @@ -858,9 +918,6 @@ msgstr "" #~ msgid "<b>Packages to install:</b>" #~ msgstr "要安装的软件包：" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>组件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>仓库</b>" @@ -906,9 +963,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "版本 %s：\n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下载更改..." - #~ msgid "The updates are being applied." #~ msgstr "更新已经应用。" diff --git a/po/zh_HK.po b/po/zh_HK.po index bccebc7e..ba134daa 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung <abel@oaka.org>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -15,37 +15,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -53,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,23 +92,23 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -116,11 +116,11 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -188,29 +188,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -218,54 +226,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -273,95 +281,103 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "正在安裝軟件更新..." +msgid "Applying changes" +msgstr "正在下載更改紀錄..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>密碼匙</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "安裝(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -407,45 +423,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -472,58 +500,61 @@ msgid "Changes" msgstr "更改紀錄" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "詳細說明" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "正在檢查更新套件..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "由伺服器重新載入套件資料。" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "重新載入" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -591,7 +622,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 @@ -603,36 +634,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>密碼匙</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>備註:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>元件</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>發行版本:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>分類:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>分類:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>類型:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -647,15 +689,15 @@ msgstr "" "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。" # (Abel): 「APT 行」實在不倫不類 -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT 軟件庫:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -663,22 +705,27 @@ msgstr "" "可執行檔\n" "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "自選(_C)" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "重新載入" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -725,25 +772,25 @@ 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 @@ -769,9 +816,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "官方支援" #. CompDescription @@ -829,6 +876,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (不穩定版)" #. CompDescription +#: ../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 "" @@ -839,6 +892,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "正在安裝軟件更新..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "由伺服器重新載入套件資料。" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>分類:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "軟件更新" @@ -874,9 +938,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "日" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>元件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>軟件庫</b>" @@ -1037,9 +1098,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "版本 %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下載更改紀錄..." - #~ msgid "There are no updated packages" #~ msgstr "沒有任何套件需要更新" @@ -1071,9 +1129,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "正在更新套件清單..." -#~ msgid "Checking for updates..." -#~ msgstr "正在檢查更新套件..." - #~ msgid "There are no updates available." #~ msgstr "沒有任何軟件可以更新。" diff --git a/po/zh_TW.po b/po/zh_TW.po index 972a07fe..f2a98b5e 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-12 20:39+0100\n" +"POT-Creation-Date: 2006-03-27 16:38+0200\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung <abel@oaka.org>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -15,37 +15,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:104 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:134 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:359 +#: ../SoftwareProperties/SoftwareProperties.py:407 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:369 +#: ../SoftwareProperties/SoftwareProperties.py:417 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:370 +#: ../SoftwareProperties/SoftwareProperties.py:418 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:382 +#: ../SoftwareProperties/SoftwareProperties.py:430 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:383 +#: ../SoftwareProperties/SoftwareProperties.py:431 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:424 +#: ../SoftwareProperties/SoftwareProperties.py:472 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -53,11 +53,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:474 +#: ../SoftwareProperties/SoftwareProperties.py:529 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:490 +#: ../SoftwareProperties/SoftwareProperties.py:545 msgid "Please insert a disc in the drive:" msgstr "" @@ -92,23 +92,23 @@ msgid "" msgstr "您選定的金鑰無法移除，請匯報問題。" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:168 +#: ../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 " @@ -116,11 +116,11 @@ msgid "" msgstr "您選定的金鑰無法移除，請匯報問題。" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:240 +#: ../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 " @@ -188,29 +188,37 @@ msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:215 msgid "" -"The upgrade aborts now. Your system can be in an unusable state. Please try " -"'sudo apt-get install -f' or Synaptic to fix your system." +"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 +#: ../DistUpgrade/DistUpgradeControler.py:231 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:231 +#: ../DistUpgrade/DistUpgradeControler.py:232 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" #: ../DistUpgrade/DistUpgradeControler.py:274 -msgid "Remove obsolete Packages?" +msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:281 +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Skip This Step" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:275 +msgid "_Remove" +msgstr "" + +#: ../DistUpgrade/DistUpgradeControler.py:285 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:282 +#: ../DistUpgrade/DistUpgradeControler.py:286 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -218,54 +226,54 @@ msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:296 -#: ../DistUpgrade/DistUpgradeControler.py:319 +#: ../DistUpgrade/DistUpgradeControler.py:300 +#: ../DistUpgrade/DistUpgradeControler.py:324 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:311 +#: ../DistUpgrade/DistUpgradeControler.py:316 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:325 +#: ../DistUpgrade/DistUpgradeControler.py:330 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:329 +#: ../DistUpgrade/DistUpgradeControler.py:334 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:336 +#: ../DistUpgrade/DistUpgradeControler.py:341 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:341 +#: ../DistUpgrade/DistUpgradeControler.py:346 msgid "System upgrade is complete." msgstr "" #. print "mediaChange %s %s" % (medium, drive) -#: ../DistUpgrade/DistUpgradeViewGtk.py:77 +#: ../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 #, 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" msgstr "" @@ -273,95 +281,103 @@ msgstr "" #. FIXME: add support for the timeout #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt -#: ../DistUpgrade/DistUpgradeViewGtk.py:135 +#: ../DistUpgrade/DistUpgradeViewGtk.py:136 #, fuzzy -msgid "Installing updates" -msgstr "正在安裝軟體更新..." +msgid "Applying changes" +msgstr "正在下載更改紀錄..." -#: ../DistUpgrade/DistUpgradeViewGtk.py:148 +#: ../DistUpgrade/DistUpgradeViewGtk.py:149 #, python-format msgid "Could not install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:149 +#: ../DistUpgrade/DistUpgradeViewGtk.py:150 #, fuzzy msgid "The upgrade aborts now. Please report this bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:228 +#. self.expander.set_expanded(True) +#: ../DistUpgrade/DistUpgradeViewGtk.py:163 +#, python-format +msgid "" +"Replace configuration file\n" +"'%s'?" +msgstr "" + +#: ../DistUpgrade/DistUpgradeViewGtk.py:262 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:229 +#: ../DistUpgrade/DistUpgradeViewGtk.py:263 msgid "" "Please report this as a bug and include the files ~/dist-upgrade.log and ~/" "dist-upgrade-apt.log in your report. The upgrade aborts now. " msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:311 +#: ../DistUpgrade/DistUpgradeViewGtk.py:352 #, 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:358 #, 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:364 #, 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:371 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:334 +#: ../DistUpgrade/DistUpgradeViewGtk.py:375 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:378 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:343 +#: ../DistUpgrade/DistUpgradeViewGtk.py:384 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:344 +#: ../DistUpgrade/DistUpgradeViewGtk.py:385 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:353 +#: ../DistUpgrade/DistUpgradeViewGtk.py:400 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>金鑰</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:355 +#: ../DistUpgrade/DistUpgradeViewGtk.py:402 #, fuzzy, python-format msgid "Install %s" msgstr "安裝(_I)" -#: ../DistUpgrade/DistUpgradeViewGtk.py:357 +#: ../DistUpgrade/DistUpgradeViewGtk.py:404 #, fuzzy, 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 "" @@ -407,45 +423,57 @@ 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 "" #: ../data/UpdateManager.glade.h:1 msgid "" -"<b><big>You need to manually reload the latest information about updates</" -"big></b>\n" +"<b><big>You must check for updates manually</big></b>\n" "\n" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." @@ -472,58 +500,61 @@ msgid "Changes" msgstr "更改紀錄" #: ../data/UpdateManager.glade.h:10 -msgid "Description" -msgstr "詳細說明" +msgid "Chec_k" +msgstr "" #: ../data/UpdateManager.glade.h:11 -msgid "Release Notes" -msgstr "" +#, fuzzy +msgid "Check for available updates" +msgstr "正在檢查更新套件..." #: ../data/UpdateManager.glade.h:12 -#, fuzzy -msgid "Reload the latest information about updates" -msgstr "由伺服器重新載入套件資料。" +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 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:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟體更新..." -#: ../data/UpdateManager.glade.h:21 -#, fuzzy -msgid "_Reload" -msgstr "重新載入" - #: ../data/SoftwareProperties.glade.h:1 #, fuzzy msgid "<b>Channels</b>" @@ -591,7 +622,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 @@ -603,36 +634,47 @@ msgid " " msgstr "" #: ../data/SoftwarePropertiesDialogs.glade.h:3 +msgid "" +"<b><big>The channel information is out-of-date</big></b>\n" +"\n" +"You have to reload the channel information to install software and updates " +"from newly added or changed channels. \n" +"\n" +"You need a working internet connection to continue." +msgstr "" + +#: ../data/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Channel</b>" msgstr "<b>金鑰</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:4 +#: ../data/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Comment:</b>" msgstr "<b>備註:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:5 +#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#, fuzzy +msgid "<b>Components:</b>" +msgstr "<b>元件</b>" + +#: ../data/SoftwarePropertiesDialogs.glade.h:11 msgid "<b>Distribution:</b>" msgstr "<b>發行版本:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:6 -msgid "<b>Sections:</b>" -msgstr "<b>分類:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:7 +#: ../data/SoftwarePropertiesDialogs.glade.h:12 #, fuzzy msgid "<b>Sections</b>" msgstr "<b>分類:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 +#: ../data/SoftwarePropertiesDialogs.glade.h:13 msgid "<b>Type:</b>" msgstr "<b>類型:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/SoftwarePropertiesDialogs.glade.h:14 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -647,15 +689,15 @@ msgstr "" "debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。" # (Abel): 「APT 行」實在不倫不類 -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/SoftwarePropertiesDialogs.glade.h:18 msgid "APT line:" msgstr "APT 軟體庫:" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/SoftwarePropertiesDialogs.glade.h:19 msgid "Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/SoftwarePropertiesDialogs.glade.h:20 msgid "" "Binary\n" "Source" @@ -663,22 +705,27 @@ msgstr "" "可執行檔\n" "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:17 +#: ../data/SoftwarePropertiesDialogs.glade.h:22 msgid "Edit Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/SoftwarePropertiesDialogs.glade.h:23 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 +#: ../data/SoftwarePropertiesDialogs.glade.h:24 msgid "_Add Channel" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/SoftwarePropertiesDialogs.glade.h:25 msgid "_Custom" msgstr "自選(_C)" +#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#, fuzzy +msgid "_Reload" +msgstr "重新載入" + #: ../data/update-manager.desktop.in.h:1 msgid "Show and install available updates" msgstr "" @@ -725,25 +772,25 @@ 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 @@ -769,9 +816,9 @@ msgid "Ubuntu 5.10 Backports" msgstr "Ubuntu 5.10 更新" #. CompDescription -#: ../channels/Ubuntu.info.in:128 ../channels/Debian.info.in:51 +#: ../channels/Ubuntu.info.in:128 #, fuzzy -msgid "Oficially supported" +msgid "Officially supported" msgstr "官方支援" #. CompDescription @@ -829,6 +876,12 @@ msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (不穩定版)" #. CompDescription +#: ../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 "" @@ -839,6 +892,17 @@ msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy +#~ msgid "Installing updates" +#~ msgstr "正在安裝軟體更新..." + +#, fuzzy +#~ msgid "Reload the latest information about updates" +#~ msgstr "由伺服器重新載入套件資料。" + +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>分類:</b>" + +#, fuzzy #~ msgid "Add Software Channels" #~ msgstr "軟體更新" @@ -874,9 +938,6 @@ msgstr "" #~ msgid "day(s)" #~ msgstr "日" -#~ msgid "<b>Components</b>" -#~ msgstr "<b>元件</b>" - #~ msgid "<b>Repository</b>" #~ msgstr "<b>軟體庫</b>" @@ -1036,9 +1097,6 @@ msgstr "" #~ msgid "Version %s: \n" #~ msgstr "版本 %s: \n" -#~ msgid "Downloading changes..." -#~ msgstr "正在下載更改紀錄..." - #~ msgid "There are no updated packages" #~ msgstr "沒有任何套件需要更新" @@ -1070,9 +1128,6 @@ msgstr "" #~ msgid "Updating package list..." #~ msgstr "正在更新套件清單..." -#~ msgid "Checking for updates..." -#~ msgstr "正在檢查更新套件..." - #~ msgid "There are no updates available." #~ msgstr "沒有任何軟體可以更新。" |