summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SoftwareProperties/dialog_sources_list.py123
-rw-r--r--data/update-manager.desktop.in4
-rw-r--r--po/Makefile2
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/bg.po442
-rw-r--r--po/da.po801
-rw-r--r--po/de.po464
-rw-r--r--po/el.po391
-rw-r--r--po/en_CA.po440
-rw-r--r--po/en_GB.po450
-rw-r--r--po/es.po442
-rw-r--r--po/fi.po431
-rw-r--r--po/fr.po442
-rw-r--r--po/gl.po443
-rw-r--r--po/he.po440
-rw-r--r--po/hu.po432
-rw-r--r--po/it.po445
-rw-r--r--po/ja.po445
-rw-r--r--po/lt.po441
-rw-r--r--po/mk.po442
-rw-r--r--po/nb.po447
-rwxr-xr-xpo/ne.po442
-rw-r--r--po/nl.po336
-rw-r--r--po/no.po447
-rw-r--r--po/pa.po361
-rw-r--r--po/pl.po442
-rw-r--r--po/pt.po976
-rw-r--r--po/pt_BR.po444
-rw-r--r--po/ro.po423
-rw-r--r--po/rw.po433
-rw-r--r--po/sv.po422
-rw-r--r--po/uk.po442
-rw-r--r--po/update-manager.pot364
-rw-r--r--po/vi.po440
-rw-r--r--po/xh.po351
-rw-r--r--po/zh_CN.po398
-rw-r--r--po/zh_HK.po440
-rw-r--r--po/zh_TW.po440
38 files changed, 9165 insertions, 6404 deletions
diff --git a/SoftwareProperties/dialog_sources_list.py b/SoftwareProperties/dialog_sources_list.py
deleted file mode 100644
index d35b9b51..00000000
--- a/SoftwareProperties/dialog_sources_list.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env python
-import pygtk
-import gtk
-import gtk.glade
-import gobject
-import os
-from optparse import OptionParser
-from aptsources import SourcesList, SourceEntryMatcher
-from gettext import gettext as _
-import gettext
-import urllib
-from utils import *
-
-class AddSourcesList:
- def __init__(self, parent, sourceslist, source_renderer, datadir, file):
- print file
- self.parent = parent
- self.source_renderer = source_renderer
- self.sources_old = sourceslist
- self.file = self.format_uri(file)
- self.glade = gtk.glade.XML(os.path.join(datadir,
- "glade/SoftwarePropertiesDialogs.glade"))
- self.glade.signal_autoconnect(self)
- self.dialog = self.glade.get_widget("dialog_sources_list")
- self.label = self.glade.get_widget("label_sources")
- self.button_add = self.glade.get_widget("button_add")
- self.button_cancel = self.glade.get_widget("button_cancel")
- self.treeview = self.glade.get_widget("treeview_sources")
- self.button_close = self.glade.get_widget("button_close")
- self.scrolled = self.glade.get_widget("scrolled_window")
- self.image = self.glade.get_widget("image_sources_list")
-
- self.dialog.realize()
- if self.parent != None:
- self.dialog.set_transient_for(parent)
- else:
- self.dialog.set_title(_("Add Software Channels"))
- self.dialog.window.set_functions(gtk.gdk.FUNC_MOVE)
-
- # Setup the treeview
- self.store = gtk.ListStore(gobject.TYPE_STRING)
- self.treeview.set_model(self.store)
- cell = gtk.CellRendererText()
- cell.set_property("xpad", 2)
- cell.set_property("ypad", 2)
- column = gtk.TreeViewColumn("Software Channel", cell, markup=0)
- column.set_max_width(500)
- self.treeview.append_column(column)
-
- # Parse the source.list file
- try:
- self.sources = SingleSourcesList(self.file)
- except:
- self.error()
- return
-
- # show the found channels or an error message
- if len(self.sources.list) > 0:
- self.button_close.hide()
- counter = 0
- for source in self.sources.list:
- if source.invalid or source.disabled:
- continue
- counter = counter +1
- line = self.source_renderer(source)
- self.store.append([line])
- if counter == 0:
- self.error()
- return
-
- header = gettext.ngettext("Add the following software channel?",
- "Add the following software channels?",
- counter)
- body = _("You can install software from a channel. Use "\
- "trusted channels, only.")
- self.label.set_markup("<big><b>%s</b></big>\n\n%s" % (header, body))
- self.button_add.set_use_underline(True)
- self.button_add.set_label(gettext.ngettext("_Add Channel",
- "_Add Channels",
- counter))
- else:
- self.error()
- return
-
- def error(self):
- self.button_add.hide()
- self.button_cancel.hide()
- self.scrolled.hide()
- self.button_close.show()
- self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
- header = _("Could not add any software channels")
- body = _("The file '%s' does not contain any valid "
- "software channels." % self.file)
- self.label.set_markup("<big><b>%s</b></big>\n\n%s" % (header, body))
-
- def run(self):
- res = self.dialog.run()
- if res == gtk.RESPONSE_OK:
- for source in self.sources:
- self.sources_old.add(source.type,
- source.uri,
- source.dist,
- source.comps,
- source.comment)
- self.dialog.destroy()
- return res
-
- def format_uri(self, uri):
- path = urllib.url2pathname(uri) # escape special chars
- path = path.strip('\r\n\x00') # remove \r\n and NULL
- if path.startswith('file:\\\\\\'): # windows
- path = path[8:] # 8 is len('file:///')
- elif path.startswith('file://'): #nautilus, rox
- path = path[7:] # 7 is len('file://')
- elif path.startswith('file:'): # xffm
- path = path[5:] # 5 is len('file:')
- return path
-
-class SingleSourcesList(SourcesList):
- def __init__(self, file):
- self.matcher = SourceEntryMatcher()
- self.list = []
- self.load(file)
diff --git a/data/update-manager.desktop.in b/data/update-manager.desktop.in
index 00287a2e..0116c78b 100644
--- a/data/update-manager.desktop.in
+++ b/data/update-manager.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Update Manager
_GenericName=Update Manager
-_Comment=Show available updates and choose which to install
+_Comment=Show and install available updates
Exec=gksu /usr/bin/update-manager
Icon=update-manager.png
Terminal=false
@@ -9,4 +9,4 @@ Type=Application
Encoding=UTF-8
Categories=Application;System;Settings;
X-KDE-SubstituteUID=true
-X-Ubuntu-Gettext-Domain=update-manager \ No newline at end of file
+X-Ubuntu-Gettext-Domain=update-manager
diff --git a/po/Makefile b/po/Makefile
index b33d5697..e5dafab4 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
DOMAIN=update-manager
PO_FILES := $(wildcard *.po)
-CONTACT=michael.vogt@canonical.com
+CONTACT=sebastian.heinlein@web.de
all: update-po
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 01973130..2bb2cb6f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
[encoding: UTF-8]
SoftwareProperties/SoftwareProperties.py
-SoftwareProperties/dialog_sources_list.py
DistUpgrade/DistUpgradeCache.py
DistUpgrade/DistUpgradeControler.py
DistUpgrade/DistUpgradeViewGtk.py
diff --git a/po/bg.po b/po/bg.po
index 5a0964fe..8f698a67 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Ключове</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Обноввявания по Интернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Ключове</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Идентифициране"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Премахване на избрания ключ от доверената верига ключове."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Носител на инсталацията"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Обноввявания по Интернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Връщане на стандартните стойности"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Възвръщане на стандартните ключове"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Настройки за софтуера"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Проверка за обновления на всеки"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -355,79 +281,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Инсталиране на обновленията..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
"Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като "
"грешка."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Ключове</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Инсталиране"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Обновлението е завършено"
@@ -438,8 +373,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -447,6 +381,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -539,80 +474,259 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Сваляне на промените</span>\n"
-"\n"
-"Трябва да се свалят промените от централния сървър"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Промени"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Описание"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Презареждане от сървъра на информацията за пакетите."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Обновления на софтуера"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Инсталиране на обновленията..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Презареждане"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Ключове</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Обноввявания по Интернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Ключове</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Идентифициране"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Премахване на избрания ключ от доверената верига ключове."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Носител на инсталацията"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Обноввявания по Интернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Връщане на стандартните стойности"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Възвръщане на стандартните ключове"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Настройки за софтуера"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Проверка за обновления на всеки"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Ключове</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Коментар:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>Дистрибуция:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>Раздели:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Раздели:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Вид:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Добавете пълния ред на хранилището за APT, което искате да добавите</"
+"b></big>\n"
+"\n"
+"APT редът съдържа вида, местонахождението и съдържанието на хранилището. "
+"Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете "
+"подробно описание на синтаксиса в документацията."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Ред за APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Двоични\n"
+"Изходен код"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Лично"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Показване на наличните обновления и избиране кои да се инсталират"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Управление на обновленията"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -622,35 +736,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 обновления"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD с Ubuntu 5.10 „Breezy Badger“"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 обновления по сигурността"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 обновления по сигурността"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 обновления"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 обновления"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD с Ubuntu 5.10 „Breezy Badger“"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 обновления по сигурността"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 обновления по сигурността"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 обновления"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -723,6 +838,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Обновления на софтуера"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Сваляне на промените</span>\n"
+#~ "\n"
+#~ "Трябва да се свалят промените от централния сървър"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Показване на наличните обновления и избиране кои да се инсталират"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Грешка при премахване на ключа"
@@ -738,30 +873,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "ден/дни"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Компоненти</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибуция:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Хранилище</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Раздели:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Временни файлове</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Вид:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Потребителски интерфейс</b>"
@@ -778,24 +898,6 @@ msgstr ""
#~ "сваляте от интернет."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Добавете пълния ред на хранилището за APT, което искате да "
-#~ "добавите</b></big>\n"
-#~ "\n"
-#~ "APT редът съдържа вида, местонахождението и съдържанието на хранилището. "
-#~ "Например <i>„deb http://ftp.debian.org sarge main“</i>. Може да откриете "
-#~ "подробно описание на синтаксиса в документацията."
-
-#~ msgid "APT line:"
-#~ msgstr "Ред за APT:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -812,13 +914,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Автоматично изчистване н_а временните пакетни файлове"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Двоични\n"
-#~ "Изходен код"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Интервал на почистване в дни: "
@@ -859,9 +954,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Добавяне на хранилище"
-#~ msgid "_Custom"
-#~ msgstr "_Лично"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Сваляне на възможните за обновяване пакети"
diff --git a/po/da.po b/po/da.po
index b743daca..022a93f4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,96 +1,3 @@
-# Danish translation of Update Manager.
-# Copyright (C) 2005 Michiel Sikkes <michiel@eyesopened.nl>
-# Copyright (C) 2005 Michael Vogt <michael.vogt@canonical.com>
-# This file is distributed under the same license as the update-manager package.
-# Martin Willemoes Hansen <mwh@sysrq.dk>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
-"PO-Revision-Date: 2005-03-28 11:31+0200\n"
-"Last-Translator: Martin Willemoes Hansen <mwh@sysrq.dk>\n"
-"Language-Team: Danish <dansk@klid.dk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-opdateringer</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Tilføj _cd"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "_Godkendelse"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Fjern den markerede nøgle fra den troværdige nøglering."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet-opdateringer</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Genopret de forvalgte nøgler"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Indstillinger"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -293,9 +200,8 @@ msgstr ""
#. then open the cache (again)
#: ../DistUpgrade/DistUpgradeControler.py:296
#: ../DistUpgrade/DistUpgradeControler.py:319
-#, fuzzy
msgid "Checking package manager"
-msgstr "En anden pakkehåndtering er i gang"
+msgstr ""
#: ../DistUpgrade/DistUpgradeControler.py:311
msgid "Updating repository information"
@@ -306,9 +212,8 @@ msgid "Asking for confirmation"
msgstr ""
#: ../DistUpgrade/DistUpgradeControler.py:329
-#, fuzzy
msgid "Upgrading"
-msgstr "Opgradering færdig"
+msgstr ""
#: ../DistUpgrade/DistUpgradeControler.py:336
msgid "Searching for obsolete software"
@@ -346,79 +251,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
-#, fuzzy
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
-msgstr "Dit system har ødelagte pakker!"
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, python-format
msgid "<b>Remove %s</b>"
-msgstr "<b>Detaljer</b>"
+msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, python-format
msgid "Install %s"
-msgstr "_Installér"
+msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
-#, fuzzy, python-format
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, python-format
msgid "Upgrade %s"
-msgstr "Opgradering færdig"
+msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
@@ -426,8 +339,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -435,8 +347,9 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
-msgstr " "
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:2
msgid ""
@@ -455,20 +368,18 @@ msgid "<b><big>Start the upgrade?</big></b>"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:7
-#, fuzzy
msgid ""
"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
"span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Arkiver er ændret</span>"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:8
msgid "Cleaning up"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:9
-#, fuzzy
msgid "Details"
-msgstr "<b>Detaljer</b>"
+msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:10
msgid "Downloading and installing the upgrades"
@@ -503,9 +414,8 @@ msgid "_Restart Now"
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:18
-#, fuzzy
msgid "_Resume Upgrade"
-msgstr "Opgradering færdig"
+msgstr ""
#: ../data/UpdateManager.glade.h:1
msgid ""
@@ -529,80 +439,237 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Overfører ændringer</span>\n"
-"\n"
-"Skal hente ændringerne fra den centrale server"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
-msgstr "Ændringer"
+msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
-msgstr "Beskrivelse"
+msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
-#, fuzzy
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
-msgstr "Genindlæs pakkeinformationen fra serveren."
+msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
-msgstr "Opdateringer"
+msgstr ""
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
-#, fuzzy
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
-msgstr "Opgradering færdig"
+msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
-#, fuzzy
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
msgid "_Install Updates"
-msgstr "_Installér"
+msgstr ""
-#: ../data/UpdateManager.glade.h:23
-#, fuzzy
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
-msgstr "Genindlæs"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Sections</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Vis tilgængelige opgraderinger og vælg hvilke der skal installeres"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
-msgstr "Opdateringshåndtering"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
@@ -612,58 +679,53 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Sikkerhedsopdateringer til Ubuntu 5.04"
+msgid "Ubuntu 6.04 Updates"
+msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "Opdateringer til Ubuntu 4.10"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Sikkerhedsopdateringer til Ubuntu 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr ""
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
-#, fuzzy
msgid "Oficially supported"
-msgstr "Understøttet officielt"
+msgstr ""
#. CompDescription
#: ../channels/Ubuntu.info.in:97
msgid "Restricted copyright"
-msgstr "Begrænsende copyright"
+msgstr ""
#. CompDescription
#: ../channels/Ubuntu.info.in:100
msgid "Community maintained (Universe)"
-msgstr "Vedligeholdt af fællesskabet (Universe)"
+msgstr ""
#. CompDescription
#: ../channels/Ubuntu.info.in:103
msgid "Non-free (Multiverse)"
-msgstr "Ikke frit programmel (Multiverse)"
+msgstr ""
#. ChangelogURI
#: ../channels/Debian.info.in.h:4
@@ -674,7 +736,7 @@ msgstr ""
#. Description
#: ../channels/Debian.info.in:6
msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 \"Sarge\""
+msgstr ""
#. BaseURI
#: ../channels/Debian.info.in:19
@@ -683,15 +745,13 @@ msgstr ""
#. Description
#: ../channels/Debian.info.in:20
-#, fuzzy
msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Sikkerhedsopdateringer til Debian Stable"
+msgstr ""
#. Description
#: ../channels/Debian.info.in:34
-#, fuzzy
msgid "Debian \"Etch\" (testing)"
-msgstr "Debian Testing"
+msgstr ""
#. BaseURI
#: ../channels/Debian.info.in:47
@@ -700,9 +760,8 @@ msgstr ""
#. Description
#: ../channels/Debian.info.in:48
-#, fuzzy
msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian Non-US (Unstable)"
+msgstr ""
#. CompDescription
#: ../channels/Debian.info.in:54
@@ -713,355 +772,3 @@ msgstr ""
#: ../channels/Debian.info.in:57
msgid "Non-DFSG-compatible Software"
msgstr ""
-
-#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Programmelkilder</b>"
-
-#, fuzzy
-#~ msgid "Automatically check for updates"
-#~ msgstr "Kontrollér om der er nye opdateringer automatisk."
-
-#, fuzzy
-#~ msgid "Cancel downloading of the changelog"
-#~ msgstr "Afbryd overførsel af ændringsloggen"
-
-#~ msgid "<b>Packages to install:</b>"
-#~ msgstr "<b>Pakker der skal installeres:</b>"
-
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Tilgængelige opdateringer</b></big>\n"
-#~ "\n"
-#~ "Følgende pakker kan opgraderes. Du kan opgradere dem ved at bruge "
-#~ "installations-knappen."
-
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Komponenter</b>"
-
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
-#~ msgid "<b>Repository</b>"
-#~ msgstr "<b>Arkiv</b>"
-
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sektioner:</b>"
-
-#~ msgid "<b>Temporary files</b>"
-#~ msgstr "<b>Midlertidige filer</b>"
-
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
-#~ msgid "<b>User Interface</b>"
-#~ msgstr "<b>Brugergrænseflade</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Authentication keys</b></big>\n"
-#~ "\n"
-#~ "You can add and remove authentication keys in this dialog. A key makes it "
-#~ "possible to verify the integrity of the software you download."
-#~ msgstr ""
-#~ "<big><b>Godkendelsesnøgler</b></big>\n"
-#~ "\n"
-#~ "Du kan tilføje og fjerne godkendelsesnøgler i dette vindue. En nøgle gør "
-#~ "det muligt at kontrollere integriteten af det programmel du henter."
-
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Angiv den komplette APT-linje for det arkiv du ønsker at tilføje</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "APT-linjen indeholder typen, stedet og indholdet af arkivet, fx <i>\"deb "
-#~ "http://ftp.debian.org sarge main\"</i>. Du kan finde en detaljeret "
-#~ "beskrivelse af syntaksen i dokumentationen."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid "A_uthentication"
-#~ msgstr "_Godkendelse"
-
-#, fuzzy
-#~ msgid ""
-#~ "Add a new key file to the trusted keyring. Make sure that you received "
-#~ "the key over a secure channel and that you trust the owner. "
-#~ msgstr ""
-#~ "Føj en ny nøgle til den troværdige nøglering. Kontrollér at du har "
-#~ "modtaget nøglen via en sikker kanal og at du stoler på ejeren."
-
-#~ msgid "Automatically clean _temporary packages files"
-#~ msgstr "Ryd automatisk _midlertidige pakke-filer"
-
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kildetekst"
-
-#~ msgid "Clean interval in days: "
-#~ msgstr "Oprydningsinterval i dage: "
-
-#~ msgid "Delete _old packages in the package cache"
-#~ msgstr "Slet _gamle pakker i pakke-mellemlageret"
-
-#~ msgid "Edit Repository..."
-#~ msgstr "Redigér arkiv ..."
-
-#~ msgid "Maximum age in days:"
-#~ msgstr "Maksimal alder i dage:"
-
-#~ msgid "Maximum size in MB:"
-#~ msgstr "Maksimal størrelse i MB:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Restore the default keys shipped with the distribution. This will not "
-#~ "change user installed keys."
-#~ msgstr ""
-#~ "Genopret de forvalgte nøgler der kom med distributionen. Dette vil ikke "
-#~ "ændre nøgler installeret af brugere."
-
-#~ msgid "Set _maximum size for the package cache"
-#~ msgstr "Sæt _maksimal størrelse for pakke-mellemlageret"
-
-#~ msgid "Settings"
-#~ msgstr "Indstillinger"
-
-#~ msgid "Show disabled software sources"
-#~ msgstr "Vis deaktiverede programmelkilder"
-
-#~ msgid "Update interval in days: "
-#~ msgstr "Opdateringsinterval i dage: "
-
-#~ msgid "_Add Repository"
-#~ msgstr "_Tilføj arkiv"
-
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
-
-#~ msgid "_Download upgradable packages"
-#~ msgstr "_Hent pakker der kan opgraderes"
-
-#~ msgid ""
-#~ "This means that some dependencies of the installed packages are not "
-#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
-#~ msgstr ""
-#~ "Dette betyder at der er nogle afhængiheder af de installerede pakker som "
-#~ "ikke er dækket. Brug venligst \"Synaptic\" eller \"apt-get\" til at løse "
-#~ "problemet."
-
-#~ msgid "It is not possible to upgrade all packages."
-#~ msgstr "Det er ikke muligt at opgradere alle pakkerne."
-
-#~ msgid ""
-#~ "This means that besides the actual upgrade of the packages some further "
-#~ "action (such as installing or removing packages) is required. Please use "
-#~ "Synaptic \"Smart Upgrade\" or \"apt-get dist-upgrade\" to fix the "
-#~ "situation."
-#~ msgstr ""
-#~ "Dette betyder at der ud over den aktuelle opgradering af pakkerne vil "
-#~ "være krævet nogle yderligere handlinger, såsom installering og "
-#~ "afinstallering af pakker. Vær venlig at bruge valgmuligheden \"Smart "
-#~ "opgradering\" i Synaptic eller \"apt-get dist-upgrade\" for at løse "
-#~ "problemet."
-
-#~ msgid "Changes not found, the server may not be updated yet."
-#~ msgstr ""
-#~ "Ingen ændringer fundet, det kan være at serveren ikke er opdateret endnu."
-
-#~ msgid ""
-#~ "Failed to download changes. Please check if there is an active internet "
-#~ "connection."
-#~ msgstr ""
-#~ "Overførsel af ændringer mislykkedes. Kontrollér at der er en aktiv "
-#~ "internetforbindelse."
-
-#~ msgid "Version %s: \n"
-#~ msgstr "Version %s: \n"
-
-#~ msgid "Downloading changes..."
-#~ msgstr "Overfører ændringer..."
-
-#~ msgid "The updates are being applied."
-#~ msgstr "Opdateringerne bliver installeret."
-
-#~ msgid ""
-#~ "You can run only one package management application at the same time. "
-#~ "Please close this other application first."
-#~ msgstr ""
-#~ "Du kan kun benytte ét pakkehåndteringsprogram ad gangen. Vær venlig at "
-#~ "afslutte det andet program først."
-
-#~ msgid "Your system is up-to-date!"
-#~ msgstr "Dit system er opdateret"
-
-#~ msgid "There are no updates available."
-#~ msgstr "Der er ingen opdateringer tilgængelige."
-
-#~ msgid "New version: %s"
-#~ msgstr "Ny version: %s"
-
-#~ msgid "Your distribution is no longer supported"
-#~ msgstr "Din distribution er ikke længere understøttet"
-
-#~ msgid ""
-#~ "Please upgrade to a newer version of Ubuntu Linux. The version you are "
-#~ "running will no longer get security fixes or other critical updates. "
-#~ "Please see http://www.ubuntulinux.org for upgrade information."
-#~ msgstr ""
-#~ "Vær venlig at opgradere til en nyere version af Ubuntu Linux. Versionen "
-#~ "som du benytter vil ikke længere modtage sikkerhedsfejlrettelser eller "
-#~ "andre kritiske opdateringer. Se http://www.ubuntulinux.org for "
-#~ "information om opgradering."
-
-#, fuzzy
-#~ msgid "There is a new release of Ubuntu available!"
-#~ msgstr "Der er ingen opdateringer tilgængelige."
-
-#~ msgid "Never show this message again"
-#~ msgstr "Vis aldrig denne besked igen"
-
-#, fuzzy
-#~ msgid ""
-#~ "This usually means that another package management application (like apt-"
-#~ "get or aptitude) already running. Please close that application first"
-#~ msgstr ""
-#~ "Du kan kun benytte ét pakkehåndteringsprogram ad gangen. Vær venlig at "
-#~ "afslutte det andet program først."
-
-#~ msgid "Initializing and getting list of updates..."
-#~ msgstr "Initialiserer og henter listen med opdateringer ..."
-
-#~ msgid "You need to be root to run this program"
-#~ msgstr "Du skal være systemadministrator for at starte dette program"
-
-#~ msgid "Edit software sources and settings"
-#~ msgstr "Redigér indstillinger og kilder for programmel"
-
-#~ msgid "Software Properties"
-#~ msgstr "Indstillinger for programmel"
-
-#~ msgid "Ubuntu Update Manager"
-#~ msgstr "Ubuntus opdateringsværktøj"
-
-#~ msgid "Binary"
-#~ msgstr "Binær"
-
-#~ msgid "Source"
-#~ msgstr "Kildetekst"
-
-#~ msgid "CD"
-#~ msgstr "cd"
-
-#~ msgid "Ubuntu 4.10 Security Updates"
-#~ msgstr "Sikkerhedsopdateringer til Ubuntu 4.10"
-
-#~ msgid "Contributed software"
-#~ msgstr "Bidraget programmel"
-
-#~ msgid "Non-free software"
-#~ msgstr "Ikke frit programmel"
-
-#~ msgid "US export restricted software"
-#~ msgstr "Programmel som USA pålægger eksportbegrænsninger."
-
-#~ msgid "Repositories changed"
-#~ msgstr "Arkiver er ændret"
-
-#~ msgid ""
-#~ "The repository information has changes. A backup copy of your sources."
-#~ "list is stored in %s.save. \n"
-#~ "\n"
-#~ "You need to reload the package list from the servers for your changes to "
-#~ "take effect. Do you want to do this now?"
-#~ msgstr ""
-#~ "Der er ændringer til informationen om arkiver. En sikkerhedskopi af din "
-#~ "sources.list er gemt i %s.save. \n"
-#~ "\n"
-#~ "For at dine ændringer kan træde i kraft, skal du genindlæse pakke-listen "
-#~ "fra serverne. Vil du gøre dette nu?"
-
-#, fuzzy
-#~ msgid ""
-#~ "<big><b>Available Updates</b></big>\n"
-#~ "The following packages are found to be upgradable. You can upgrade them "
-#~ "by using the Install button."
-#~ msgstr ""
-#~ "<big><b>Tilgængelige opdateringer</b></big>\n"
-#~ "\n"
-#~ "Følgende pakker kan opgraderes. Du kan opgradere dem ved at bruge "
-#~ "installations-knappen."
-
-#~ msgid "%i (%s)"
-#~ msgstr "%i (%s)"
-
-#~ msgid "Your system is up-to-date"
-#~ msgstr "Dit system er opdateret"
-
-#~ msgid "Non-free"
-#~ msgstr "Ikke frit"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "Community maintained (UNSUPPORTED from canonical)"
-#~ msgstr "Vedligeholdt af fællesskabet (understøttes IKKE af Canonical)"
-
-#~ msgid "Non-free (UNSUPPORTED from canonical)"
-#~ msgstr "Ikke frit (Understøttes ikke af Canonical)"
-
-#~ msgid "Ubuntu 4.10 \"Warty Warthog\""
-#~ msgstr "Ubuntu 4.10 \"Warty Warthog\""
-
-#~ msgid "Ubuntu 4.10 Security updates"
-#~ msgstr "Sikkerhedsopdateringer til Ubuntu 4.10"
-
-#~ msgid "Ubuntu 5.04 Security updates"
-#~ msgstr "Sikkerhedsopdateringer til Ubuntu 5.04"
-
-#~ msgid "CD Ubuntu 5.04 \"Hoary Hedgehog\""
-#~ msgstr "Cd Ubuntu 5.04 \"Hoary Hedgehog\""
-
-#~ msgid "CD Ubuntu 4.10 \"Warty Warthog\""
-#~ msgstr "Cd Ubuntu 4.10 \"Warty Warthog\""
-
-#~ msgid "Officially supported software"
-#~ msgstr "Officielt understøttet programmel"
-
-#~ msgid "Debian 3.0 \"Woody\""
-#~ msgstr "Debian 3.0 \"Woody\""
-
-#~ msgid "Debian Stable"
-#~ msgstr "Debian Stable"
-
-#~ msgid "Debian Unstable \"Sid\""
-#~ msgstr "Debian Unstable \"Sid\""
-
-#~ msgid "Debian Non-US (Stable)"
-#~ msgstr "Debian Non-US (Stable)"
-
-#~ msgid "Debian Non-US (Testing)"
-#~ msgstr "Debian Non-US (Testing)"
-
-#~ msgid "<b>Add or remove authentication keys</b>"
-#~ msgstr "<b>Tilføj eller fjern godkendelsesnøgler</b>"
diff --git a/po/de.po b/po/de.po
index 38b2dfb8..07df467b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,105 +8,28 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
-"PO-Revision-Date: 2005-04-02 08:46+0200\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-Aktualisierungen</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "_CD hinzufügen"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_uthentifizierung"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-"Den gewählten Schlüssel aus dem vertrauenswürdigen Schlüsselbund entfernen."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Aktualisierungen werden installiert..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet-Aktualisierungen</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Vorgabeschlüssel wiederherstellen"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Software-Einstellungen"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
-msgstr ""
+msgstr "Alle %s Tage"
#: ../SoftwareProperties/SoftwareProperties.py:131
#, python-format
msgid "After %s days"
-msgstr ""
+msgstr "Nach %s Tagen"
#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "Import key"
-msgstr ""
+msgstr "Schlüssel importieren"
#: ../SoftwareProperties/SoftwareProperties.py:364
msgid "Error importing selected file"
@@ -135,14 +58,17 @@ msgid ""
"\n"
"%s"
msgstr ""
+"<big><b>Fehler beim Lesen der CD</b></big>\n"
+"\n"
+"%s"
#: ../SoftwareProperties/SoftwareProperties.py:471
msgid "Please enter a name for the disc"
-msgstr ""
+msgstr "Bitte geben Sie einen Namen für die CD ein"
#: ../SoftwareProperties/SoftwareProperties.py:487
msgid "Please insert a disc in the drive:"
-msgstr ""
+msgstr "Bitte legen Sie die CD in das Laufwerk"
#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
@@ -360,80 +286,89 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Aktualisierungen werden installiert..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Das System enthält defekte Pakete!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Details</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Installieren"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Aktualisierung fertiggestellt"
@@ -444,8 +379,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -453,6 +387,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -547,83 +482,267 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Änderungen werden heruntergeladen</"
-"span>\n"
-"\n"
-"Die Änderungen müssen vom zentralen Server abgerufen werden"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Änderungen"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Beschreibung"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Aktuelle Paketinformationen vom Server beziehen."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Software-Aktualisierungen"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Aktualisierung fertiggestellt"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Installieren"
# »Aktualisieren« könnte hier verwirrend sein -fa-
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Neu laden"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-Aktualisierungen</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "_CD hinzufügen"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_uthentifizierung"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+"Den gewählten Schlüssel aus dem vertrauenswürdigen Schlüsselbund entfernen."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Aktualisierungen werden installiert..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet-Aktualisierungen</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Vorgabeschlüssel wiederherstellen"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Software-Einstellungen"
+
+#: ../data/SoftwareProperties.glade.h:14
+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"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentar:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sektionen:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Typ:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Geben Sie die vollständige APT-Zeile für das Repository ein, welches "
+"hinzugefügt werden soll</b></big>\n"
+"\n"
+"Die APT-Zeile enthält den Typ, den Ort und den Inhalt der Paketquelle, z.B. "
+"<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
+msgid "APT line:"
+msgstr "APT-Zeile:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr "Kanal hinzufügen"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binär\n"
+"Quellcode"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr "Kanal bearbeiten"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Benutzerdefiniert"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Aktualisierungsverwaltung"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+"Falls die automatische Prüfung auf Aktualisierungen deaktiviert ist, müssen "
+"Sie die Liste der Software-Kanäle manuell neu laden. Diese Option erlaubt es "
+"den Erinnerungsdialog, der in diesem Fall angezeigt wird, zu verstecken."
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr "Zeige Details einer Aktualisierung"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr "Speichert die Größe des Fensters der Aktualisierungsverwaltung"
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr "Die Fenstergröße"
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -633,36 +752,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
#. CompDescription
@@ -674,12 +794,12 @@ msgstr "Offiziell unterstützt"
#. CompDescription
#: ../channels/Ubuntu.info.in:97
msgid "Restricted copyright"
-msgstr "Eingeschränktes Copyright"
+msgstr "Urheberrechtlich eingeschränkt"
#. CompDescription
#: ../channels/Ubuntu.info.in:100
msgid "Community maintained (Universe)"
-msgstr "Von den Gemeinschaft verwaltet (Universe)"
+msgstr "Von der Gemeinschaft betreut (Universe)"
#. CompDescription
#: ../channels/Ubuntu.info.in:103
@@ -734,6 +854,31 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Software-Aktualisierungen"
+
+#~ msgid "Add the following software channel?"
+#~ msgstr "Die folgenden Software-Kanäle hinzufügen?"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Änderungen werden heruntergeladen</"
+#~ "span>\n"
+#~ "\n"
+#~ "Die Änderungen müssen vom zentralen Server abgerufen werden"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr ""
+#~ "Verfügbare Aktualisierungen anzeigen und zu installierende auswählen"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Fehler beim Entfernen des Schlüssels"
@@ -767,30 +912,15 @@ msgstr ""
#~ "kann durch einen Klick auf die Schaltfläche »Installieren« vorgenommen "
#~ "werden."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponenten</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sektionen:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Temporäre Dateien</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Adresse:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Benutzeroberfläche</b>"
@@ -807,24 +937,6 @@ msgstr ""
#~ "hinzugefügt und entfernt werden. Ein Schlüssel ermöglicht die "
#~ "Integritätsprüfung von heruntergeladenen Paketen."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Geben Sie die vollständige APT-Zeile für das Repository ein, "
-#~ "welches hinzugefügt werden soll</b></big>\n"
-#~ "\n"
-#~ "Die APT-Zeile enthält den Typ, den Ort und den Inhalt der Paketquelle, z."
-#~ "B. <i>»deb http://ftp.debian.org sarge main«</i>. Eine ausführliche "
-#~ "Beschreibung des Syntax ist in der Dokumentation zu finden."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-Zeile:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_uthentifizierung"
@@ -840,13 +952,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "_Temporäre Paketdateien automatisch löschen"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binär\n"
-#~ "Quellen"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Säuberungsintervall in Tagen:"
@@ -886,9 +991,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "Repository _hinzufügen"
-#~ msgid "_Custom"
-#~ msgstr "_Benutzerdefiniert"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "Aktualisierbare Pakete herunter_laden"
diff --git a/po/el.po b/po/el.po
index 0e58916d..10a8b783 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,79 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Ενότητες:</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Ενότητες:</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "Πι_στοποίηση"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-#, fuzzy
-msgid "Software Preferences"
-msgstr "<b>Πηγές λογισμικού</b>"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -342,75 +269,84 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Ενότητες:</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, python-format
msgid "Upgrade %s"
msgstr ""
@@ -421,8 +357,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -430,6 +365,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -522,74 +458,253 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
msgid "_Install Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "Πι_στοποίηση"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Αναβαθμίσεις διαδικτύου</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+#, fuzzy
+msgid "Software Preferences"
+msgstr "<b>Πηγές λογισμικού</b>"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Σχόλιο:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>Διανομή:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Ενότητες:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Τύπος:</b> "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Εισάγετε την πλήρη γραμμή APT του repository που θέλετε να "
+"προσθέσετε</b></big>\n"
+"\n"
+"Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός "
+"repository, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>. "
+"Μπορείτε να βρείτε λεπτομερήςπεριγραφή του τρόπου σύνταξης στην τεκμηρίωση."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Γραμμή APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr ""
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -598,32 +713,32 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr ""
#. CompDescription
@@ -700,30 +815,15 @@ msgstr ""
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Ενότητες:</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Σχόλιο:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Συστατικά</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Διανομή:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Ενότητες:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Προσωρινά αρχεία</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Τύπος:</b> "
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Επιφάνεια Χρήσης</b>"
@@ -740,25 +840,6 @@ msgstr ""
#~ "διάλογο. Ένα κλειδί κάνειεφικτό το έλεγχο της ακεραιότητας του λογισμικού "
#~ "που μεταφορτώνετε."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Εισάγετε την πλήρη γραμμή APT του repository που θέλετε να "
-#~ "προσθέσετε</b></big>\n"
-#~ "\n"
-#~ "Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός "
-#~ "repository, για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</"
-#~ "i>. Μπορείτε να βρείτε λεπτομερήςπεριγραφή του τρόπου σύνταξης στην "
-#~ "τεκμηρίωση."
-
-#~ msgid "APT line:"
-#~ msgstr "Γραμμή APT:"
-
#~ msgid "A_uthentication"
#~ msgstr "Πι_στοποίηση"
diff --git a/po/en_CA.po b/po/en_CA.po
index 9def7aad..dd0203e8 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,82 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet Updates</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Add _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_uthentication"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Remove the selected key from the trusted keyring."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installing updates..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet Updates</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Restore default keys"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Software Preferences"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -353,79 +277,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installing updates..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Your system has broken packages!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Details</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Install"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Upgrade finished"
@@ -436,8 +369,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -445,6 +377,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -538,81 +471,262 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Changes"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Description"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Reload the package information from the server."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Software Updates"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Upgrade finished"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Install"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Reload"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet Updates</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Add _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_uthentication"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Remove the selected key from the trusted keyring."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installing updates..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet Updates</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Restore default keys"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Software Preferences"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comment:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sections:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Enter the complete APT line of the repository that you want to add</"
+"b></big>\n"
+"\n"
+"The APT line contains the type, location and content of a repository, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+"detailed description of the syntax in the documentation."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT line:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binary\n"
+"Source"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Custom"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Show available updates and choose which to install"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Update Manager"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -622,37 +736,38 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.04 Updates"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.04 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.04 Updates"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -723,6 +838,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Software Updates"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Show available updates and choose which to install"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 Security Updates"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Error removing the key"
@@ -755,30 +890,15 @@ msgstr ""
#~ "The following packages are found to be upgradable. You can upgrade them "
#~ "by using the Install button."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Components</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Temporary files</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>User Interface</b>"
@@ -794,24 +914,6 @@ msgstr ""
#~ "You can add and remove authentication keys in this dialogue. A key makes "
#~ "it possible to check verify the integrity of the software you download."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_uthentication"
@@ -826,13 +928,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Automatically clean _temporary packages files"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Clean interval in days: "
@@ -871,9 +966,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Add Repository"
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Download upgradable packages"
diff --git a/po/en_GB.po b/po/en_GB.po
index eae8881f..1db42018 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\n"
"PO-Revision-Date: 2005-04-19 22:51-0400\n"
"Last-Translator: Abigail Brady <morwen@evilmagic.org>\n"
"Language-Team: \n"
@@ -16,84 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet Updates</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Details</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Add _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_uthentication"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Remove the selected key from the trusted keyring."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installing updates..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet Updates</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Restore default keys"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Restore default keys"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Software Preferences"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Installing updates..."
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -356,79 +278,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installing updates..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Your system has broken packages!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Details</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Install"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Upgrade finished"
@@ -439,8 +370,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -448,6 +378,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -540,80 +471,263 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Changes"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Description"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Reload the package information from the server."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Software Updates"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Installing updates..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Reload"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet Updates</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Add _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_uthentication"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Remove the selected key from the trusted keyring."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installing updates..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet Updates</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Restore default keys"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Restore default keys"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Software Preferences"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Installing updates..."
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Details</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comment:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sections:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Enter the complete APT line of the repository that you want to add</"
+"b></big>\n"
+"\n"
+"The APT line contains the type, location and content of a repository, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+"detailed description of the syntax in the documentation."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT line:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binary\n"
+"Source"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Custom"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Show available updates and choose which to install"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Update Manager"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -623,35 +737,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -724,6 +839,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Software Updates"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Show available updates and choose which to install"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Error removing the key"
@@ -737,30 +872,15 @@ msgstr ""
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>Software Sources</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Components</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Temporary files</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>User Interface</b>"
@@ -776,24 +896,6 @@ msgstr ""
#~ "You can add and remove authentication keys in this dialogue. A key makes "
#~ "it possible to check verify the integrity of the software you download."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
#, fuzzy
#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
@@ -812,13 +914,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Automatically clean _temporary packages files"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Clean interval in days: "
@@ -861,9 +956,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Add Repository"
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Download upgradable packages"
diff --git a/po/es.po b/po/es.po
index 042b8c19..cdb79504 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,82 +19,6 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Detalles:</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Actualizaciones por Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detalles:</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Añadir _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_utenticación"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Quitar la clave seleccionada del anillo de confianza."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Instalando actualizaciones..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Actualizaciones por Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Recuperar claves predeterminadas"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Preferencias de software"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -361,80 +285,89 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Instalando actualizaciones..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "¡Su sistema tiene paquetes rotos!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Detalles:</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Instalar"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Actualización finalizada"
@@ -445,8 +378,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -454,6 +386,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -547,81 +480,262 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</span>\n"
-"\n"
-"Se necesita descargar los cambios del servidor central"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Cambios"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Descripción"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Recargar la información del paquete desde el servidor."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Actualizaciones de software"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Actualización finalizada"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Instalar"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Recargar"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Detalles:</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizaciones por Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Detalles:</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Añadir _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_utenticación"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Quitar la clave seleccionada del anillo de confianza."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Instalando actualizaciones..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Actualizaciones por Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Recuperar claves predeterminadas"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferencias de software"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Detalles:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comentario:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Secciones:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tipo:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Introduzca la línea completa del repositorio APT que quiere añadir</"
+"b></big>\n"
+"\n"
+"La línea de APT contiene el tipo, ubicación y contenido de un repositorio, "
+"por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Puede encontrar "
+"una descripción detallada de la sintaxis en la documentación."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Línea de APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binario\n"
+"Fuente"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Personalizado"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Mostrar actualizaciones disponibles y elegir cuáles instalar"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Gestor de actualizaciones"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -631,37 +745,38 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Actualizaciones de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "Actualizaciones de Ubuntu 5.04"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
+msgstr "Actualizaciones de Ubuntu 5.04"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -732,6 +847,27 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Actualizaciones de software"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de cambios</"
+#~ "span>\n"
+#~ "\n"
+#~ "Se necesita descargar los cambios del servidor central"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Mostrar actualizaciones disponibles y elegir cuáles instalar"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Actualizaciones de seguridad de Ubuntu 5.04"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Hubo un error al quitar la clave"
@@ -764,30 +900,15 @@ msgstr ""
#~ "El gestor de actualizaciones encontró los siguientes paquetes "
#~ "actualizables. Puede actualizarlos usando el botón Instalar."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentario:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Componentes</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribución:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repositorio</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secciones:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Ficheros temporales</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interfaz de usuario</b>"
@@ -803,25 +924,6 @@ msgstr ""
#~ "Puede añadir y quitar claves de autenticación desde este diálogo. Una "
#~ "clave hace posible verificar la integridad del software que descarga."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Introduzca la línea completa del repositorio APT que quiere "
-#~ "añadir</b></big>\n"
-#~ "\n"
-#~ "La línea de APT contiene el tipo, ubicación y contenido de un "
-#~ "repositorio, por ejemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. "
-#~ "Puede encontrar una descripción detallada de la sintaxis en la "
-#~ "documentación."
-
-#~ msgid "APT line:"
-#~ msgstr "Línea de APT:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_utenticación"
@@ -837,13 +939,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Limpiar _temporalmente los archivos de paquetes"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binario\n"
-#~ "Fuente"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Intervalo de limpieza en días: "
@@ -882,9 +977,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Añadir repositorio"
-#~ msgid "_Custom"
-#~ msgstr "_Personalizado"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Descargar paquetes actualizables"
diff --git a/po/fi.po b/po/fi.po
index c9d7c97e..cfcdb8bc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,81 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Yksityiskohdat</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-päivitykset</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Yksityiskohdat</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Lisää _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "Varmenn_us"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Poista valittu avain luotetuista avaimista."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet-päivitykset</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Palauta oletusavaimet"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Asetukset"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -352,78 +277,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Järjestelmässä on rikkinäisiä paketteja!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Yksityiskohdat</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Asenna"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Päivitykset suoritettu"
@@ -434,8 +368,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -443,6 +376,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr " "
@@ -536,81 +470,261 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ladataan muutoksia</span>\n"
-"\n"
-"Muutokset täytyy ladata keskuspalvelimelta"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Muutokset"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Kuvaus"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Lataa pakettitiedot uudelleen palvelimelta."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Ohjelmapäivitykset"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Päivitykset suoritettu"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Asenna"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Päivitä"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Yksityiskohdat</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-päivitykset</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Yksityiskohdat</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Lisää _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "Varmenn_us"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Poista valittu avain luotetuista avaimista."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet-päivitykset</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Palauta oletusavaimet"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Asetukset"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Yksityiskohdat</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentti:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Osastot:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tyyppi:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n"
+"\n"
+"APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi <i>"
+"\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
+"dokumentaatiosta."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT-rivi:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binääri\n"
+"Lähdekoodi"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Muu"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Päivitysten hallinta"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -620,36 +734,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
#. CompDescription
@@ -721,6 +836,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Ohjelmapäivitykset"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ladataan muutoksia</span>\n"
+#~ "\n"
+#~ "Muutokset täytyy ladata keskuspalvelimelta"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 turvallisuuspäivitykset"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Virhe poistettaessa avainta"
@@ -753,30 +888,15 @@ msgstr ""
#~ "Seuraavat paketit ovat päivitettävissä. Voit päivittää ne napsauttamalla "
#~ "Asenna-painiketta."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentti:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponentit</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Jakelu:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Varasto</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Osastot:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Väliaikaistiedostot</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tyyppi:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Käyttöliittymä</b>"
@@ -792,23 +912,6 @@ msgstr ""
#~ "Voit lisätä ja poistaa varmennusavaimia tässä valintaikkunassa. Avaimella "
#~ "voidaan tarkistaa lataamiesi ohjelmien eheys."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Kirjoita haluamasi varaston koko APT-rivi</b></big>\n"
-#~ "\n"
-#~ "APT-rivi sisältää varaston tyypin, sijainnin ja sisällön, esimerkiksi <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. Lisätietoja aiheesta löydät "
-#~ "dokumentaatiosta."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-rivi:"
-
#~ msgid "A_uthentication"
#~ msgstr "Varmenn_us"
@@ -824,13 +927,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Tyhjennä _väliaikaistiedostot automaattisesti"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binääri\n"
-#~ "Lähdekoodi"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Tyhjennysväli päivissä: "
@@ -869,9 +965,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Lisää varasto"
-#~ msgid "_Custom"
-#~ msgstr "_Muu"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Lataa päivitettävät paketit"
diff --git a/po/fr.po b/po/fr.po
index 5f98866d..4a8e5b88 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager 0.37.2\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\n"
"PO-Revision-Date: 2005-04-04 19:43+0200\n"
"Last-Translator: \n"
"Language-Team: French <gnomefr@traduc.org>\n"
@@ -16,82 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Détails</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Mise à jour par Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Détails</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Ajouter un _cédérom"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_uthentification"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Supprimer la clé sélectionnée du trousseau digne de confiance."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installation des mises à jour..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Mise à jour par Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Restaurer les clés par défaut"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Préférences du logiciel"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -358,80 +282,89 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installation des mises à jour..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Votre système a des paquets cassés !"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Détails</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Installer"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Mise à jour terminée"
@@ -442,8 +375,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -451,6 +383,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr " "
@@ -544,81 +477,263 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Téléchargement des changements</span>\n"
-"\n"
-"Il est nécessaire de récupérer les changement du serveur central"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Changements"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Description"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Recharger les informations des paquets depuis le serveur"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Mises à jour des logiciels"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Mise à jour terminée"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Installer"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Recharger"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Détails</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Mise à jour par Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Détails</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Ajouter un _cédérom"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_uthentification"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Supprimer la clé sélectionnée du trousseau digne de confiance."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installation des mises à jour..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Mise à jour par Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Restaurer les clés par défaut"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Préférences du logiciel"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Détails</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Commentaire :</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sections :</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type :</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI :</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez ajouter</"
+"b></big>\n"
+"\n"
+"La ligne APT contient le type, la source et le contenu d'un dépôt, par "
+"exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une "
+"description détaillée de la syntaxe dans la documentation."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Ligne APT :"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binaire\n"
+"Source"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Personnalisé"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Montre les mises à jours disponibles et choisir celles à installer"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Gestionnaire de mises à jour"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -628,37 +743,38 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Mises à jour d'Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "Mises à jour d'Ubuntu 5.04"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 Mises à jour de sécurité"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
+msgstr "Mises à jour d'Ubuntu 5.04"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -729,6 +845,27 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Mises à jour des logiciels"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Téléchargement des changements</"
+#~ "span>\n"
+#~ "\n"
+#~ "Il est nécessaire de récupérer les changement du serveur central"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Montre les mises à jours disponibles et choisir celles à installer"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 Mises à jour de sécurité"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Erreur lors de la suppression de la clé"
@@ -761,30 +898,15 @@ msgstr ""
#~ "Les paquets suivant peuvent être mis à jour. Vous pouvez les mettre à "
#~ "jour en utilisant le bouton Installer."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Commentaire :</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Composants</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution :</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Dépôt</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections :</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Fichiers temporaires</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type :</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI :</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interface utilisateur</b>"
@@ -801,24 +923,6 @@ msgstr ""
#~ "boîte de dialogue. Une clé rend possible la vérification de l'intégrité "
#~ "des logiciels que vous téléchargez."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Saisissez la ligne APT complète du dépôt que vous souhaitez "
-#~ "ajouter</b></big>\n"
-#~ "\n"
-#~ "La ligne APT contient le type, la source et le contenu d'un dépôt, par "
-#~ "exemple « deb http://ftp.debian.org sarge main ». Vous pouvez trouver une "
-#~ "description détaillée de la syntaxe dans la documentation."
-
-#~ msgid "APT line:"
-#~ msgstr "Ligne APT :"
-
#~ msgid "A_uthentication"
#~ msgstr "A_uthentification"
@@ -834,13 +938,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Nettoyer automatiquement les fichiers _temporaires des paquets"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binaire\n"
-#~ "Source"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Nombre de jours avant nettoyage : "
@@ -879,9 +976,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Ajouter un dépôt"
-#~ msgid "_Custom"
-#~ msgstr "_Personnalisé"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Télécharger les paquets pouvant être mis à jour"
diff --git a/po/gl.po b/po/gl.po
index 02daf88d..4e8fa02d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gl\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Claves</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Actualizacións por Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Claves</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Eliminar a clave seleccionada do anel de confianza."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Soportes de instalación"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Actualizacións por Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Restaurar predeterminados"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Restaurar as claves predeterminadas"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Preferencias de software"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-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"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -357,79 +283,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Instalando actualizacións..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Claves</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Instalar"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Actualización rematada"
@@ -440,8 +375,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -449,6 +383,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -541,80 +476,259 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</span>\n"
-"\n"
-"Necesítanse descargar os trocos do servidor actual"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Cambios"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Descrición"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Recargar a información do paquete desde o servidor."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Actualizacións de software"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Instalando actualizacións..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Recargar"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Claves</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizacións por Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Claves</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autenticación"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Eliminar a clave seleccionada do anel de confianza."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Soportes de instalación"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Actualizacións por Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Restaurar predeterminados"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Restaurar as claves predeterminadas"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferencias de software"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+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"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Claves</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comentario:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Seccións:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tipo:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Introduza a liña completa do repositorio APT que quere engadir</b></"
+"big>\n"
+"\n"
+"A liña de APT contén o tipo, ubicación e contido dun repositorio, por "
+"exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha "
+"descrición detallada da sintase na documentación."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Liña de APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binario\n"
+"Fonte"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Personalizar"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Amosar actualización dispoñibles e escoller cales instalar"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Xestor de actualizacións"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -624,35 +738,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Actualizacións de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Actualizacións de seguranza de Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Actualizacións de seguranza de Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Actualizacións de Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Actualizacións de Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD con Ubuntu 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Actualizacións de seguranza de Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Actualizacións de seguranza de Ubuntu 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Actualizacións de Ubuntu 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -725,6 +840,27 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Actualizacións de software"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Descargando informe de trocos</"
+#~ "span>\n"
+#~ "\n"
+#~ "Necesítanse descargar os trocos do servidor actual"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Amosar actualización dispoñibles e escoller cales instalar"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Erro ao quitar a clave"
@@ -740,30 +876,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "día(s)"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentario:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Compoñentes</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribución:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repositorio</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seccións:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Ficheiros temporais</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interface de usuario</b>"
@@ -779,24 +900,6 @@ msgstr ""
#~ "clave fai posible verificar a integridade do software que descarga."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Introduza a liña completa do repositorio APT que quere engadir</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "A liña de APT contén o tipo, ubicación e contido dun repositorio, por "
-#~ "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha "
-#~ "descrición detallada da sintase na documentación."
-
-#~ msgid "APT line:"
-#~ msgstr "Liña de APT:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -812,13 +915,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Limpar _temporalmente os ficheiros de paquetes"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binario\n"
-#~ "Fonte"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Intervalo de limpeza en días: "
@@ -859,9 +955,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Engadir repositorio"
-#~ msgid "_Custom"
-#~ msgstr "_Personalizar"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Descargar paquetes actualizables"
diff --git a/po/he.po b/po/he.po
index 779a12b7..88fcf175 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager.HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\n"
"PO-Revision-Date: 2005-08-07 14:49+0300\n"
"Last-Translator: Yuval Tanny\n"
"Language-Team: Hebrew <he@li.org>\n"
@@ -20,80 +20,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>מפתחות</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>עדכוני אינטרנט</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>מפתחות</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "אימות"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "דיסק התקנה"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>עדכוני אינטרנט</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "שחזר ברירת מחדל"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "שחזר מפתחות ברירת מחדל"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "העדפות תוכנה"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "בדוק לעדכונים כל"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -352,77 +278,86 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "מתקין עדכונים..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>מפתחות</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_התקן"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "השדרוג הסתיים"
@@ -433,8 +368,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -442,6 +376,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -534,80 +469,258 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">הורדת שינויים</span>\n"
-"\n"
-"צריך להוריד את השינויים מהשרת המרכזי"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "שינויים"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "תיאור"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "טען מחדש את המידע על החבילה מהשרת"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "עדכוני תוכנה"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "מתקין עדכונים..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "טען מחדש"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>מפתחות</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>עדכוני אינטרנט</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>מפתחות</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "אימות"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "הסר את המפתח הנבחר מרשימת המפתחות שאתה בוטח בהם."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "דיסק התקנה"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>עדכוני אינטרנט</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "שחזר ברירת מחדל"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "שחזר מפתחות ברירת מחדל"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "העדפות תוכנה"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "בדוק לעדכונים כל"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>מפתחות</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>הערות:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>הפצה:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>מחלקה:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>מחלקה:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>סוג:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>כתובת:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n"
+"\n"
+"שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb http://ftp.debian."
+"org sarge main\"</i>\n"
+"אפשר למצוא הסבר מפורט על זה בתיעוד."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT שורת:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"מקור\n"
+"בינארי"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_התאם אישית"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "הראה עדכונים זמינים ובחר את מה להתקין"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "מנהל עדכונים"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -617,35 +730,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "עדכונים - אובונטו 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "עדכוני אבטחה - אובונטו 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "עדכוני אבטחה - אובונטו 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "עדכונים - אובונטו 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "עדכונים - אובונטו 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "עדכוני אבטחה - אובונטו 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "עדכוני אבטחה - אובונטו 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "עדכונים - אובונטו 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -718,6 +832,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "עדכוני תוכנה"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">הורדת שינויים</span>\n"
+#~ "\n"
+#~ "צריך להוריד את השינויים מהשרת המרכזי"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "הראה עדכונים זמינים ובחר את מה להתקין"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "שגיאה בהסרת המפתח"
@@ -733,30 +867,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "ימים"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>הערות:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>רכיבים</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>הפצה:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>מאגר</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>מחלקה:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>קבצים זמניים</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>סוג:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>כתובת:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>ממשק משתמש</b>"
@@ -772,23 +891,6 @@ msgstr ""
#~ "תקינות התוכנה שאתה מוריד."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n"
-#~ "\n"
-#~ "שורת APT מכילה סוג, מיקום ותוכן של המאגר. לדוגמה: <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>\n"
-#~ "אפשר למצוא הסבר מפורט על זה בתיעוד."
-
-#~ msgid "APT line:"
-#~ msgstr "APT שורת:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -804,13 +906,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "_נקה קבצים זמניים של חבלות באופן אוטומטי."
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "מקור\n"
-#~ "בינארי"
-
#~ msgid "Clean interval in days: "
#~ msgstr "משך זמן בימים בין הניקיונות:"
@@ -850,9 +945,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_הוסף מאגר"
-#~ msgid "_Custom"
-#~ msgstr "_התאם אישית"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_הורד חבילות שניתנות לעדכון"
diff --git a/po/hu.po b/po/hu.po
index de177f3b..5b09ce81 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager.HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,82 +17,6 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Részletek</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internetes frissítések</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Részletek</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "_CD hozzáadása"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "_Hitelesítés"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "A kijelölt kulcs eltávolítása a megbízható kulcstartóról."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Frissítések telepítése..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internetes frissítések</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Alapértelmezett kulcsok visszaállítása"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Szoftver beállításai"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -354,76 +278,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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Frissítések telepítése..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, 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:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "A rendszerén törött csomagok vannak!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Részletek</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Telepítés"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "A frissítés befejeződött"
@@ -434,8 +367,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -443,6 +375,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -536,81 +469,261 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Módosítások letöltése</span>\n"
-"\n"
-"A módosításokat le kell tölteni a központi kiszolgálóról "
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Módosítások"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Leírás"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../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."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Szoftverfrissítések"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "A frissítés befejeződött"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Telepítés"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Újratöltés"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Részletek</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetes frissítések</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Részletek</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "_CD hozzáadása"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "_Hitelesítés"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "A kijelölt kulcs eltávolítása a megbízható kulcstartóról."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Frissítések telepítése..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internetes frissítések</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Alapértelmezett kulcsok visszaállítása"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Szoftver beállításai"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Részletek</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Megjegyzés:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Csoportok:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Típus:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Adja meg a felvenni kívánt tároló teljes APT sorát</b></big>\n"
+"\n"
+"Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például <i>"
+"\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes "
+"leírását a dokumentációban találhatja meg."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT sor:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Bináris\n"
+"Forrás"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Egyéni"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Rendelkezésre álló frissítések mutatása és telepítése"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Frissítéskezelő"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -620,36 +733,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.04 biztonsági frissítések"
#. CompDescription
@@ -721,6 +835,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Szoftverfrissítések"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Módosítások letöltése</span>\n"
+#~ "\n"
+#~ "A módosításokat le kell tölteni a központi kiszolgálóról "
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Rendelkezésre álló frissítések mutatása és telepítése"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 biztonsági frissítések"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Hiba a kulcs eltávolítása közben"
@@ -753,30 +887,15 @@ msgstr ""
#~ "A következő csomagok frissíthetőek. A Telepítés gomb segítségével "
#~ "frissítheti őket."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Megjegyzés:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Összetevők</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Disztribúció:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Tároló</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Csoportok:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Átmeneti fájlok</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Típus:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Felhasználói felület</b>"
@@ -793,23 +912,6 @@ msgstr ""
#~ "kulcsokat.A kulcsok lehetővé teszik az Ön által letöltött szoftverek "
#~ "épségének ellenőrzését."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Adja meg a felvenni kívánt tároló teljes APT sorát</b></big>\n"
-#~ "\n"
-#~ "Az APT sor tartalmazza a tároló típusát, helyét és tartalmát, például <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. A szintakszis részletes "
-#~ "leírását a dokumentációban találhatja meg."
-
-#~ msgid "APT line:"
-#~ msgstr "APT sor:"
-
#~ msgid "A_uthentication"
#~ msgstr "_Hitelesítés"
@@ -825,13 +927,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Átmeneti csomagfájlok automatikus _törlése"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Bináris\n"
-#~ "Forrás"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Törlés ennyi naponként: "
@@ -870,9 +965,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Tároló hozzáadása"
-#~ msgid "_Custom"
-#~ msgstr "_Egyéni"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "Frissíthető csomagok letöltése"
diff --git a/po/it.po b/po/it.po
index f97e6041..cbaf7b6e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Chiavi</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Aggiornamenti Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Chiavi</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Rimuovi la chiave selezionata dal portachiavi fidato"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Supporto di Installazione "
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Aggiornamenti Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Ripristina valori iniziali"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Ripristina le chiavi di default"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Preferenze software"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-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"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -357,79 +283,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installazione degli aggiornamenti..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Chiavi</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Installa"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Aggiornamento terminato"
@@ -440,8 +375,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -449,6 +383,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -541,82 +476,259 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Download delle modifiche in corso</"
-"span>\n"
-"\n"
-"Devo scaricare le modifiche dal server centrale"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Modifiche"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Descrizione"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Ricarica le informazioni del pacchetto dal server"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Aggiornamenti Software"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Installazione degli aggiornamenti..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Ricarica"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Chiavi</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Aggiornamenti Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Chiavi</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autenticazione"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Rimuovi la chiave selezionata dal portachiavi fidato"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Supporto di Installazione "
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Aggiornamenti Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Ripristina valori iniziali"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Ripristina le chiavi di default"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferenze software"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+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"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Chiavi</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Commento:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sezioni:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tipo:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Inserisci la linea APT completa del repository che vuoi aggiungere</"
+"b></b>\n"
+"\n"
+"La linea APT contiene il tipo, la locazione e il contenuto di un repository, "
+"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
+msgid "APT line:"
+msgstr "Riga APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binari\n"
+"Sorgenti"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Personalizzato"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
-"Visualizza gli aggiornamenti disponibili e seleziona quelli da installare"
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Gestore degli Aggiornamenti"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -626,35 +738,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Aggiornamenti di Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD·con·Ubuntu·5.10·\"Breezy·Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Aggiornamenti di sicurezza di Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Aggiornamenti di Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Aggiornamenti di Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD·con·Ubuntu·5.10·\"Breezy·Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Aggiornamenti di sicurezza di Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Aggiornamenti di sicurezza per Ubuntu 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Aggiornamenti di Ubuntu 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -727,6 +840,28 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Aggiornamenti Software"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Download delle modifiche in corso</"
+#~ "span>\n"
+#~ "\n"
+#~ "Devo scaricare le modifiche dal server centrale"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr ""
+#~ "Visualizza gli aggiornamenti disponibili e seleziona quelli da installare"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Errore rimuovendo la chiave"
@@ -742,30 +877,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "giorni"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Commento:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Componenti</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuzione:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sezioni:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>File Temporanei</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipo:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interfaccia utente</b>"
@@ -781,25 +901,6 @@ msgstr ""
#~ "permette di verificare l'integrità del software che scarichi."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Inserisci la linea APT completa del repository che vuoi "
-#~ "aggiungere</b></b>\n"
-#~ "\n"
-#~ "La linea APT contiene il tipo, la locazione e il contenuto di un "
-#~ "repository, ad esempio <i>\"deb http://ftp.debian.org sarge main\"</i>. "
-#~ "Puoi trovare una descrizione dettagliata della sintassi nella "
-#~ "documentazione."
-
-#~ msgid "APT line:"
-#~ msgstr "Riga APT:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -816,13 +917,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Elimina automaticamente i file temporanei dei pacchetti"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binari\n"
-#~ "Sorgenti"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Intervallo della pulizia in giorni: "
@@ -863,9 +957,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Aggiungi repository"
-#~ msgid "_Custom"
-#~ msgstr "_Personalizzato"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Scarica i pacchetti aggiornabili"
diff --git a/po/ja.po b/po/ja.po
index 9a9f68c4..9958141f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,82 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>詳細</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>インターネットアップデート</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>詳細</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "CDの追加(_C)"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "認証"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "信頼されたキーリングから選択した鍵を削除します。"
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "アップデートをインストール中..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>インターネットアップデート</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "デフォルトの鍵を元に戻す"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "デフォルトの鍵を元に戻す"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "ソフトウェアの設定"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -352,78 +276,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "アップデートをインストール中..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "選択したキーを削除できませんでした。バグとして報告してください。"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "システムに壊れたパッケージがあります！"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>詳細</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "インストール(_I)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "アップグレードが終了しました"
@@ -434,8 +367,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -443,6 +375,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -535,80 +468,260 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">変更点を取得中</span>\n"
-"\n"
-"中央サーバから変更点を取得する必要があります"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "変更点"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "詳細"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "サーバからパッケージ情報を再度読み込む。"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "ソフトウェアのアップデート"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "アップデートをインストール中..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "再読込"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>詳細</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>インターネットアップデート</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>詳細</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "CDの追加(_C)"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "認証"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "信頼されたキーリングから選択した鍵を削除します。"
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "アップデートをインストール中..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>インターネットアップデート</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "デフォルトの鍵を元に戻す"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "デフォルトの鍵を元に戻す"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "ソフトウェアの設定"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>詳細</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>コメント:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>ディストリビューション:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>セクション:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>セクション:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>タイプ:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n"
+"\n"
+"APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb http://"
+"ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式について書か"
+"れています。"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT line:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"バイナリ\n"
+"ソース"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "カスタム(_C)"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "アップデート可能なファイルの表示とインストール"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "アップデートマネージャ"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -618,35 +731,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 セキュリティアップデート"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 セキュリティアップデート"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.04 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 セキュリティアップデート"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 セキュリティアップデート"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 セキュリティアップデート"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 セキュリティアップデート"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -717,6 +831,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "ソフトウェアのアップデート"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">変更点を取得中</span>\n"
+#~ "\n"
+#~ "中央サーバから変更点を取得する必要があります"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "アップデート可能なファイルの表示とインストール"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 セキュリティアップデート"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "キー削除のエラー"
@@ -735,30 +869,15 @@ msgstr ""
#~ msgid "Choose a key-file"
#~ msgstr "キーファイルを選択"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>コメント:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>コンポーネント</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>ディストリビューション:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>リポジトリ</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>セクション:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>一時ファイル</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>タイプ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "ユーザインターフェース"
@@ -773,23 +892,6 @@ msgstr ""
#~ "認証鍵の追加と削除が行えます。認証鍵によりダウンロードしたソフトウェアが完"
#~ "全なものか確認することができます。"
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>追加したい APT line のレポジトリを入力してください。</b></big>\n"
-#~ "\n"
-#~ "APT lineにはタイプ、場所、内容などを含めることができます。例:<i>\"deb "
-#~ "http://ftp.debian.org sarge main\"</i>付属のドキュメントに詳細な記述形式に"
-#~ "ついて書かれています。"
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
#~ msgid "A_uthentication"
#~ msgstr "認証(_U)"
@@ -803,13 +905,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "一時ファイルを自動的に削除する(_T)"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "バイナリ\n"
-#~ "ソース"
-
#~ msgid "Clean interval in days: "
#~ msgstr "削除する間隔(日): "
@@ -847,9 +942,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "リポジトリの追加(_A)"
-#~ msgid "_Custom"
-#~ msgstr "カスタム(_C)"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "アップグレード可能なパッケージを取得する(_D)"
@@ -890,9 +982,6 @@ msgstr ""
#~ msgid "CD"
#~ msgstr "CD"
-#~ msgid "Ubuntu 5.04 Updates"
-#~ msgstr "Ubuntu 5.04 セキュリティアップデート"
-
#~ msgid "Ubuntu 4.10 Security Updates"
#~ msgstr "Ubuntu 4.10 セキュリティアップデート"
diff --git a/po/lt.po b/po/lt.po
index 92a29232..86618917 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ 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"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Raktai</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internetiniai atnaujinimai</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Raktai</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autentikacija"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Pašalinti pasirinktą raktą iš patikimo raktų žiedo."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Diegimo laikmenos"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internetiniai atnaujinimai</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Atkurti numatytuosius"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Atkurti numatytuosius raktus"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Programinės įrangos nustatymai"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-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"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -352,33 +278,33 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Diegiami atnaujinimai..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
@@ -386,7 +312,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
@@ -394,7 +320,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, python-format
msgid "%s package is going to be upgraded."
msgid_plural "%s packages are going to be upgraded."
@@ -402,31 +328,40 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Raktai</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "Į_diegti"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Atnaujinimas baigtas"
@@ -437,8 +372,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -446,6 +380,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -538,80 +473,258 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Parsiunčiami pakeitimai</span>\n"
-"\n"
-"Reikia gauti pakeitimus iš centrinio serverio"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Pakeitimai"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Aprašymas"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Atnaujinti serverio paketų informaciją."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Programinės įrangos atnaujinimai"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Diegiami atnaujinimai..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Atnaujinti"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Raktai</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internetiniai atnaujinimai</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Raktai</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autentikacija"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Pašalinti pasirinktą raktą iš patikimo raktų žiedo."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Diegimo laikmenos"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internetiniai atnaujinimai</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Atkurti numatytuosius"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Atkurti numatytuosius raktus"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Programinės įrangos nustatymai"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+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"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Raktai</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Komentaras:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Skyriai:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tipas:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Įveskite visą Jūsų norimos pridėti saugyklos APT eilutę</b></big>\n"
+"\n"
+"APT eilutė nurodo saugyklos tipą, vietą bei turinį, pvz., <i>„deb http://ftp."
+"debian.org sarge main“</i>. Išsamesnį sintaksės aprašymą galite rasti "
+"dokumentacijoje."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT eilutė:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Dvejetainis\n"
+"Pradinis kodas"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Kita"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Rodyti galimus atnaujimus ir pasirinkti įdiegtinus"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Atnaujinimų tvarkyklė"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -621,35 +734,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 atnaujinimai"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD su Ubuntu 5.10 „Breezy Badger“"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 saugumo atnaujinimai"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 saugumo atnaujinimai"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 atnaujinimai"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 atnaujinimai"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD su Ubuntu 5.10 „Breezy Badger“"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD su Ubuntu 5.04 „Hoary Hedgehog“"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 saugumo atnaujinimai"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 saugumo atnaujinimai"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 atnaujinimai"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -722,6 +836,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Programinės įrangos atnaujinimai"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Parsiunčiami pakeitimai</span>\n"
+#~ "\n"
+#~ "Reikia gauti pakeitimus iš centrinio serverio"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Rodyti galimus atnaujimus ir pasirinkti įdiegtinus"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD su Ubuntu 5.04 „Hoary Hedgehog“"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Šalinant raktą įvyko klaida"
@@ -737,30 +871,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "dieną(as)"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentaras:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponentai</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribucija:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Saugykla</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Skyriai:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Laikinos bylos</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tipas:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Naudotojo sąsaja</b>"
@@ -777,24 +896,6 @@ msgstr ""
#~ "integruotumą."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Įveskite visą Jūsų norimos pridėti saugyklos APT eilutę</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "APT eilutė nurodo saugyklos tipą, vietą bei turinį, pvz., <i>„deb http://"
-#~ "ftp.debian.org sarge main“</i>. Išsamesnį sintaksės aprašymą galite rasti "
-#~ "dokumentacijoje."
-
-#~ msgid "APT line:"
-#~ msgstr "APT eilutė:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -810,13 +911,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Automatiškai išvalyti _laikinas paketų bylas"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Dvejetainis\n"
-#~ "Pradinis kodas"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Išvalymo intervalas dienomis:"
@@ -857,9 +951,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Pridėti saugyklą"
-#~ msgid "_Custom"
-#~ msgstr "_Kita"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Parsiųsti atnaujintus paketus"
diff --git a/po/mk.po b/po/mk.po
index a7199983..e400185c 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: mk\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
"X-Generator: KBabel 1.10\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Копчиња</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Надградби од интернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Копчиња</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Проверка"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Отстрани го избраниот клуч од доверливиот привезок."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Медиум за инсталација"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Надградби од интернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Врати стандардно"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Врати ги стандардните клучеви"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Софтверски преференци"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Проверувај за надградби на секои"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -356,34 +282,34 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Инсталирам надградби..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
"Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова "
"како бубачка."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
@@ -391,7 +317,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
@@ -399,7 +325,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, python-format
msgid "%s package is going to be upgraded."
msgid_plural "%s packages are going to be upgraded."
@@ -407,31 +333,40 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Копчиња</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Инсталирај"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Надградбата е завршена"
@@ -442,8 +377,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -451,6 +385,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -543,80 +478,259 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ги преземам промените</span>\n"
-"\n"
-"Треба да ги преземам промените од централниот сервер."
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Промени"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Опис"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Освежи ги информациите за пакетите на серверот."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Надградба на софтвер"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Инсталирам надградби..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Освежи"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Копчиња</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Надградби од интернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Копчиња</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Проверка"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Отстрани го избраниот клуч од доверливиот привезок."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Медиум за инсталација"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Надградби од интернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Врати стандардно"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Врати ги стандардните клучеви"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Софтверски преференци"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Проверувај за надградби на секои"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Копчиња</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Коментар:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>Дистрибуција:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>Оддели:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Оддели:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Тип:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>Адреса:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</"
+"b></big>\n"
+"\n"
+"APT линијата го содржи типот, локацијата и содржината на складиштето за на "
+"пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата "
+"можете да најдете детален опис на синтаксата."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT линија:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Бинарни\n"
+"Изворен код"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Сопствено"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Покажи достапни надградби и избери кои да бидат инсталирани"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Менаџер за надградба"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -626,35 +740,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Надградби за Убунту 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Безбедносни надградби за Убунту 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Безбедносни надградби за Убунту 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Надградби за Убунту 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Надградби за Убунту 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD диск со Убунту 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Безбедносни надградби за Убунту 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Безбедносни надградби за Убунту 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Надградби за Убунту 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -727,6 +842,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Надградба на софтвер"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Ги преземам промените</span>\n"
+#~ "\n"
+#~ "Треба да ги преземам промените од централниот сервер."
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Покажи достапни надградби и избери кои да бидат инсталирани"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Грешка при отстранување на клучот"
@@ -742,30 +877,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "ден(а)"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Компоненти</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибуција:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Складиште</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Оддели:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Привремени датотеки</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Тип:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Адреса:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Кориснички интерфејс</b>"
@@ -782,24 +902,6 @@ msgstr ""
#~ "што го преземате."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Внесете ја комплетната линија за APT складиштето за да го "
-#~ "додадете</b></big>\n"
-#~ "\n"
-#~ "APT линијата го содржи типот, локацијата и содржината на складиштето за "
-#~ "на пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во "
-#~ "документацијата можете да најдете детален опис на синтаксата."
-
-#~ msgid "APT line:"
-#~ msgstr "APT линија:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -816,13 +918,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Автоматски чисти ги _привремените пакети"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Бинарни\n"
-#~ "Изворен код"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Интервал за чистење во денови:"
@@ -863,9 +958,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Додај складиште"
-#~ msgid "_Custom"
-#~ msgstr "_Сопствено"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Преземи ги надградливите пакети"
diff --git a/po/nb.po b/po/nb.po
index cc0c29bd..75fcd879 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: nb\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,83 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Oppdateringer fra Internett</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Legg til _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installerer oppdateringer..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Oppdateringer fra Internett</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Gjenopprettt forvalgte nøkler"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Gjenopprettt forvalgte nøkler"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Brukervalg for programvare"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Installerer oppdateringer..."
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -356,79 +279,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installerer oppdateringer..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Systemet har ødelagte pakker!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Detaljer</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Installer"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Oppgradering fullført"
@@ -439,8 +371,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -448,6 +379,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -540,80 +472,261 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
-"\n"
-"Må få endringene fra den sentrale tjeneren"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Endringer"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Beskrivelse"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Oppdater pakkeinformasjonen fra tjeneren."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Programvareoppdateringer"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Installerer oppdateringer..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Oppdater"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Oppdateringer fra Internett</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Legg til _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installerer oppdateringer..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Oppdateringer fra Internett</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Gjenopprettt forvalgte nøkler"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Gjenopprettt forvalgte nøkler"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Brukervalg for programvare"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Installerer oppdateringer..."
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentar:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Seksjoner:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </big>\n"
+"\n"
+"APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
+"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
+msgid "APT line:"
+msgstr "APT-linje:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binær\n"
+"Kilde"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Tilpasset"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Oppdateringshåndterer"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -623,35 +736,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -724,6 +838,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Programvareoppdateringer"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
+#~ "\n"
+#~ "Må få endringene fra den sentrale tjeneren"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Feil under fjerning av nøkkel"
@@ -737,30 +871,15 @@ msgstr ""
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>Programvarekilder</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponenter</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusjon:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Arkiv</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seksjoner:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Midlertidige filer</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Brukergrensesnitt</b>"
@@ -777,24 +896,6 @@ msgstr ""
#~ "lastet ned. "
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </"
-#~ "big>\n"
-#~ "\n"
-#~ "APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
-#~ "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
-#~ "detaljert beskrivelse av syntaksen i dokumentasjonen."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -811,13 +912,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Fjern _midlertidige pakkefiler automatisk."
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kilde"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Intervaller for tømming i dager:"
@@ -856,9 +950,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Legg til arkiv"
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Last ned oppgraderbare pakker"
diff --git a/po/ne.po b/po/ne.po
index 85454f05..70cb33e8 100755
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager.HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,84 +18,6 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2;plural=(n!=0)\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>विवरणहरु</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>विवरणहरु</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "सिडि थप्नुहोस"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "प्रमाणिकरण"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस"
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "सफ्टवेयर प्राथमिकताहरु"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -354,78 +276,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>विवरणहरु</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "स्थापना गर्नुहोस"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "स्तरवृद्धि समाप्त"
@@ -436,8 +367,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -445,6 +375,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -537,80 +468,262 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">परिवर्तनहरु डसउनलोड गर्दै</span>\n"
-"\n"
-"केन्द्रिय सर्भर बाट परिवर्तनहरु प्राप्त गर्न आवश्यक छ"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "परिवर्तनहरु"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "बर्णन"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "सफ्टवेयर अद्यावधिकहरु"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "फेरि लोड गर्नुहोस"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>विवरणहरु</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>विवरणहरु</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "सिडि थप्नुहोस"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "प्रमाणिकरण"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस"
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "सफ्टवेयर प्राथमिकताहरु"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "स्तरवृद्धिहरु स्थापना गर्दै"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>विवरणहरु</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>टिप्पणि:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>वितरण:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>सेक्सनहरु:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>सेक्सनहरु:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>प्रकार:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>युआरएल:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n"
+"\n"
+"एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि <i>\"deb "
+"http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा "
+"विस्तृत विवरण पाउन सक्नुहुन्छ"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "एपिटि हरफ:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"बाइनरी\n"
+"स्रोत"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "अनुकुलन गर्नुहोस"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "उपलब्ध अद्यावधिकहरु देखाउनुहोस र कुन स्थापना गर्ने रोज्नुहोस"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "अद्यावधिक व्यवस्थापक"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -620,37 +733,38 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+msgid "Ubuntu 6.04 Updates"
+msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
+msgstr "युबन्टु ५.०४ अद्यावधिकहरु"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -722,6 +836,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "सफ्टवेयर अद्यावधिकहरु"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">परिवर्तनहरु डसउनलोड गर्दै</span>\n"
+#~ "\n"
+#~ "केन्द्रिय सर्भर बाट परिवर्तनहरु प्राप्त गर्न आवश्यक छ"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "उपलब्ध अद्यावधिकहरु देखाउनुहोस र कुन स्थापना गर्ने रोज्नुहोस"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "कुञ्जि हटाउँदा त्रुटि"
@@ -735,30 +869,15 @@ msgstr ""
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>सफ्टवेयर स्रोतहरु</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>टिप्पणि:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>तत्वहरु</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>वितरण:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>कोष</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>सेक्सनहरु:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>अस्थायी फाइलहरु</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>प्रकार:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>युआरएल:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>प्रयोगकर्ता इन्टरफेस</b>"
@@ -774,23 +893,6 @@ msgstr ""
#~ "तपाईंले यो संवाद भित्र प्रमाणीकरण कुञ्जिहरु थप्न र हटाउन सक्नुहुन्छ. तपाईंले डाउनलोड "
#~ "गरेको सफ्टवेयर को विश्वसनियता रुजु जाँच गर्नको लागि एउटा कुञ्जिले संभव पार्दछ"
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n"
-#~ "\n"
-#~ "एपिटि हरफमा कोषको प्रकार, स्थान र सामग्री समाहित हुन्छ, उदाहरण को लागि <i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य "
-#~ "संरचनाको एउटा विस्तृत विवरण पाउन सक्नुहुन्छ"
-
-#~ msgid "APT line:"
-#~ msgstr "एपिटि हरफ:"
-
#, fuzzy
#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
@@ -809,13 +911,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "अस्थायी प्याकेजहरु फाइलहरु स्वत:सफा गर्नुहोस"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "बाइनरी\n"
-#~ "स्रोत"
-
#~ msgid "Clean interval in days: "
#~ msgstr "दिनहरु मा समयान्तर सफा गर्नुहोस"
@@ -854,9 +949,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "कोष थप्नुहोस"
-#~ msgid "_Custom"
-#~ msgstr "अनुकुलन गर्नुहोस"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "स्तरवृद्धि गर्न योग्य प्याकेजहरु डाउनलोड गर्नुहोस"
diff --git a/po/nl.po b/po/nl.po
index 1d2b5c09..2897770e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,73 +16,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Channels</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -336,75 +269,84 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, python-format
msgid "<b>Remove %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, python-format
msgid "Upgrade %s"
msgstr ""
@@ -415,8 +357,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -424,6 +365,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -515,74 +457,238 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
msgid "_Install Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Sections</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr ""
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -591,32 +697,32 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr ""
#. CompDescription
diff --git a/po/no.po b/po/no.po
index cc0c29bd..75fcd879 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: nb\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,83 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Oppdateringer fra Internett</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Legg til _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installerer oppdateringer..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Oppdateringer fra Internett</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Gjenopprettt forvalgte nøkler"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Gjenopprettt forvalgte nøkler"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Brukervalg for programvare"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Installerer oppdateringer..."
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -356,79 +279,88 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Installerer oppdateringer..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Systemet har ødelagte pakker!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Detaljer</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Installer"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Oppgradering fullført"
@@ -439,8 +371,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -448,6 +379,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -540,80 +472,261 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
-"\n"
-"Må få endringene fra den sentrale tjeneren"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Endringer"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Beskrivelse"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Oppdater pakkeinformasjonen fra tjeneren."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Programvareoppdateringer"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Installerer oppdateringer..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Oppdater"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Oppdateringer fra Internett</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Legg til _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installerer oppdateringer..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Oppdateringer fra Internett</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Gjenopprettt forvalgte nøkler"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Gjenopprettt forvalgte nøkler"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Brukervalg for programvare"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Installerer oppdateringer..."
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentar:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Seksjoner:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </big>\n"
+"\n"
+"APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
+"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
+msgid "APT line:"
+msgstr "APT-linje:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binær\n"
+"Kilde"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Tilpasset"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Oppdateringshåndterer"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -623,35 +736,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 Updates"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Security Updates"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD med Ubuntu 5.10 «Breezy Badger»"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Updates"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -724,6 +838,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Programvareoppdateringer"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Laster ned endringer</span>\n"
+#~ "\n"
+#~ "Må få endringene fra den sentrale tjeneren"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Vis tilgjengelige oppdateringer og velg hvilke som skal installeres"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Feil under fjerning av nøkkel"
@@ -737,30 +871,15 @@ msgstr ""
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>Programvarekilder</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponenter</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribusjon:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Arkiv</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Seksjoner:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Midlertidige filer</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Brukergrensesnitt</b>"
@@ -777,24 +896,6 @@ msgstr ""
#~ "lastet ned. "
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Skriv inn hele APT-linjen til arkivet du vil legge til</b> </"
-#~ "big>\n"
-#~ "\n"
-#~ "APT-linjen inneholder typen, adressen og innholdet til et arkiv, for "
-#~ "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en "
-#~ "detaljert beskrivelse av syntaksen i dokumentasjonen."
-
-#~ msgid "APT line:"
-#~ msgstr "APT-linje:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -811,13 +912,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Fjern _midlertidige pakkefiler automatisk."
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binær\n"
-#~ "Kilde"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Intervaller for tømming i dager:"
@@ -856,9 +950,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Legg til arkiv"
-#~ msgid "_Custom"
-#~ msgstr "_Tilpasset"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Last ned oppgraderbare pakker"
diff --git a/po/pa.po b/po/pa.po
index 95e64dab..0c1a2ad0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: pa\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.9.1\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>ਵੇਰਵਾ</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>ਵੇਰਵਾ</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "_CD ਸ਼ਾਮਲ"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -345,76 +271,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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>ਵੇਰਵਾ</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
@@ -425,8 +360,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -434,6 +368,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -527,78 +462,256 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
#, fuzzy
msgid "Show details"
msgstr "<b>ਵੇਰਵਾ</b>"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
#, fuzzy
msgid "Software Updates"
msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "_CD ਸ਼ਾਮਲ"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#, fuzzy
+msgid "<b>Comment:</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+#, fuzzy
+msgid "<b>Sections:</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#, fuzzy
+msgid "<b>URI:</b>"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr ""
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+#, fuzzy
+msgid "Show details of an update"
+msgstr "<b>ਵੇਰਵਾ</b>"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -607,32 +720,32 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr ""
#. CompDescription
@@ -700,3 +813,7 @@ msgstr ""
#: ../channels/Debian.info.in:57
msgid "Non-DFSG-compatible Software"
msgstr ""
+
+#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>"
diff --git a/po/pl.po b/po/pl.po
index 791037ce..e39d8e94 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager cvs\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,82 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Szczegóły</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Aktualizacje internetowe</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Szczegóły</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Dodaj płytę _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_utentykacja"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Usuwa zaznaczony klucz z grupy zaufanych kluczy."
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Instalacja pakietów..."
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Aktualizacje internetowe</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Przywraca domyślne klucze"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Ustawienia oprogramowania"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -349,78 +273,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Instalacja pakietów..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Twój system zawiera uszkodzone pakiety!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Szczegóły</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Instaluj"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Aktualizowanie zakończone"
@@ -431,8 +364,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -440,6 +372,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -533,83 +466,262 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Pobierz zmiany</span>\n"
-"\n"
-"Trzeba pobrać informacje o zmianach z centralnego serwera"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Zmiany"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Opis"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Wczytuje ponownie z serwera informacje o pakietach."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Aktualizacje oprogramowania"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Aktualizowanie zakończone"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Instaluj"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Wczytaj ponownie"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Szczegóły</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Aktualizacje internetowe</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Szczegóły</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Dodaj płytę _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_utentykacja"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Usuwa zaznaczony klucz z grupy zaufanych kluczy."
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Instalacja pakietów..."
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Aktualizacje internetowe</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Przywraca domyślne klucze"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Ustawienia oprogramowania"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Szczegóły</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Komentarz:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sekcje:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Typ:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Wpisz pełny wiersz APT opisujący repozytorium które chcesz dodać</"
+"b></big>\n"
+"\n"
+"Wiersz APT zawiera typ, lokalizację i zawartość repozytorium. Dla przykładu "
+"<i>\"deb http://ftp.debian.org sarge main\"</i>. Szczegółowy opis składni "
+"znajduje się w dokumentacji APT"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Wiersz APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binarne\n"
+"Źródłowe"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Zaawansowane"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
-"Wyświetla dostępne aktualizacje i pozwala wybrać te, które chcemy "
-"zainstalować"
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Menadżer aktualizacji"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -619,37 +731,38 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+msgid "Ubuntu 6.04 Updates"
+msgstr "Uaktualnienia Ubuntu 4.10"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
-msgstr "Uaktualnienia Ubuntu 4.10"
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
+msgstr "Uaktualnienia Ubuntu 4.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -720,6 +833,28 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Aktualizacje oprogramowania"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Pobierz zmiany</span>\n"
+#~ "\n"
+#~ "Trzeba pobrać informacje o zmianach z centralnego serwera"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr ""
+#~ "Wyświetla dostępne aktualizacje i pozwala wybrać te, które chcemy "
+#~ "zainstalować"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Błąd podczas usuwania klucza"
@@ -752,30 +887,15 @@ msgstr ""
#~ "Następujące pakiety posiadają aktualizacje. Można je zainstalować "
#~ "klikając przycisk Instaluj."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Komentarz:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponenty</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Dystrybucja:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repozytorium</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sekcje:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Pliki tymczasowe</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interfejs użytkownika</b>"
@@ -792,24 +912,6 @@ msgstr ""
#~ "Klucz pozwala na sprawdzenie integralności oprogramowania które jest "
#~ "pobierane z sieci."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Wpisz pełny wiersz APT opisujący repozytorium które chcesz dodać</"
-#~ "b></big>\n"
-#~ "\n"
-#~ "Wiersz APT zawiera typ, lokalizację i zawartość repozytorium. Dla "
-#~ "przykładu <i>\"deb http://ftp.debian.org sarge main\"</i>. Szczegółowy "
-#~ "opis składni znajduje się w dokumentacji APT"
-
-#~ msgid "APT line:"
-#~ msgstr "Wiersz APT:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_utentykacja"
@@ -825,13 +927,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Usuwaj _tymczasowe pliki z pakietami"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binarne\n"
-#~ "Źródłowe"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Co tyle dni:"
@@ -870,9 +965,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Dodaj repozytorium"
-#~ msgid "_Custom"
-#~ msgstr "_Zaawansowane"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Pobierz uaktualnione pakiety"
diff --git a/po/pt.po b/po/pt.po
index f35b3b33..b89887dc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-09 17:05+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,300 +14,40 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Channels</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr "Adicionar _CD"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr "Apagar ficheiros descarregados:"
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr "Importar a chave pública de um fornecedor de software confiável"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid "Restore _Defaults"
-msgstr "Restaurar _Definições"
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore the default keys of your distribution"
-msgstr "Restaurar as chaves padrão da sua distribuição"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Software Preferences"
-msgstr "Preferências de Software"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "_Check for updates automatically:"
-msgstr "_Procurar por actualizações automaticamente:"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Download updates in the backgound, but do not install them"
-msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Install new updates without confirmation"
-msgstr "_Instalar novas actualizações sem confirmação"
-
-#: ../data/UpdateManager.glade.h:1
-msgid ""
-"<b><big>You need to manually reload the latest information about updates</"
-"big></b>\n"
-"\n"
-"Your system does not check for updates automatically. You can configure this "
-"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
-msgstr ""
-"<b><big>Tem de reler manualmente a última informação sobre actualizações</"
-"big></b>\n"
-"\n"
-"O seu sistema não procura por actualizações automaticamente. Pode configurar "
-"este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do "
-"Software\"."
-
-#: ../data/UpdateManager.glade.h:4
-msgid ""
-"<big><b>Checking for available updates</b></big>\n"
-"\n"
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
-msgstr ""
-"<big><b>A procurar por actualizações disponíveis</b></big>\n"
-"\n"
-"Actualizações de software podem corrigir erros, eliminar problemas de "
-"segurança, e fornecer novas funcionalidades."
-
-#: ../data/UpdateManager.glade.h:7
-msgid "<big><b>Keep your system up-to-date</b></big>"
-msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>"
-
-#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">A efectuar download de alterações</"
-"span>\n"
-"\n"
-"É necessário obter as alterações de um servidor central"
-
-#: ../data/UpdateManager.glade.h:11
-msgid "Cancel _Download"
-msgstr "Cancelar _Descarregamento"
-
-#: ../data/UpdateManager.glade.h:12
-msgid "Changes"
-msgstr "Alterações"
-
-#: ../data/UpdateManager.glade.h:13
-msgid "Description"
-msgstr "Descrição"
-
-#: ../data/UpdateManager.glade.h:14
-msgid "Release Notes"
-msgstr "Notas de lançamento"
-
-#: ../data/UpdateManager.glade.h:15
-msgid "Reload the latest information about updates"
-msgstr "Reler a última informação sobre actualizações"
-
-#: ../data/UpdateManager.glade.h:16
-msgid "Show details"
-msgstr "Mostrar detalhes"
-
-#: ../data/UpdateManager.glade.h:17
-msgid "Show progress of single files"
-msgstr "Mostrar progresso de ficheiros individuais"
-
-#: ../data/UpdateManager.glade.h:18
-msgid "Software Updates"
-msgstr "Actualizações de Software"
-
-#: ../data/UpdateManager.glade.h:19
-msgid ""
-"Software updates can correct errors, eliminate security vulnerabilities, and "
-"provide new features to you."
-msgstr ""
-"Actualizações de software podem corrigir erros, eliminar problemas de "
-"segurança, e fornecer novas funcionalidades."
-
-#: ../data/UpdateManager.glade.h:20
-msgid "U_pgrade"
-msgstr "A_ctualização"
-
-#: ../data/UpdateManager.glade.h:21
-msgid "Upgrade to the latest version of Ubuntu"
-msgstr "Actualize para a última versão do Ubuntu"
-
-#: ../data/UpdateManager.glade.h:22
-msgid "_Install Updates"
-msgstr "_Instalar Actualizações"
-
-#: ../data/UpdateManager.glade.h:23
-msgid "_Reload"
-msgstr "Reler"
-
-#. ChangelogURI
-#: ../channels/Ubuntu.info.in.h:4
-#, no-c-format
-msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
-msgstr "Ubuntu 6.04 \"Dapper Drake\""
-
-#. Description
-#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
-
-#. Description
-#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 Actualizações de Segurança"
-
-#. Description
-#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 Actualizações"
-
-#. Description
-#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
-
-#. Description
-#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Actualizações de Segurança"
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
-msgid "Oficially supported"
-msgstr "Suportado Oficialmente"
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:97
-msgid "Restricted copyright"
-msgstr "Direitos de autor restritos"
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:100
-msgid "Community maintained (Universe)"
-msgstr "Mantido pela comunidade (Universe)"
-
-#. CompDescription
-#: ../channels/Ubuntu.info.in:103
-msgid "Non-free (Multiverse)"
-msgstr "Não-livre (Multiverse)"
-
-#. ChangelogURI
-#: ../channels/Debian.info.in.h:4
-#, no-c-format
-msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
-msgstr ""
-
-#. Description
-#: ../channels/Debian.info.in:6
-msgid "Debian 3.1 \"Sarge\""
-msgstr "Debian 3.1 \"Sarge\""
-
-#. BaseURI
-#: ../channels/Debian.info.in:19
-msgid "http://security.debian.org/"
-msgstr "http://security.debian.org/"
-
-#. Description
-#: ../channels/Debian.info.in:20
-msgid "Debian 3.1 \"Sarge\" Security Updates"
-msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança"
-
-#. Description
-#: ../channels/Debian.info.in:34
-msgid "Debian \"Etch\" (testing)"
-msgstr "Debian \"Etch\" (testing)"
-
-#. BaseURI
-#: ../channels/Debian.info.in:47
-msgid "http://http.us.debian.org/debian/"
-msgstr "http://http.us.debian.org/debian/"
-
-#. Description
-#: ../channels/Debian.info.in:48
-msgid "Debian \"Sid\" (unstable)"
-msgstr "Debian \"Sid\" (unstable)"
-
-#. CompDescription
-#: ../channels/Debian.info.in:54
-msgid "DFSG-compatible Software with Non-Free Dependencies"
-msgstr "Software compatível-DFSG com Dependências Não-Livres"
-
-#. CompDescription
-#: ../channels/Debian.info.in:57
-msgid "Non-DFSG-compatible Software"
-msgstr "Software compatível-DFSG"
-
-#: ../SoftwareProperties/SoftwareProperties.py:102
+#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
msgstr "Todos os % dias"
-#: ../SoftwareProperties/SoftwareProperties.py:132
+#: ../SoftwareProperties/SoftwareProperties.py:131
#, python-format
msgid "After %s days"
msgstr "Depois de %s dias"
-#: ../SoftwareProperties/SoftwareProperties.py:330
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "Import key"
msgstr "Importar chave"
-#: ../SoftwareProperties/SoftwareProperties.py:340
+#: ../SoftwareProperties/SoftwareProperties.py:364
msgid "Error importing selected file"
msgstr "Erro ao importar ficheiro seleccionado"
-#: ../SoftwareProperties/SoftwareProperties.py:341
+#: ../SoftwareProperties/SoftwareProperties.py:365
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
"O ficheiro seleccionado pode não ser um ficheiro de chave GPG ou pode estar "
"corrompido."
-#: ../SoftwareProperties/SoftwareProperties.py:353
+#: ../SoftwareProperties/SoftwareProperties.py:377
msgid "Error removing the key"
msgstr "Erro ao remover a chave"
-#: ../SoftwareProperties/SoftwareProperties.py:354
+#: ../SoftwareProperties/SoftwareProperties.py:378
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
"A chave que seleccionou não pôde ser removida. Por favor reporte este erro."
-#: ../SoftwareProperties/SoftwareProperties.py:397
+#: ../SoftwareProperties/SoftwareProperties.py:421
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -318,11 +58,11 @@ msgstr ""
"\n"
"%s"
-#: ../SoftwareProperties/SoftwareProperties.py:447
+#: ../SoftwareProperties/SoftwareProperties.py:471
msgid "Please enter a name for the disc"
msgstr "Por favor introduza um nome para o disco"
-#: ../SoftwareProperties/SoftwareProperties.py:463
+#: ../SoftwareProperties/SoftwareProperties.py:487
msgid "Please insert a disc in the drive:"
msgstr "Por favor introduza um disco no leitor:"
@@ -448,56 +188,60 @@ msgstr ""
"tipo de problema na rede, por favor verifique a sua ligação à rede e volte a "
"tentar."
-#: ../DistUpgrade/DistUpgradeControler.py:190
-msgid "Not enough free space"
+#: ../DistUpgrade/DistUpgradeControler.py:191
+#, fuzzy
+msgid "Not enough free disk space"
msgstr "Não existe espaço livre suficiente"
-#: ../DistUpgrade/DistUpgradeControler.py:191
+#: ../DistUpgrade/DistUpgradeControler.py:192
+#, python-format
msgid ""
-"There is not enough free space on your system to download the required "
-"pacakges. Please free some space before trying again with e.g. 'sudo apt-get "
-"clean'"
+"The upgrade aborts now. Please free at least %s of disk space. Empty your "
+"trash and remove temporary packages of former installations using 'sudo apt-"
+"get clean'."
msgstr ""
-"Não existe espaço suficiente no seu sistema para descarregar os pacotes "
-"necessários. Por favor liberte algum espaço antes de tentar novamente por "
-"exemplo usando 'sudo apt-get clean'"
-#: ../DistUpgrade/DistUpgradeControler.py:196
-msgid "Perform Upgrade?"
-msgstr "Efectuar Actualização?"
+#: ../DistUpgrade/DistUpgradeControler.py:198
+#, fuzzy
+msgid "Do you want to start the upgrade?"
+msgstr "Impossível de calcular a actualização"
#. installing the packages failed, can't be retried
-#: ../DistUpgrade/DistUpgradeControler.py:211
-#: ../DistUpgrade/DistUpgradeControler.py:280
-msgid "Error during commit"
-msgstr ""
+#: ../DistUpgrade/DistUpgradeControler.py:214
+#, fuzzy
+msgid "Could not install the upgrades"
+msgstr "Impossível de calcular a actualização"
-#: ../DistUpgrade/DistUpgradeControler.py:212
+#: ../DistUpgrade/DistUpgradeControler.py:215
+#, fuzzy
msgid ""
-"Some problem occured during the upgrade. Most likely packages failed to "
-"install. Try 'sudo apt-get install -f' or synaptic to fix your system."
+"The upgrade aborts now. Your system can be in an unusable state. Please try "
+"'sudo apt-get install -f' or Synaptic to fix your system."
msgstr ""
"Ocorreu algum problema durante a actualização. Provavelmente a instalação de "
"alguns pacotes falhou. Tente 'sudo apt-get install -f' ou use o synaptic "
"para corrigir o seu sistema."
-#: ../DistUpgrade/DistUpgradeControler.py:228
-msgid "Error fetching the packages"
-msgstr "Erro ao descarregar os pacotes"
+#: ../DistUpgrade/DistUpgradeControler.py:230
+#, fuzzy
+msgid "Could not download the upgrades"
+msgstr "Impossível de calcular a actualização"
-#: ../DistUpgrade/DistUpgradeControler.py:229
+#: ../DistUpgrade/DistUpgradeControler.py:231
msgid ""
-"Some problem occured during the fetching of the packages. This is most "
-"likely a network problem. Please check your network and try again. "
+"The upgrade aborts now. Please check your internet connection or "
+"installation media and try again. "
msgstr ""
-"Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de um "
-"problema de rede. Por favor verifique a rede e tente novamente. "
-#: ../DistUpgrade/DistUpgradeControler.py:273
+#: ../DistUpgrade/DistUpgradeControler.py:274
msgid "Remove obsolete Packages?"
msgstr "Remover Pacotes obsoletos?"
#: ../DistUpgrade/DistUpgradeControler.py:281
+msgid "Error during commit"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeControler.py:282
msgid ""
"Some problem occured during the clean-up. Please see the below message for "
"more information. "
@@ -507,137 +251,156 @@ msgstr ""
#. sanity check (check for ubuntu-desktop, brokenCache etc)
#. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeControler.py:295
-#: ../DistUpgrade/DistUpgradeControler.py:318
+#: ../DistUpgrade/DistUpgradeControler.py:296
+#: ../DistUpgrade/DistUpgradeControler.py:319
msgid "Checking package manager"
msgstr "A verificar gestor de pacotes"
-#: ../DistUpgrade/DistUpgradeControler.py:310
+#: ../DistUpgrade/DistUpgradeControler.py:311
msgid "Updating repository information"
msgstr "A Actualizar informação de repositórios"
-#: ../DistUpgrade/DistUpgradeControler.py:324
+#: ../DistUpgrade/DistUpgradeControler.py:325
msgid "Asking for confirmation"
msgstr "A pedir confirmação"
-#: ../DistUpgrade/DistUpgradeControler.py:328
+#: ../DistUpgrade/DistUpgradeControler.py:329
msgid "Upgrading"
msgstr "A actualizar"
-#: ../DistUpgrade/DistUpgradeControler.py:335
+#: ../DistUpgrade/DistUpgradeControler.py:336
msgid "Searching for obsolete software"
msgstr "À procura de software obsoleto"
-#: ../DistUpgrade/DistUpgradeControler.py:340
+#: ../DistUpgrade/DistUpgradeControler.py:341
msgid "System upgrade is complete."
msgstr "A actualização do sistema está completa."
#. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:76
+#: ../DistUpgrade/DistUpgradeViewGtk.py:77
#, python-format
msgid "Please insert '%s' into the drive '%s'"
msgstr "Por favor insira '%s' no leitor '%s'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:94
+#: ../DistUpgrade/DistUpgradeViewGtk.py:95
msgid "Download is complete"
msgstr "O Download está completo"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:105
-#, python-format
-msgid "Downloading file %li of %li with %s/s"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:106
+#, 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:106
+#: ../DistUpgrade/DistUpgradeViewGtk.py:107
#, python-format
msgid "%s remaining"
msgstr "%s restantes"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:108
-#, python-format
-msgid "Downloading file %li of %li with unknown speed"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#, 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"
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:131
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr "A instalar actualizações"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:144
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr "Não foi possível instalar '%s'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:145
-msgid "The upgrade will abort. Please report the bug."
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
+#, fuzzy
+msgid "The upgrade aborts now. Please report this bug."
msgstr "A actualização abortará. Reporte este erro."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:216
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr "Ocorreu um erro fatal"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:217
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
+#, fuzzy
msgid ""
-"During the operation a fatal error occured. Please report this as a bug and "
-"include the files ~/dist-upgrade.log and ~/dist-upgrade-apt.log in your "
-"report. The upgrade will abort now. "
+"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 ""
"Durante a operação ocorreu um erro fatal. Por favor reporte este erro e "
"inclua os ficheiros ~/dist-upgrade.log e ~/dist-upgrade-apt.log no seu "
"relatório. A actualização abortará agora. "
-#: ../DistUpgrade/DistUpgradeViewGtk.py:293
-#, python-format
-msgid ""
-"%s packages are going to be removed.\n"
-"%s packages are going to be newly installed.\n"
-"%s packages are going to be upgraded.\n"
-"\n"
-"%s needs to be fetched"
-msgstr ""
-"%s pacotes serão removidos.\n"
-"%s pacotes novos serão instalados.\n"
-"%s pacotes serão actualizados.\n"
-"\n"
-"%s precisam de ser descarregados"
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
+#, 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:304
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
-msgid "<b>To be removed: %s</b>"
-msgstr "<b>A ser removido: %s</b>"
+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:306
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, python-format
-msgid "To be installed: %s"
-msgstr "A ser instalado: %s"
+msgid "%s package is going to be upgraded."
+msgid_plural "%s packages are going to be upgraded."
+msgstr[0] ""
+msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
#, python-format
-msgid "To be upgraded: %s"
-msgstr "A ser actualizado: %s"
-
-#. print "on_window_main_delete_event()"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
-msgid "Are you sure you want cancel?"
-msgstr "Tem a certeza que pretende cancelar?"
+msgid "You have to download a total of %s."
+msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:340
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
msgid ""
-"Canceling during a upgrade can leave the system in a unstable state. It is "
-"strongly adviced to continue the operation. "
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
msgstr ""
-"Cancelar durante uma actualização pode deixar o seu sistema num estado "
-"instável. É fortemente aconselhado a prosseguir a operação. "
+
+#. FIXME: this should go into DistUpgradeController
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#, fuzzy
+msgid "Could not find any upgrades"
+msgstr "Impossível de calcular a actualização"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
+#, fuzzy
+msgid "Your system has already been upgraded."
+msgstr "O seu sistema tem pacotes quebrados!"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
+#, fuzzy, python-format
+msgid "<b>Remove %s</b>"
+msgstr "<b>A ser removido: %s</b>"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
+#, fuzzy, python-format
+msgid "Install %s"
+msgstr "_Instalar Actualizações"
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
+#, fuzzy, python-format
+msgid "Upgrade %s"
+msgstr "A_ctualização"
#: ../DistUpgrade/DistUpgradeView.py:67
msgid "Reboot required"
msgstr "Necessário reiniciar"
#: ../DistUpgrade/DistUpgradeView.py:68
+#, fuzzy
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
"A actualização terminou agora. É necessário reiniciar, deseja efectuá-lo "
"agora?"
@@ -647,18 +410,27 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
#: ../DistUpgrade/DistUpgrade.glade.h:2
+msgid ""
+"<b><big>Cancel the running upgrade?</big></b>\n"
+"\n"
+"The system could be in an unusable state if you cancel the upgrade. You are "
+"strongly adviced to resume the upgrade."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:5
msgid "<b><big>Restart the system to complete the upgrade</big></b>"
msgstr "<b><big>Reinicie o sistema para completar a actualização</big></b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:3
+#: ../DistUpgrade/DistUpgrade.glade.h:6
msgid "<b><big>Start the upgrade?</big></b>"
msgstr "<b><big>Iniciar a actualização?</big></b>"
-#: ../DistUpgrade/DistUpgrade.glade.h:4
+#: ../DistUpgrade/DistUpgrade.glade.h:7
msgid ""
"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" 6.04</"
"span>"
@@ -666,54 +438,495 @@ msgstr ""
"<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu \"Dapper\" "
"6.04</span>"
-#: ../DistUpgrade/DistUpgrade.glade.h:5
+#: ../DistUpgrade/DistUpgrade.glade.h:8
msgid "Cleaning up"
msgstr "A efectuar limpeza"
-#: ../DistUpgrade/DistUpgrade.glade.h:6
+#: ../DistUpgrade/DistUpgrade.glade.h:9
msgid "Details"
msgstr "Detalhes"
-#: ../DistUpgrade/DistUpgrade.glade.h:7
+#: ../DistUpgrade/DistUpgrade.glade.h:10
msgid "Downloading and installing the upgrades"
msgstr "A efectuar o download e a instalar actualizações"
-#: ../DistUpgrade/DistUpgrade.glade.h:8
-msgid "Modifing the software channels"
+#: ../DistUpgrade/DistUpgrade.glade.h:11
+msgid "Modifying the software channels"
msgstr ""
-#: ../DistUpgrade/DistUpgrade.glade.h:9
+#: ../DistUpgrade/DistUpgrade.glade.h:12
msgid "Preparing the upgrade"
msgstr "A preparar actualização"
-#: ../DistUpgrade/DistUpgrade.glade.h:10
+#: ../DistUpgrade/DistUpgrade.glade.h:13
+msgid "Restarting the system"
+msgstr ""
+
+#: ../DistUpgrade/DistUpgrade.glade.h:14
msgid "Terminal"
msgstr "Terminal"
-#: ../DistUpgrade/DistUpgrade.glade.h:11
+#: ../DistUpgrade/DistUpgrade.glade.h:15
msgid "Upgrading Ubuntu"
msgstr "A actualizar o Ubuntu"
-#: ../DistUpgrade/DistUpgrade.glade.h:12
+#: ../DistUpgrade/DistUpgrade.glade.h:16
msgid "_Report Bug"
msgstr "_Reportar um erro"
-#: ../DistUpgrade/DistUpgrade.glade.h:13
+#: ../DistUpgrade/DistUpgrade.glade.h:17
msgid "_Restart Now"
msgstr "_Reiniciar agora"
+#: ../DistUpgrade/DistUpgrade.glade.h:18
+#, fuzzy
+msgid "_Resume Upgrade"
+msgstr "Efectuar Actualização?"
+
+#: ../data/UpdateManager.glade.h:1
+msgid ""
+"<b><big>You need to manually reload the latest information about updates</"
+"big></b>\n"
+"\n"
+"Your system does not check for updates automatically. You can configure this "
+"behavior in \"System\" -> \"Administration\" -> \"Software Properties\"."
+msgstr ""
+"<b><big>Tem de reler manualmente a última informação sobre actualizações</"
+"big></b>\n"
+"\n"
+"O seu sistema não procura por actualizações automaticamente. Pode configurar "
+"este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do "
+"Software\"."
+
+#: ../data/UpdateManager.glade.h:4
+msgid ""
+"<big><b>Checking for available updates</b></big>\n"
+"\n"
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+"<big><b>A procurar por actualizações disponíveis</b></big>\n"
+"\n"
+"Actualizações de software podem corrigir erros, eliminar problemas de "
+"segurança, e fornecer novas funcionalidades."
+
+#: ../data/UpdateManager.glade.h:7
+msgid "<big><b>Keep your system up-to-date</b></big>"
+msgstr "<big><b>Mantenha o seu sistema actualizado</b></big>"
+
+#: ../data/UpdateManager.glade.h:8
+msgid "Cancel _Download"
+msgstr "Cancelar _Descarregamento"
+
+#: ../data/UpdateManager.glade.h:9
+msgid "Changes"
+msgstr "Alterações"
+
+#: ../data/UpdateManager.glade.h:10
+msgid "Description"
+msgstr "Descrição"
+
+#: ../data/UpdateManager.glade.h:11
+msgid "Release Notes"
+msgstr "Notas de lançamento"
+
+#: ../data/UpdateManager.glade.h:12
+msgid "Reload the latest information about updates"
+msgstr "Reler a última informação sobre actualizações"
+
+#: ../data/UpdateManager.glade.h:13
+msgid "Show details"
+msgstr "Mostrar detalhes"
+
+#: ../data/UpdateManager.glade.h:14
+msgid "Show progress of single files"
+msgstr "Mostrar progresso de ficheiros individuais"
+
+#: ../data/UpdateManager.glade.h:15
+msgid "Software Updates"
+msgstr "Actualizações de Software"
+
+#: ../data/UpdateManager.glade.h:16
+msgid ""
+"Software updates can correct errors, eliminate security vulnerabilities, and "
+"provide new features to you."
+msgstr ""
+"Actualizações de software podem corrigir erros, eliminar problemas de "
+"segurança, e fornecer novas funcionalidades."
+
+#: ../data/UpdateManager.glade.h:17
+msgid "U_pgrade"
+msgstr "A_ctualização"
+
+#: ../data/UpdateManager.glade.h:18
+msgid "Upgrade to the latest version of Ubuntu"
+msgstr "Actualize para a última versão do Ubuntu"
+
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
+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 ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr "Adicionar _CD"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr "Apagar ficheiros descarregados:"
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr "Importar a chave pública de um fornecedor de software confiável"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr "Restaurar _Definições"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr "Restaurar as chaves padrão da sua distribuição"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferências de Software"
+
+#: ../data/SoftwareProperties.glade.h:14
+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"
+msgstr "_Descarregar actualizações silenciosamente, sem as instalar"
+
+#: ../data/SoftwareProperties.glade.h:16
#, fuzzy
-#~ msgid "<b>Sources</b>"
-#~ msgstr "<b>Fontes de Software</b>"
+msgid "_Install security updates without confirmation"
+msgstr "_Instalar novas actualizações sem confirmação"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Componentes</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#, fuzzy
+msgid "<b>Comment:</b>"
+msgstr "<b>Componentes</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Fontes de Software</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Linha do APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
+#: ../data/update-manager.desktop.in.h:1
+#, fuzzy
+msgid "Show and install available updates"
+msgstr "A efectuar o download e a instalar actualizações"
+
+#: ../data/update-manager.desktop.in.h:2
+msgid "Update Manager"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+#, fuzzy
+msgid "Show details of an update"
+msgstr "Mostrar detalhes"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
+#. ChangelogURI
+#: ../channels/Ubuntu.info.in.h:4
+#, no-c-format
+msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../channels/Ubuntu.info.in:6
+#, fuzzy
+msgid "Ubuntu 6.04 'Dapper Drake'"
+msgstr "Ubuntu 6.04 \"Dapper Drake\""
+
+#. Description
+#: ../channels/Ubuntu.info.in:23
+#, fuzzy
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 Actualizações de Segurança"
+
+#. Description
+#: ../channels/Ubuntu.info.in:40
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 Actualizações"
+
+#. Description
+#: ../channels/Ubuntu.info.in:57
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
+
+#. Description
+#: ../channels/Ubuntu.info.in:74
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 Actualizações de Segurança"
+
+#. Description
+#: ../channels/Ubuntu.info.in:91
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 Actualizações"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
+msgid "Oficially supported"
+msgstr "Suportado Oficialmente"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:97
+msgid "Restricted copyright"
+msgstr "Direitos de autor restritos"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:100
+msgid "Community maintained (Universe)"
+msgstr "Mantido pela comunidade (Universe)"
+
+#. CompDescription
+#: ../channels/Ubuntu.info.in:103
+msgid "Non-free (Multiverse)"
+msgstr "Não-livre (Multiverse)"
+
+#. ChangelogURI
+#: ../channels/Debian.info.in.h:4
+#, no-c-format
+msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog"
+msgstr ""
+
+#. Description
+#: ../channels/Debian.info.in:6
+msgid "Debian 3.1 \"Sarge\""
+msgstr "Debian 3.1 \"Sarge\""
-#~ msgid "<b>Components</b>"
-#~ msgstr "<b>Componentes</b>"
+#. BaseURI
+#: ../channels/Debian.info.in:19
+msgid "http://security.debian.org/"
+msgstr "http://security.debian.org/"
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
+#. Description
+#: ../channels/Debian.info.in:20
+msgid "Debian 3.1 \"Sarge\" Security Updates"
+msgstr "Debian 3.1 \"Sarge\" Actualizações de Segurança"
-#~ msgid "APT line:"
-#~ msgstr "Linha do APT:"
+#. Description
+#: ../channels/Debian.info.in:34
+msgid "Debian \"Etch\" (testing)"
+msgstr "Debian \"Etch\" (testing)"
+
+#. BaseURI
+#: ../channels/Debian.info.in:47
+msgid "http://http.us.debian.org/debian/"
+msgstr "http://http.us.debian.org/debian/"
+
+#. Description
+#: ../channels/Debian.info.in:48
+msgid "Debian \"Sid\" (unstable)"
+msgstr "Debian \"Sid\" (unstable)"
+
+#. CompDescription
+#: ../channels/Debian.info.in:54
+msgid "DFSG-compatible Software with Non-Free Dependencies"
+msgstr "Software compatível-DFSG com Dependências Não-Livres"
+
+#. CompDescription
+#: ../channels/Debian.info.in:57
+msgid "Non-DFSG-compatible Software"
+msgstr "Software compatível-DFSG"
+
+#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Actualizações de Software"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">A efectuar download de alterações</"
+#~ "span>\n"
+#~ "\n"
+#~ "É necessário obter as alterações de um servidor central"
+
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#~ msgid ""
+#~ "There is not enough free space on your system to download the required "
+#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
+#~ "get clean'"
+#~ msgstr ""
+#~ "Não existe espaço suficiente no seu sistema para descarregar os pacotes "
+#~ "necessários. Por favor liberte algum espaço antes de tentar novamente por "
+#~ "exemplo usando 'sudo apt-get clean'"
+
+#~ msgid "Error fetching the packages"
+#~ msgstr "Erro ao descarregar os pacotes"
+
+#~ msgid ""
+#~ "Some problem occured during the fetching of the packages. This is most "
+#~ "likely a network problem. Please check your network and try again. "
+#~ msgstr ""
+#~ "Ocorreu algum problema ao descarregar pacotes. Trata-se provavelmente de "
+#~ "um problema de rede. Por favor verifique a rede e tente novamente. "
+
+#~ msgid ""
+#~ "%s packages are going to be removed.\n"
+#~ "%s packages are going to be newly installed.\n"
+#~ "%s packages are going to be upgraded.\n"
+#~ "\n"
+#~ "%s needs to be fetched"
+#~ msgstr ""
+#~ "%s pacotes serão removidos.\n"
+#~ "%s pacotes novos serão instalados.\n"
+#~ "%s pacotes serão actualizados.\n"
+#~ "\n"
+#~ "%s precisam de ser descarregados"
+
+#~ msgid "To be installed: %s"
+#~ msgstr "A ser instalado: %s"
+
+#~ msgid "To be upgraded: %s"
+#~ msgstr "A ser actualizado: %s"
+
+#~ msgid "Are you sure you want cancel?"
+#~ msgstr "Tem a certeza que pretende cancelar?"
+
+#~ msgid ""
+#~ "Canceling during a upgrade can leave the system in a unstable state. It "
+#~ "is strongly adviced to continue the operation. "
+#~ msgstr ""
+#~ "Cancelar durante uma actualização pode deixar o seu sistema num estado "
+#~ "instável. É fortemente aconselhado a prosseguir a operação. "
#~ msgid "Clean interval in days: "
#~ msgstr "Intervalo de limpeza em dias: "
@@ -721,9 +934,6 @@ msgstr "_Reiniciar agora"
#~ msgid "Delete _old packages in the package cache"
#~ msgstr "Excluir pacotes _antigos da cache de pacotes"
-#~ msgid "Your system has broken packages!"
-#~ msgstr "O seu sistema tem pacotes quebrados!"
-
#~ msgid "Your system is up-to-date!"
#~ msgstr "O seu sistema está actualizado!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4113629c..626f53e4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,74 +15,6 @@ msgstr ""
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: BRAZIL\n"
-#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Channels</b>"
-msgstr "<b>Canais</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr "<b>Atualizações via Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Chaves</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr "Adicionar _Cdrom"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr "Apagar arquivos d_e programas obtidos:"
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr "Importar a chave pública de um fornecedor de programas confiável"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Mídia de Instalação"
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr "Atualizações via Internet"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr "Restaurar Pa_drões"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr "Restaurar as chaves padrão da sua distribuição"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Preferências de Programas"
-
-#: ../data/SoftwareProperties.glade.h:14
-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"
-msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
-
-#: ../data/SoftwareProperties.glade.h:16
-#, fuzzy
-msgid "_Install security updates without confirmation"
-msgstr "_Instalar novas atualizações sem confirmação"
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -375,25 +307,25 @@ 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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr "Instalando Atualizações"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr "Não foi possível instalar '%s'"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "A atualização irá abortar. Por favor reporte o erro."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr "Ocorreu um erro fatal"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
#, fuzzy
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
@@ -403,54 +335,63 @@ 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:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, 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:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
#, fuzzy
msgid "Could not find any upgrades"
msgstr "Não foi possível calcular a atualização"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Your system has broken packages!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>A serem removidos: %s </b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Instalar Atualizações"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "At_ualizar"
@@ -460,9 +401,9 @@ msgid "Reboot required"
msgstr "Reinicialização requerida"
#: ../DistUpgrade/DistUpgradeView.py:68
+#, fuzzy
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
"A atualização está terminada. É necessário reiniciar o computador, você "
"deseja fazer isso agora?"
@@ -472,6 +413,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr " "
@@ -577,48 +519,38 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr "<big><b>Manter o Sistema Atualizado</b></big>"
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Obtendo Mudanças</span>\n"
-"\n"
-"É necessário obter as mudanças do servidor central"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr "Cancelar _Download"
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Mudanças"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Descrição"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr "Notas de Versão"
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr "Recarregar as últimas informações sobre atualizações"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr "Exibir Detalhes"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr "Exibir progresso de arquivos únicos"
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Atualizações de Programas"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
@@ -626,30 +558,216 @@ msgstr ""
"Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de "
"segurança, e prover novas funcionalidades para você."
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr "At_ualizar"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr "Atualizar para a última versão do Ubuntu"
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
msgid "_Install Updates"
msgstr "_Instalar Atualizações"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr "_Recarregar"
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr "<b>Canais</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr "<b>Atualizações via Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Chaves</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr "Adicionar _Cdrom"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autenticação"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr "Apagar arquivos d_e programas obtidos:"
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr "Importar a chave pública de um fornecedor de programas confiável"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Mídia de Instalação"
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "Atualizações via Internet"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr "Restaurar Pa_drões"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr "Restaurar as chaves padrão da sua distribuição"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferências de Programas"
+
+#: ../data/SoftwareProperties.glade.h:14
+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"
+msgstr "_Obter atualizações em segundo plano, mas não instalá-las"
+
+#: ../data/SoftwareProperties.glade.h:16
+#, fuzzy
+msgid "_Install security updates without confirmation"
+msgstr "_Instalar novas atualizações sem confirmação"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Canais</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comment:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Sections:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Type:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Enter the complete APT line of the repository that you want to add</"
+"b></big>\n"
+"\n"
+"The APT line contains the type, location and content of a repository, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
+"detailed description of the syntax in the documentation."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT line:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binary\n"
+"Source"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "_Custom"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Exibir atualizações disponíveis e escolher quais instalar"
+#, fuzzy
+msgid "Show and install available updates"
+msgstr "Obtendo e instalando as atualizações"
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Gerenciador de Atualizações"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+#, fuzzy
+msgid "Show details of an update"
+msgstr "Exibir Detalhes"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -658,33 +776,37 @@ msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog"
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+#, fuzzy
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 6.04 \"Dapper Drake\""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Ubuntu 5.10 \"Breezy Badger\""
+#, fuzzy
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 Security Updates"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Atualizações de Segurança do Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Atualizações do Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Atualizações do Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Atualizações de Segurança do Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Atualizações do Ubuntu 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -752,6 +874,35 @@ 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"
+#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Modificando os canais de programas"
+
+#, fuzzy
+#~ msgid "Add the following software channel?"
+#~ msgid_plural "Add the following software channels?"
+#~ msgstr[0] "Modificando os canais de programas"
+#~ msgstr[1] "Modificando os canais de programas"
+
+#, fuzzy
+#~ msgid "Could not add any software channels"
+#~ msgstr "Modificando os canais de programas"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Obtendo Mudanças</span>\n"
+#~ "\n"
+#~ "É necessário obter as mudanças do servidor central"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Exibir atualizações disponíveis e escolher quais instalar"
+
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\""
+
#~ msgid ""
#~ "There is not enough free space on your system to download the required "
#~ "pacakges. Please free some space before trying again with e.g. 'sudo apt-"
@@ -830,30 +981,15 @@ 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>Comment:</b>"
-#~ msgstr "<b>Comment:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Components</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Repository</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Sections:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Temporary files</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Type:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>User Interface</b>"
@@ -869,24 +1005,6 @@ msgstr "Programas não compatíveis com a DFSG"
#~ "You can add and remove authentication keys in this dialogue. A key makes "
#~ "it possible to check verify the integrity of the software you download."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-
-#~ msgid "APT line:"
-#~ msgstr "APT line:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_uthentication"
@@ -901,13 +1019,6 @@ msgstr "Programas não compatíveis com a DFSG"
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Automatically clean _temporary packages files"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binary\n"
-#~ "Source"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Clean interval in days: "
@@ -946,9 +1057,6 @@ msgstr "Programas não compatíveis com a DFSG"
#~ msgid "_Add Repository"
#~ msgstr "_Add Repository"
-#~ msgid "_Custom"
-#~ msgstr "_Custom"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Download upgradable packages"
diff --git a/po/ro.po b/po/ro.po
index be0406f4..a8182303 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Detalii</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Actualizări de pe Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detalii</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "A_utentificare"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Elimină cheia selectată din keyring-ul de încredere."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Actualizări de pe Internet</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Restaurează cheile implicite."
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Preferinţe software"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -345,76 +271,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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Sistemul dvs. este la zi!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Detalii</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Instalează"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Actualizare completă"
@@ -425,8 +360,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -434,6 +368,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr " "
@@ -527,74 +462,225 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Descarc modificările</span>\n"
-"\n"
-"Trebuiesc obţinute schimbările de pe serverul central"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Modificări"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Descriere"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Reîncarcă informaţiile despre pachete de pe server."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Actualizări software"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Actualizare completă"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "_Instalează"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Detalii</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Actualizări de pe Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Detalii</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "A_utentificare"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Elimină cheia selectată din keyring-ul de încredere."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Actualizări de pe Internet</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Restaurează cheile implicite."
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Preferinţe software"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+#, fuzzy
+msgid " "
+msgstr " "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Detalii</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Comentariu:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Secţiuni:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Tip:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o "
+"adăugaţi</b></big>\n"
+"\n"
+"Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu<i>"
+"\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere "
+"detaliată a sintaxei în documentaţie."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Linie APT:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binar\n"
+"Sursă"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
@@ -602,6 +688,35 @@ msgstr ""
msgid "Update Manager"
msgstr "Actualizări Ubuntu 4.10"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -611,36 +726,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
msgstr "Actualizări de securitate Ubuntu 5.04"
#. CompDescription
@@ -712,6 +828,23 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Actualizări software"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Descarc modificările</span>\n"
+#~ "\n"
+#~ "Trebuiesc obţinute schimbările de pe serverul central"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Actualizări de securitate Ubuntu 5.04"
+
+#, fuzzy
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>Surse software</b>"
@@ -738,30 +871,15 @@ msgstr ""
#~ "Pachetele următoare pot fi actualizate. Puteţi instala actualizările "
#~ "apăsând pe butonul Instalează."
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Comentariu:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Componente</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribuţie:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Locaţie</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Secţiuni:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Fişiere temporare</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Tip:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Interfaţă utilizator</b>"
@@ -778,24 +896,6 @@ msgstr ""
#~ "unei chei estede a permite verificarea integrităţii unui pachet software "
#~ "descărcat."
-#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Introduceţi linia APT completă a locaţiei pe care doriţi să o "
-#~ "adăugaţi</b></big>\n"
-#~ "\n"
-#~ "Linia APT conţine tipul, adresa şi conţinutul unei locaţii, de exemplu<i>"
-#~ "\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere "
-#~ "detaliată a sintaxei în documentaţie."
-
-#~ msgid "APT line:"
-#~ msgstr "Linie APT:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_utentificare"
@@ -811,13 +911,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Curăţă automat fişierele _temporare ale pachetelor"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binar\n"
-#~ "Sursă"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Interval de curăţire în zile: "
diff --git a/po/rw.po b/po/rw.po
index 7f1b0297..b05e89be 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,79 +24,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"ULL NAME <EMAIL@ADDRESS>\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<B B"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<B B"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<B B"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "i Byahiswemo Urufunguzo Bivuye i"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<B B"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Mburabuzi Utubuto"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -359,67 +286,76 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Sisitemu"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<B B"
@@ -428,12 +364,12 @@ 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:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "Kwinjiza porogaramu"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Byarangiye"
@@ -444,8 +380,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -453,6 +388,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -546,21 +482,11 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<Uburemere UTSINDAGIYE Ingano Kinini Amahinduka Kuri Kubona i Amahinduka "
-"Bivuye i Seriveri"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
# officecfg/registry\schema\org\openoffice\Office\Calc.xcs:....Revision.Color.Change.text
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Amahinduka"
@@ -568,70 +494,260 @@ msgstr "Amahinduka"
# 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:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Isobanuramiterere"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Ibihuzagihe bya porogaramumudasobwa "
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Byarangiye"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-#
# setup2/source\ui\pages\plang.src:RESID_PAGE_PAGELANGUAGE.STR_PROG.text
# #-#-#-#-# setup2.pot (PACKAGE VERSION) #-#-#-#-#
# setup2/source\uibase\agentdlg.src:RC_AGENTDLG.RESID_DLG_AGENT_STR_INSTALL.text
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Kwinjiza porogaramu"
# sfx2/sdi\sfxslots.src:SID_RELOAD.text
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Kongera Gutangiza"
-#: ../data/update-manager.desktop.in.h:1
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<B B"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<B B"
+
+#: ../data/SoftwareProperties.glade.h:3
#, fuzzy
-msgid "Show available updates and choose which to install"
-msgstr "Bihari Na Guhitamo Kuri Kwinjiza porogaramu"
+msgid "<b>Keys</b>"
+msgstr "<B B"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "i Byahiswemo Urufunguzo Bivuye i"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<B B"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Mburabuzi Utubuto"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#, fuzzy
+msgid "<b>Comment:</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+#, fuzzy
+msgid "<b>Distribution:</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+#, fuzzy
+msgid "<b>Sections:</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+#, fuzzy
+msgid "<b>URI:</b>"
+msgstr "<B B"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<B i Byuzuye Umurongo Bya i Kuri Kongeramo B Umurongo Kirimo i Ubwoko Ahantu "
+"Na Ibikubiyemo Bya a kugirango Urugero i HTTP FTP org i Gushaka a "
+"Isobanuramiterere Bya i in i"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+#, fuzzy
+msgid "APT line:"
+msgstr "Umurongo"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+#, fuzzy
+msgid ""
+"Binary\n"
+"Source"
+msgstr "Inkomoko"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+#, fuzzy
+msgid "_Custom"
+msgstr "Guhanga"
+
+#: ../data/update-manager.desktop.in.h:1
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr ""
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -641,37 +757,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "5"
#. Description
#: ../channels/Ubuntu.info.in:91
#, fuzzy
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr "5"
#. CompDescription
@@ -744,6 +860,27 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Ibihuzagihe bya porogaramumudasobwa "
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<Uburemere UTSINDAGIYE Ingano Kinini Amahinduka Kuri Kubona i Amahinduka "
+#~ "Bivuye i Seriveri"
+
+#, fuzzy
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Bihari Na Guhitamo Kuri Kwinjiza porogaramu"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "5"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "i Urufunguzo"
@@ -776,38 +913,18 @@ msgstr ""
#~ msgstr "<B B Byabonetse Kuri ku ikoresha i Akabuto"
#, fuzzy
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
#~ msgid "<b>Components</b>"
#~ msgstr "<B B"
#, fuzzy
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
#~ msgid "<b>Repository</b>"
#~ msgstr "<B B"
#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<B Idosiye B"
#, fuzzy
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<B B"
-
-#, fuzzy
#~ msgid "<b>User Interface</b>"
#~ msgstr "<B B"
@@ -823,23 +940,6 @@ msgstr ""
#, fuzzy
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<B i Byuzuye Umurongo Bya i Kuri Kongeramo B Umurongo Kirimo i Ubwoko "
-#~ "Ahantu Na Ibikubiyemo Bya a kugirango Urugero i HTTP FTP org i Gushaka a "
-#~ "Isobanuramiterere Bya i in i"
-
-#, fuzzy
-#~ msgid "APT line:"
-#~ msgstr "Umurongo"
-
-#, fuzzy
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr "a Gishya Urufunguzo IDOSIYE Kuri i i Urufunguzo KURI a Na i"
@@ -887,10 +987,6 @@ msgstr ""
#~ msgstr "Intera in Iminsi"
#, fuzzy
-#~ msgid "_Custom"
-#~ msgstr "Guhanga"
-
-#, fuzzy
#~ msgid ""
#~ "This means that some dependencies of the installed packages are not "
#~ "satisfied. Please use \"Synaptic\" or \"apt-get\" to fix the situation."
@@ -1016,9 +1112,6 @@ msgstr ""
#~ msgid "Binary"
#~ msgstr "Nyabibiri"
-#~ msgid "Source"
-#~ msgstr "Inkomoko"
-
#, fuzzy
#~ msgid "Non-free software"
#~ msgstr "Kigenga"
diff --git a/po/sv.po b/po/sv.po
index 42619f23..37165d3f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,79 +16,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "Kanaler"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet-uppdateringar</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>Detaljer</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "Lägg till _cd"
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Installationer"
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr "Internet-uppdateringar"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Systemets standardalternativ"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Programvaruinställningar"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -350,78 +277,87 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Letar efter uppdateringar..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, fuzzy, python-format
msgid "Could not install '%s'"
msgstr "inte installerad"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
#, fuzzy
msgid "Could not find any upgrades"
msgstr "inte installerad"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "Ditt system har trasiga paket!"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Detaljer</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "Installera"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Uppgraderingar"
@@ -433,8 +369,7 @@ msgstr "Krav"
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -442,6 +377,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -537,83 +473,258 @@ msgstr ""
#: ../data/UpdateManager.glade.h:8
#, fuzzy
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Nätverksinställningar</span>\n"
-"Använd detta verktyg för att konfigurera det sätt som ditt system kommer åt "
-"andra datorer"
-
-#: ../data/UpdateManager.glade.h:11
-#, fuzzy
msgid "Cancel _Download"
msgstr "Hämta"
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Ändringar"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Beskrivning"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Läs om paketinformationen från servern."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
#, fuzzy
msgid "Show details"
msgstr "Detaljer"
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Programvaruuppdateringar"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "Uppgraderingar"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Letar efter uppdateringar..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Läs om"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "Kanaler"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet-uppdateringar</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>Detaljer</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "Lägg till _cd"
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Installationer"
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr "Internet-uppdateringar"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Systemets standardalternativ"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Programvaruinställningar"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "Kanaler"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Kommentar:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Val</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Typ:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT-rad:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+#, fuzzy
+msgid "Add Channel"
+msgstr "Alla kanaler"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Binär\n"
+"Källkod"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+#, fuzzy
+msgid "Edit Channel"
+msgstr "Kanal"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+#, fuzzy
+msgid "_Add Channel"
+msgstr "Alla kanaler"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "An_passad"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Uppdateringshanterare"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+#, fuzzy
+msgid "Show details of an update"
+msgstr "Detaljer"
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -622,36 +733,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Brådskande uppdateringar"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Brådskande uppdateringar"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Brådskande uppdateringar"
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr ""
+#, fuzzy
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Brådskande uppdateringar"
#. Description
#: ../channels/Ubuntu.info.in:91
#, fuzzy
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr "Brådskande uppdateringar"
#. CompDescription
@@ -723,6 +835,27 @@ msgid "Non-DFSG-compatible Software"
msgstr "Tillgängliga program"
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Programvaruuppdateringar"
+
+#, fuzzy
+#~ msgid "Could not add any software channels"
+#~ msgstr "inte installerad"
+
+#, fuzzy
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Nätverksinställningar</span>\n"
+#~ "Använd detta verktyg för att konfigurera det sätt som ditt system kommer "
+#~ "åt andra datorer"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Visa tillgängliga uppdateringar och välj vilka som ska installeras"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Inga matchande paket hittades"
@@ -755,48 +888,22 @@ msgstr "Tillgängliga program"
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "<b>Paket att installera:</b>"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Kommentar:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Komponenter</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Distribution:</b>"
-
#, fuzzy
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Säkerhet</b>"
-#, fuzzy
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Val</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Temporära filer</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Typ:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Användargränssnitt</b>"
-#~ msgid "APT line:"
-#~ msgstr "APT-rad:"
-
#~ msgid "A_uthentication"
#~ msgstr "A_utentisering"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Binär\n"
-#~ "Källkod"
-
#, fuzzy
#~ msgid "Edit Repository..."
#~ msgstr "Redigera värdar..."
@@ -820,9 +927,6 @@ msgstr "Tillgängliga program"
#~ msgid "_Add Repository"
#~ msgstr "_Lägg till värd"
-#~ msgid "_Custom"
-#~ msgstr "An_passad"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Hämta uppgraderingsbara paket"
@@ -1270,9 +1374,6 @@ msgstr "Tillgängliga program"
#~ msgid "Go to the '%s' page"
#~ msgstr "Gå till sidan \"%s\""
-#~ msgid "All Channels"
-#~ msgstr "Alla kanaler"
-
#~ msgid "All Subscribed Channels"
#~ msgstr "Alla prenumererade kanaler"
@@ -1359,9 +1460,6 @@ msgstr "Tillgängliga program"
#~ msgid "Continue"
#~ msgstr "Fortsätt"
-#~ msgid "Channel"
-#~ msgstr "Kanal"
-
#~ msgid "Package"
#~ msgstr "Paket"
diff --git a/po/uk.po b/po/uk.po
index 1d9aec6e..5fe2b667 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +15,6 @@ 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"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Клавіші</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Оновлення через Інтернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Клавіші</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Аутентифікація"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Видалити виділений ключ з в'язки довірених ключів."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Носій встановлення"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Оновлення через Інтернет</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Відновити початкові параметри"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Відновити початкові ключі"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Параметри програм"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "Перевіряти оновлення кожні"
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -347,32 +273,32 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Встановлення оновлень..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
@@ -380,7 +306,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
@@ -388,7 +314,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, python-format
msgid "%s package is going to be upgraded."
msgid_plural "%s packages are going to be upgraded."
@@ -396,31 +322,40 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
+#: ../DistUpgrade/DistUpgradeViewGtk.py:330
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Клавіші</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Встановити"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Оновлення завершено"
@@ -431,8 +366,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -440,6 +374,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -532,80 +467,259 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Завантаження змін</span>\n"
-"\n"
-"Потрібно отримати зміни з центрального сервера"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Зміни"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Опис"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "Перезавантажити з сервера інформацію про пакет"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Оновлення програм"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Встановлення оновлень..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Перезавантажити"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Клавіші</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Оновлення через Інтернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Клавіші</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Аутентифікація"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Видалити виділений ключ з в'язки довірених ключів."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Носій встановлення"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Оновлення через Інтернет</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Відновити початкові параметри"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Відновити початкові ключі"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Параметри програм"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "Перевіряти оновлення кожні"
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Клавіші</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Коментар:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>Дистрибутив:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>Розділи:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Розділи:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Тип:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></"
+"big>\n"
+"\n"
+"Рядок APT містить тип, адресу та вміст репозиторію, наприклад <i>\"deb "
+"http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
+"документації."
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "Рядок APT"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Двійкові\n"
+"вихідні"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "В_ласний"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Показати доступні оновлення та зміни до встановлених пакетів"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Менеджер оновлення"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -615,35 +729,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Оновлення Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Оновлення безпеки Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Оновлення безпеки Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Оновлення Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Оновлення Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\""
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Оновлення безпеки Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Оновлення безпеки Ubuntu 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Оновлення Ubuntu 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -716,6 +831,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Оновлення програм"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Завантаження змін</span>\n"
+#~ "\n"
+#~ "Потрібно отримати зміни з центрального сервера"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Показати доступні оновлення та зміни до встановлених пакетів"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\""
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Помилка видалення ключа"
@@ -731,30 +866,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "діб"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Коментар:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Компоненти</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Дистрибутив:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Репозиторій</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Розділи:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Тимчасові файли</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Тип:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Інтерфейс користувача</b>"
@@ -770,24 +890,6 @@ msgstr ""
#~ "дає змогу перевірити цілісність завантаженого програмного забезпечення."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></"
-#~ "big>\n"
-#~ "\n"
-#~ "Рядок APT містить тип, адресу та вміст репозиторію, наприклад <i>\"deb "
-#~ "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у "
-#~ "документації."
-
-#~ msgid "APT line:"
-#~ msgstr "Рядок APT"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -803,13 +905,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Автоматично очищати _тимчасові файли пакетів"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Двійкові\n"
-#~ "вихідні"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Інтервал очистки (днів):"
@@ -850,9 +945,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "_Додати репозиторій"
-#~ msgid "_Custom"
-#~ msgstr "В_ласний"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "_Завантажити оновлювані пакети"
diff --git a/po/update-manager.pot b/po/update-manager.pot
index 66b7fa1e..b8fdc51e 100644
--- a/po/update-manager.pot
+++ b/po/update-manager.pot
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-23 12:55+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,114 +17,37 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../data/SoftwareProperties.glade.h:1
-msgid "<b>Channels</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-msgid "Internet Updates"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:115
+#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:145
+#: ../SoftwareProperties/SoftwareProperties.py:131
#, python-format
msgid "After %s days"
msgstr ""
-#. cell_desc.set_property("xpad", 10)
-#. cell_desc.set_property("ypad", 10)
-#: ../SoftwareProperties/SoftwareProperties.py:230
-msgid "Software Channel"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:236
-msgid "Active"
-msgstr ""
-
-#: ../SoftwareProperties/SoftwareProperties.py:413
+#: ../SoftwareProperties/SoftwareProperties.py:354
msgid "Import key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:423
+#: ../SoftwareProperties/SoftwareProperties.py:364
msgid "Error importing selected file"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:424
+#: ../SoftwareProperties/SoftwareProperties.py:365
msgid "The selected file may not be a GPG key file or it might be corrupt."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:436
+#: ../SoftwareProperties/SoftwareProperties.py:377
msgid "Error removing the key"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:437
+#: ../SoftwareProperties/SoftwareProperties.py:378
msgid "The key you selected could not be removed. Please report this as a bug."
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:480
+#: ../SoftwareProperties/SoftwareProperties.py:421
#, python-format
msgid ""
"<big><b>Error scaning the CD</b></big>\n"
@@ -132,43 +55,14 @@ msgid ""
"%s"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:530
+#: ../SoftwareProperties/SoftwareProperties.py:471
msgid "Please enter a name for the disc"
msgstr ""
-#: ../SoftwareProperties/SoftwareProperties.py:546
+#: ../SoftwareProperties/SoftwareProperties.py:487
msgid "Please insert a disc in the drive:"
msgstr ""
-#: ../SoftwareProperties/dialog_sources_list.py:35
-msgid "Add Software Channels"
-msgstr ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:71
-msgid "Add the following software channel?"
-msgid_plural "Add the following software channels?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:74
-msgid "You can install software from a channel. Use trusted channels, only."
-msgstr ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:78
-msgid "_Add Channel"
-msgid_plural "_Add Channels"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:91
-msgid "Could not add any software channels"
-msgstr ""
-
-#: ../SoftwareProperties/dialog_sources_list.py:92
-#, python-format
-msgid "The file '%s' does not contain any valid software channels."
-msgstr ""
-
#: ../DistUpgrade/DistUpgradeCache.py:92
msgid "Broken packages"
msgstr ""
@@ -376,75 +270,84 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, python-format
msgid "<b>Remove %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, python-format
msgid "Install %s"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, python-format
msgid "Upgrade %s"
msgstr ""
@@ -455,8 +358,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -464,6 +366,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -555,72 +458,203 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
msgid "_Hide this information in the future"
msgstr ""
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:20
msgid "_Install Updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:24
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+msgid "<b>Channels</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+msgid "Internet Updates"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+msgid "<b>Channel</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+msgid "<b>Sections</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
@@ -664,32 +698,32 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr ""
#. CompDescription
diff --git a/po/vi.po b/po/vi.po
index 603930e2..49d71f15 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager Gnome HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +16,6 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0\n"
"X-Generator: LocFactoryEditor 1.2.2\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>Khóa</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>Khóa</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "Xác thực"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "Gỡ bỏ khóa được chọn ra vòng khóa tin cây."
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "Phương tiên cài đặt"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Cập nhật dùng Mạng</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "Phục hồi mặc định"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "Phục hồi các khóa mặc định"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "Sở thích phần mềm"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-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"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -348,74 +274,83 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Đang cài đặt bản cập nhật..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, 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:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, 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:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>Khóa</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "_Cài đặt"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "Nâng cấp xong"
@@ -426,8 +361,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -435,6 +369,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -527,80 +462,258 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Đang tải các thay đổi về</span>\n"
-"\n"
-"Cần phải lấy thay đổi xuống máy phục vụ trung tâm"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "Đổi"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "Mô tả"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../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ụ."
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "Bản cập nhật phần mềm"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Đang cài đặt bản cập nhật..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "Tải lại"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>Khóa</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Cập nhật dùng Mạng</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>Khóa</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "Xác thực"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "Gỡ bỏ khóa được chọn ra vòng khóa tin cây."
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "Phương tiên cài đặt"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Cập nhật dùng Mạng</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "Phục hồi mặc định"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "Phục hồi các khóa mặc định"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "Sở thích phần mềm"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+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"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>Khóa</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>Ghi chú :</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+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
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>Phần:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>Kiểu:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>Địa chỉ định vị:</b> "
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>Hãy nhập toàn dòng APT của kho cần thêm</b></big>\n"
+"\n"
+"Dòng APT chứa kiểu, địa điểm và nội dung của kho. Lấy thí dụ, <i>\"deb "
+"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
+msgid "APT line:"
+msgstr "Dòng APTL"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"Nhị phân\n"
+"Nguồn"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "Tự _chọn"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "Hiện các bản cập nhật công bố và chọn bản nào cần cài đặt."
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "Bộ Quản lý Cập nhật"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -610,35 +723,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Bản cập nhật Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Bản cập nhật bảo mặt Ubuntu 5.04"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Bản cập nhật Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Bản cập nhật Ubuntu 5.10"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Bản cập nhật bảo mặt Ubuntu 5.10"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Bản cập nhật bảo mặt Ubuntu 5.04"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Bản cập nhật Ubuntu 5.10"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -711,6 +825,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Bản cập nhật phần mềm"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Đang tải các thay đổi về</span>\n"
+#~ "\n"
+#~ "Cần phải lấy thay đổi xuống máy phục vụ trung tâm"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "Hiện các bản cập nhật công bố và chọn bản nào cần cài đặt."
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "Gặp lỗi khi gỡ bỏ khóa"
@@ -726,30 +860,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "ngày"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>Ghi chú :</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>Thành phần</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>Bản phát hành:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>Kho</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>Phần:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>Tập tin tạm</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>Kiểu:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>Địa chỉ định vị:</b> "
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>Giao diện người dùng</b>"
@@ -765,23 +884,6 @@ msgstr ""
#~ "bạn thẩm tra toàn vẹn của phần mềm đã tải về."
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>Hãy nhập toàn dòng APT của kho cần thêm</b></big>\n"
-#~ "\n"
-#~ "Dòng APT chứa kiểu, địa điểm và nội dung của kho. Lấy thí dụ, <i>\"deb "
-#~ "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."
-
-#~ msgid "APT line:"
-#~ msgstr "Dòng APTL"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -797,13 +899,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "Tự động xóa tập tin gói _tạm thời"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "Nhị phân\n"
-#~ "Nguồn"
-
#~ msgid "Clean interval in days: "
#~ msgstr "Thời gian giữa hai lần xóa, theo ngày:"
@@ -844,9 +939,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "Th_êm kho"
-#~ msgid "_Custom"
-#~ msgstr "Tự _chọn"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "Tài về gói có khả năng nâng cấp"
diff --git a/po/xh.po b/po/xh.po
index 0254c104..ab4e24b6 100644
--- a/po/xh.po
+++ b/po/xh.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-notifier\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,77 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
-
-#: ../data/SoftwareProperties.glade.h:2
-msgid "<b>Internet updates</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-msgid "Import the public key from a trusted software provider"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:8
-#, fuzzy
-msgid "Installation Media"
-msgstr "Seka zonke izihlaziyo"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "Bonisa izihlaziyo"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-msgid "Restore _Defaults"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-#, fuzzy
-msgid "Software Preferences"
-msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -341,76 +270,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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "Seka zonke izihlaziyo"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, python-format
msgid "<b>Remove %s</b>"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "Bonisa izihlaziyo"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, python-format
msgid "Upgrade %s"
msgstr ""
@@ -421,8 +359,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -430,6 +367,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -521,70 +459,212 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr ""
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr ""
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
msgid "Reload the latest information about updates"
msgstr ""
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
#, fuzzy
msgid "Software Updates"
msgstr "Bonisa izihlaziyo"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "Bonisa izihlaziyo"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
msgid "_Reload"
msgstr ""
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+
+#: ../data/SoftwareProperties.glade.h:2
+msgid "<b>Internet updates</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+msgid "Import the public key from a trusted software provider"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:8
+#, fuzzy
+msgid "Installation Media"
+msgstr "Seka zonke izihlaziyo"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "Bonisa izihlaziyo"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+msgid "Restore _Defaults"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+#, fuzzy
+msgid "Software Preferences"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+#, 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:6
+msgid "<b>Sections:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr ""
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
+msgid "Show and install available updates"
msgstr ""
#: ../data/update-manager.desktop.in.h:2
@@ -592,6 +672,35 @@ msgstr ""
msgid "Update Manager"
msgstr "UMlawuli woMqulu weNkqubo"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -600,32 +709,32 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:23
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:74
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+msgid "Ubuntu 5.10 Updates"
msgstr ""
#. CompDescription
@@ -695,6 +804,10 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "Bonisa izihlaziyo"
+
+#, fuzzy
#~ msgid "Updating package list..."
#~ msgstr "Hlaziya uluhlu lomqulu wenkqubo ngoku"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 93662349..bec41c4b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager HEAD\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,81 +15,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>细节</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>Internet 更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-#, fuzzy
-msgid "<b>Keys</b>"
-msgstr "<b>细节</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-#, fuzzy
-msgid "Add _Cdrom"
-msgstr "添加 CD(_C)"
-
-#: ../data/SoftwareProperties.glade.h:5
-#, fuzzy
-msgid "Authentication"
-msgstr "身份验证(_U)"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "从信任的密钥环中删除选中的密钥。"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>Internet 更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "恢复默认密钥"
-
-#: ../data/SoftwareProperties.glade.h:12
-msgid "Restore the default keys of your distribution"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "软件首选项"
-
-#: ../data/SoftwareProperties.glade.h:14
-msgid "_Check for updates automatically:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -345,76 +270,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:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
msgid "Installing updates"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
msgid "The upgrade aborts now. Please report this bug."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
#, fuzzy
msgid "Your system has already been upgraded."
msgstr "您的系统有损坏的软件包！"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>细节</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "安装(_I)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "更新已经完成"
@@ -425,8 +359,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -434,6 +367,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -527,78 +461,254 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "更改"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "描述"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "从服务器重新装入软件包信息。"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "软件更新"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
#, fuzzy
msgid "U_pgrade"
msgstr "更新已经完成"
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "安装(_I)"
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "重新装入"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>细节</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>Internet 更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+#, fuzzy
+msgid "<b>Keys</b>"
+msgstr "<b>细节</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+#, fuzzy
+msgid "Add _Cdrom"
+msgstr "添加 CD(_C)"
+
+#: ../data/SoftwareProperties.glade.h:5
+#, fuzzy
+msgid "Authentication"
+msgstr "身份验证(_U)"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "从信任的密钥环中删除选中的密钥。"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>Internet 更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "恢复默认密钥"
+
+#: ../data/SoftwareProperties.glade.h:12
+msgid "Restore the default keys of your distribution"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "软件首选项"
+
+#: ../data/SoftwareProperties.glade.h:14
+msgid "_Check for updates automatically:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>细节</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>注释：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>发行版：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>节：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>节：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>类型：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI：</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT 行："
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"二进制\n"
+"源代码"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "自定义(_C)"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "显示可用的更新并选择要安装的更新"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "更新管理器"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -608,36 +718,37 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
+msgid "Ubuntu 6.04 Security Updates"
msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:40
#, fuzzy
-msgid "Ubuntu 5.10 Security Updates"
+msgid "Ubuntu 6.04 Updates"
msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:57
#, fuzzy
-msgid "Ubuntu 5.10 Updates"
+msgid "Ubuntu 5.10 'Breezy Badger'"
msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:74
#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+msgid "Ubuntu 5.10 Security Updates"
msgstr "Ubuntu 5.04 安全更新"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
+#, fuzzy
+msgid "Ubuntu 5.10 Updates"
msgstr "Ubuntu 5.04 安全更新"
#. CompDescription
@@ -709,6 +820,17 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "软件更新"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "显示可用的更新并选择要安装的更新"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 安全更新"
+
+#, fuzzy
#~ msgid "<b>Sources</b>"
#~ msgstr "<b>软件源</b>"
@@ -724,49 +846,24 @@ msgstr ""
#~ msgid "<b>Packages to install:</b>"
#~ msgstr "要安装的软件包："
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>注释：</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>组件</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>发行版：</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>仓库</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>节：</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>临时文件</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>类型：</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI：</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>用户界面</b>"
-#~ msgid "APT line:"
-#~ msgstr "APT 行："
-
#~ msgid "A_uthentication"
#~ msgstr "身份验证(_U)"
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "自动清理临时包文件(_T)"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "二进制\n"
-#~ "源代码"
-
#~ msgid "Clean interval in days: "
#~ msgstr "清理间隔(以天计)："
@@ -785,9 +882,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "添加仓库(_A)"
-#~ msgid "_Custom"
-#~ msgstr "自定义(_C)"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "下载可更新的包(_D)"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 16e971bb..b536b146 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager 0.41.1\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>密碼匙</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>線上更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>密碼匙</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "認證"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "由你信任的密碼匙圈中移除指定的密碼匙。"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "安裝媒體"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>線上更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "還原為預設值"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "還原為預設密碼匙"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "軟件偏好設定"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "檢查軟件更新間隔："
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -347,77 +273,86 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "正在安裝軟件更新..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "你選定的密碼匙無法移除，請匯報問題。"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>密碼匙</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "安裝(_I)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "完成升級"
@@ -428,8 +363,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -437,6 +371,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -529,80 +464,258 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
-"\n"
-"現在由伺服器下載更改紀錄"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "更改紀錄"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "詳細說明"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "由伺服器重新載入套件資料。"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "軟件更新"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "正在安裝軟件更新..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "重新載入"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>密碼匙</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>線上更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>密碼匙</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "認證"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "由你信任的密碼匙圈中移除指定的密碼匙。"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "安裝媒體"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>線上更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "還原為預設值"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "還原為預設密碼匙"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "軟件偏好設定"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "檢查軟件更新間隔："
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>密碼匙</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>備註:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>發行版本:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>分類:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>分類:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>類型:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n"
+"\n"
+"該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp."
+"debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。"
+
+# (Abel): 「APT 行」實在不倫不類
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT 軟件庫:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"可執行檔\n"
+"源程式碼"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "自選(_C)"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "顯示所有可更新的套件，並選擇要安裝的套件"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "更新管理員"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -612,35 +725,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 更新"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 安全性更新"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 更新"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 安全性更新"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 安全性更新"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 更新"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -713,6 +827,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "軟件更新"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
+#~ "\n"
+#~ "現在由伺服器下載更改紀錄"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "顯示所有可更新的套件，並選擇要安裝的套件"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "移除密碼匙時發生錯誤"
@@ -728,30 +862,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "日"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>備註:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>元件</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>發行版本:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>軟件庫</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>暫存檔</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>類型:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>介面</b>"
@@ -767,23 +886,6 @@ msgstr ""
#~ "完整。"
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n"
-#~ "\n"
-#~ "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。"
-
-# (Abel): 「APT 行」實在不倫不類
-#~ msgid "APT line:"
-#~ msgstr "APT 軟件庫:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -799,13 +901,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "自動清理暫存檔案(_T)"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "可執行檔\n"
-#~ "源程式碼"
-
#~ msgid "Clean interval in days: "
#~ msgstr "每隔多少天自動清理: "
@@ -845,9 +940,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "加入軟件庫(_A)"
-#~ msgid "_Custom"
-#~ msgstr "自選(_C)"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "下載所有可以更新的套件(_D)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f3c467c6..b7e7fe62 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: update-manager 0.41.1\n"
-"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n"
-"POT-Creation-Date: 2006-02-22 16:57+0100\n"
+"Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n"
+"POT-Creation-Date: 2006-03-10 17:56+0100\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,80 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/SoftwareProperties.glade.h:1
-#, fuzzy
-msgid "<b>Channels</b>"
-msgstr "<b>金鑰</b>"
-
-#: ../data/SoftwareProperties.glade.h:2
-#, fuzzy
-msgid "<b>Internet updates</b>"
-msgstr "<b>線上更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:3
-msgid "<b>Keys</b>"
-msgstr "<b>金鑰</b>"
-
-#: ../data/SoftwareProperties.glade.h:4
-msgid "Add _Cdrom"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:5
-msgid "Authentication"
-msgstr "認證"
-
-#: ../data/SoftwareProperties.glade.h:6
-msgid "D_elete downloaded software files:"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:7
-#, fuzzy
-msgid "Import the public key from a trusted software provider"
-msgstr "由您信任的鑰匙圈中移除指定的金鑰。"
-
-#: ../data/SoftwareProperties.glade.h:8
-msgid "Installation Media"
-msgstr "安裝媒體"
-
-#: ../data/SoftwareProperties.glade.h:9
-#, fuzzy
-msgid "Internet Updates"
-msgstr "<b>線上更新</b>"
-
-#: ../data/SoftwareProperties.glade.h:10
-msgid ""
-"Only security updates from the official Ubuntu servers will be installed "
-"automatically. The software package \"unattended-upgrades\" needs to be "
-"installed therefor"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:11
-#, fuzzy
-msgid "Restore _Defaults"
-msgstr "還原為預設值"
-
-#: ../data/SoftwareProperties.glade.h:12
-#, fuzzy
-msgid "Restore the default keys of your distribution"
-msgstr "還原為預設金鑰"
-
-#: ../data/SoftwareProperties.glade.h:13
-msgid "Software Preferences"
-msgstr "軟體偏好設定"
-
-#: ../data/SoftwareProperties.glade.h:14
-#, fuzzy
-msgid "_Check for updates automatically:"
-msgstr "檢查軟體更新間隔："
-
-#: ../data/SoftwareProperties.glade.h:15
-msgid "_Download updates in the backgound, but do not install them"
-msgstr ""
-
-#: ../data/SoftwareProperties.glade.h:16
-msgid "_Install security updates without confirmation"
-msgstr ""
-
#: ../SoftwareProperties/SoftwareProperties.py:101
#, python-format
msgid "Every %s days"
@@ -347,77 +273,86 @@ msgstr ""
#. FIXME: add support for the timeout
#. of the terminal (to display something useful then)
#. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:134
+#: ../DistUpgrade/DistUpgradeViewGtk.py:135
#, fuzzy
msgid "Installing updates"
msgstr "正在安裝軟體更新..."
-#: ../DistUpgrade/DistUpgradeViewGtk.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:148
#, python-format
msgid "Could not install '%s'"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:148
+#: ../DistUpgrade/DistUpgradeViewGtk.py:149
#, fuzzy
msgid "The upgrade aborts now. Please report this bug."
msgstr "您選定的金鑰無法移除，請匯報問題。"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewGtk.py:228
msgid "A fatal error occured"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:227
+#: ../DistUpgrade/DistUpgradeViewGtk.py:229
msgid ""
"Please report this as a bug and include the files ~/dist-upgrade.log and ~/"
"dist-upgrade-apt.log in your report. The upgrade aborts now. "
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:308
+#: ../DistUpgrade/DistUpgradeViewGtk.py:311
#, python-format
msgid "%s package is going to be removed."
msgid_plural "%s packages are going to be removed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:314
+#: ../DistUpgrade/DistUpgradeViewGtk.py:317
#, python-format
msgid "%s new package is going to be installed."
msgid_plural "%s new packages are going to be installed."
msgstr[0] ""
msgstr[1] ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:320
+#: ../DistUpgrade/DistUpgradeViewGtk.py:323
#, 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
+#, python-format
+msgid "You have to download a total of %s."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:334
+msgid ""
+"The upgrade can take several hours and cannot be canceled at any time later."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeViewGtk.py:337
+msgid "To prevent data loss close all open applications and documents."
+msgstr ""
+
#. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeViewGtk.py:327
+#: ../DistUpgrade/DistUpgradeViewGtk.py:343
msgid "Could not find any upgrades"
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:328
+#: ../DistUpgrade/DistUpgradeViewGtk.py:344
msgid "Your system has already been upgraded."
msgstr ""
-#: ../DistUpgrade/DistUpgradeViewGtk.py:332
-#, python-format
-msgid "You have to download a total of %s."
-msgstr ""
-
-#: ../DistUpgrade/DistUpgradeViewGtk.py:339
+#: ../DistUpgrade/DistUpgradeViewGtk.py:353
#, fuzzy, python-format
msgid "<b>Remove %s</b>"
msgstr "<b>金鑰</b>"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:341
+#: ../DistUpgrade/DistUpgradeViewGtk.py:355
#, fuzzy, python-format
msgid "Install %s"
msgstr "安裝(_I)"
-#: ../DistUpgrade/DistUpgradeViewGtk.py:343
+#: ../DistUpgrade/DistUpgradeViewGtk.py:357
#, fuzzy, python-format
msgid "Upgrade %s"
msgstr "完成升級"
@@ -428,8 +363,7 @@ msgstr ""
#: ../DistUpgrade/DistUpgradeView.py:68
msgid ""
-"The upgrade is finished now. A reboot is required to now, do you want to do "
-"this now?"
+"The upgrade is finished and a reboot is required. Do you want to do this now?"
msgstr ""
#. testcode to see if the bullets look nice in the dialog
@@ -437,6 +371,7 @@ msgstr ""
#. view.setStep(i+1)
#. app.openCache()
#: ../DistUpgrade/DistUpgrade.glade.h:1
+#: ../data/SoftwarePropertiesDialogs.glade.h:1
msgid " "
msgstr ""
@@ -529,80 +464,258 @@ msgid "<big><b>Keep your system up-to-date</b></big>"
msgstr ""
#: ../data/UpdateManager.glade.h:8
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
-"\n"
-"Need to get the changes from the central server"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
-"\n"
-"現在由伺服器下載更改紀錄"
-
-#: ../data/UpdateManager.glade.h:11
msgid "Cancel _Download"
msgstr ""
-#: ../data/UpdateManager.glade.h:12
+#: ../data/UpdateManager.glade.h:9
msgid "Changes"
msgstr "更改紀錄"
-#: ../data/UpdateManager.glade.h:13
+#: ../data/UpdateManager.glade.h:10
msgid "Description"
msgstr "詳細說明"
-#: ../data/UpdateManager.glade.h:14
+#: ../data/UpdateManager.glade.h:11
msgid "Release Notes"
msgstr ""
-#: ../data/UpdateManager.glade.h:15
+#: ../data/UpdateManager.glade.h:12
#, fuzzy
msgid "Reload the latest information about updates"
msgstr "由伺服器重新載入套件資料。"
-#: ../data/UpdateManager.glade.h:16
+#: ../data/UpdateManager.glade.h:13
msgid "Show details"
msgstr ""
-#: ../data/UpdateManager.glade.h:17
+#: ../data/UpdateManager.glade.h:14
msgid "Show progress of single files"
msgstr ""
-#: ../data/UpdateManager.glade.h:18
+#: ../data/UpdateManager.glade.h:15
msgid "Software Updates"
msgstr "軟體更新"
-#: ../data/UpdateManager.glade.h:19
+#: ../data/UpdateManager.glade.h:16
msgid ""
"Software updates can correct errors, eliminate security vulnerabilities, and "
"provide new features to you."
msgstr ""
-#: ../data/UpdateManager.glade.h:20
+#: ../data/UpdateManager.glade.h:17
msgid "U_pgrade"
msgstr ""
-#: ../data/UpdateManager.glade.h:21
+#: ../data/UpdateManager.glade.h:18
msgid "Upgrade to the latest version of Ubuntu"
msgstr ""
-#: ../data/UpdateManager.glade.h:22
+#: ../data/UpdateManager.glade.h:19
+msgid "_Hide this information in the future"
+msgstr ""
+
+#: ../data/UpdateManager.glade.h:20
#, fuzzy
msgid "_Install Updates"
msgstr "正在安裝軟體更新..."
-#: ../data/UpdateManager.glade.h:23
+#: ../data/UpdateManager.glade.h:21
#, fuzzy
msgid "_Reload"
msgstr "重新載入"
+#: ../data/SoftwareProperties.glade.h:1
+#, fuzzy
+msgid "<b>Channels</b>"
+msgstr "<b>金鑰</b>"
+
+#: ../data/SoftwareProperties.glade.h:2
+#, fuzzy
+msgid "<b>Internet updates</b>"
+msgstr "<b>線上更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:3
+msgid "<b>Keys</b>"
+msgstr "<b>金鑰</b>"
+
+#: ../data/SoftwareProperties.glade.h:4
+msgid "Add _Cdrom"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:5
+msgid "Authentication"
+msgstr "認證"
+
+#: ../data/SoftwareProperties.glade.h:6
+msgid "D_elete downloaded software files:"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:7
+#, fuzzy
+msgid "Import the public key from a trusted software provider"
+msgstr "由您信任的鑰匙圈中移除指定的金鑰。"
+
+#: ../data/SoftwareProperties.glade.h:8
+msgid "Installation Media"
+msgstr "安裝媒體"
+
+#: ../data/SoftwareProperties.glade.h:9
+#, fuzzy
+msgid "Internet Updates"
+msgstr "<b>線上更新</b>"
+
+#: ../data/SoftwareProperties.glade.h:10
+msgid ""
+"Only security updates from the official Ubuntu servers will be installed "
+"automatically. The software package \"unattended-upgrades\" needs to be "
+"installed therefor"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:11
+#, fuzzy
+msgid "Restore _Defaults"
+msgstr "還原為預設值"
+
+#: ../data/SoftwareProperties.glade.h:12
+#, fuzzy
+msgid "Restore the default keys of your distribution"
+msgstr "還原為預設金鑰"
+
+#: ../data/SoftwareProperties.glade.h:13
+msgid "Software Preferences"
+msgstr "軟體偏好設定"
+
+#: ../data/SoftwareProperties.glade.h:14
+#, fuzzy
+msgid "_Check for updates automatically:"
+msgstr "檢查軟體更新間隔："
+
+#: ../data/SoftwareProperties.glade.h:15
+msgid "_Download updates in the backgound, but do not install them"
+msgstr ""
+
+#: ../data/SoftwareProperties.glade.h:16
+msgid "_Install security updates without confirmation"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:2
+msgid " "
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:3
+#, fuzzy
+msgid "<b>Channel</b>"
+msgstr "<b>金鑰</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:4
+msgid "<b>Comment:</b>"
+msgstr "<b>備註:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:5
+msgid "<b>Distribution:</b>"
+msgstr "<b>發行版本:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:6
+msgid "<b>Sections:</b>"
+msgstr "<b>分類:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:7
+#, fuzzy
+msgid "<b>Sections</b>"
+msgstr "<b>分類:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:8
+msgid "<b>Type:</b>"
+msgstr "<b>類型:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:9
+msgid "<b>URI:</b>"
+msgstr "<b>URI:</b>"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:10
+#, fuzzy
+msgid ""
+"<big><b>Enter the complete APT line of the channel that you want to add</b></"
+"big>\n"
+"\n"
+"The APT line contains the type, location and sections of a channel, for "
+"example <i>\"deb http://ftp.debian.org sarge main\"</i>."
+msgstr ""
+"<big><b>請輸入整行您想加入的 APT 軟體庫位置</b></big>\n"
+"\n"
+"該行的內容包括 APT 軟體庫的類型、位置和內容，例如： <i>\"deb http://ftp."
+"debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。"
+
+# (Abel): 「APT 行」實在不倫不類
+#: ../data/SoftwarePropertiesDialogs.glade.h:13
+msgid "APT line:"
+msgstr "APT 軟體庫:"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:14
+msgid "Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:15
+msgid ""
+"Binary\n"
+"Source"
+msgstr ""
+"可執行檔\n"
+"源程式碼"
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:17
+msgid "Edit Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:18
+msgid "Scanning CD-ROM"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:19
+msgid "_Add Channel"
+msgstr ""
+
+#: ../data/SoftwarePropertiesDialogs.glade.h:20
+msgid "_Custom"
+msgstr "自選(_C)"
+
#: ../data/update-manager.desktop.in.h:1
-msgid "Show available updates and choose which to install"
-msgstr "顯示所有可更新的套件，並選擇要安裝的套件"
+msgid "Show and install available updates"
+msgstr ""
#: ../data/update-manager.desktop.in.h:2
msgid "Update Manager"
msgstr "更新管理員"
+#: ../data/update-manager.schemas.in.h:1
+msgid ""
+"If automatic checking for updates is disabeld, you have to reload the "
+"channel list manually. This option allows to hide the reminder shown in this "
+"case."
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:2
+msgid "Remind to reload the channel list"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:3
+msgid "Show details of an update"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:4
+msgid "Stores the size of the update-manager dialog"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:5
+msgid ""
+"Stores the state of the expander that contains the list of changs and the "
+"description"
+msgstr ""
+
+#: ../data/update-manager.schemas.in.h:6
+msgid "The window size"
+msgstr ""
+
#. ChangelogURI
#: ../channels/Ubuntu.info.in.h:4
#, no-c-format
@@ -612,35 +725,36 @@ msgstr ""
#. Description
#: ../channels/Ubuntu.info.in:6
#, fuzzy
-msgid "Ubuntu 6.04 \"Dapper Drake\""
+msgid "Ubuntu 6.04 'Dapper Drake'"
msgstr "Ubuntu 5.04 更新"
#. Description
#: ../channels/Ubuntu.info.in:23
#, fuzzy
-msgid "Ubuntu 5.10 \"Breezy Badger\""
-msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
+msgid "Ubuntu 6.04 Security Updates"
+msgstr "Ubuntu 5.04 安全性更新"
#. Description
#: ../channels/Ubuntu.info.in:40
-msgid "Ubuntu 5.10 Security Updates"
-msgstr "Ubuntu 5.10 安全性更新"
+#, fuzzy
+msgid "Ubuntu 6.04 Updates"
+msgstr "Ubuntu 5.10 更新"
#. Description
#: ../channels/Ubuntu.info.in:57
-msgid "Ubuntu 5.10 Updates"
-msgstr "Ubuntu 5.10 更新"
+#, fuzzy
+msgid "Ubuntu 5.10 'Breezy Badger'"
+msgstr "Ubuntu 5.10 光碟 “Breezy Badger”"
#. Description
#: ../channels/Ubuntu.info.in:74
-#, fuzzy
-msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
-msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+msgid "Ubuntu 5.10 Security Updates"
+msgstr "Ubuntu 5.10 安全性更新"
#. Description
#: ../channels/Ubuntu.info.in:91
-msgid "Ubuntu 5.04 Security Updates"
-msgstr "Ubuntu 5.04 安全性更新"
+msgid "Ubuntu 5.10 Updates"
+msgstr "Ubuntu 5.10 更新"
#. CompDescription
#: ../channels/Ubuntu.info.in:94 ../channels/Debian.info.in:51
@@ -713,6 +827,26 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#, fuzzy
+#~ msgid "Add Software Channels"
+#~ msgstr "軟體更新"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n"
+#~ "\n"
+#~ "Need to get the changes from the central server"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">下載更改紀錄</span>\n"
+#~ "\n"
+#~ "現在由伺服器下載更改紀錄"
+
+#~ msgid "Show available updates and choose which to install"
+#~ msgstr "顯示所有可更新的套件，並選擇要安裝的套件"
+
+#, fuzzy
+#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\""
+#~ msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”"
+
+#, fuzzy
#~ msgid "Error fetching the packages"
#~ msgstr "移除金鑰時發生錯誤"
@@ -728,30 +862,15 @@ msgstr ""
#~ msgid "day(s)"
#~ msgstr "日"
-#~ msgid "<b>Comment:</b>"
-#~ msgstr "<b>備註:</b>"
-
#~ msgid "<b>Components</b>"
#~ msgstr "<b>元件</b>"
-#~ msgid "<b>Distribution:</b>"
-#~ msgstr "<b>發行版本:</b>"
-
#~ msgid "<b>Repository</b>"
#~ msgstr "<b>軟體庫</b>"
-#~ msgid "<b>Sections:</b>"
-#~ msgstr "<b>分類:</b>"
-
#~ msgid "<b>Temporary files</b>"
#~ msgstr "<b>暫存檔</b>"
-#~ msgid "<b>Type:</b>"
-#~ msgstr "<b>類型:</b>"
-
-#~ msgid "<b>URI:</b>"
-#~ msgstr "<b>URI:</b>"
-
#~ msgid "<b>User Interface</b>"
#~ msgstr "<b>介面</b>"
@@ -767,23 +886,6 @@ msgstr ""
#~ "整。"
#~ msgid ""
-#~ "<big><b>Enter the complete APT line of the repository that you want to "
-#~ "add</b></big>\n"
-#~ "\n"
-#~ "The APT line contains the type, location and content of a repository, for "
-#~ "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a "
-#~ "detailed description of the syntax in the documentation."
-#~ msgstr ""
-#~ "<big><b>請輸入整行您想加入的 APT 軟體庫位置</b></big>\n"
-#~ "\n"
-#~ "該行的內容包括 APT 軟體庫的類型、位置和內容，例如： <i>\"deb http://ftp."
-#~ "debian.org sarge main\"</i>。您可以在文件中尋找有關該行的格式的詳細描述。"
-
-# (Abel): 「APT 行」實在不倫不類
-#~ msgid "APT line:"
-#~ msgstr "APT 軟體庫:"
-
-#~ msgid ""
#~ "Add a new key file to the trusted keyring. Make sure that you received "
#~ "the key over a secure channel and that you trust the owner. "
#~ msgstr ""
@@ -799,13 +901,6 @@ msgstr ""
#~ msgid "Automatically clean _temporary packages files"
#~ msgstr "自動清理暫存檔案(_T)"
-#~ msgid ""
-#~ "Binary\n"
-#~ "Source"
-#~ msgstr ""
-#~ "可執行檔\n"
-#~ "源程式碼"
-
#~ msgid "Clean interval in days: "
#~ msgstr "每隔多少天自動清理: "
@@ -844,9 +939,6 @@ msgstr ""
#~ msgid "_Add Repository"
#~ msgstr "加入軟體庫(_A)"
-#~ msgid "_Custom"
-#~ msgstr "自選(_C)"
-
#~ msgid "_Download upgradable packages"
#~ msgstr "下載所有可以更新的套件(_D)"
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-12 23:29:51 +0000