diff options
| author | glatzor@ubuntu.com <> | 2006-08-02 18:37:59 +0200 |
|---|---|---|
| committer | glatzor@ubuntu.com <> | 2006-08-02 18:37:59 +0200 |
| commit | 0a5aacc19bfe31eda221e2f6476712097d693a06 (patch) | |
| tree | 8995ea136686477cc31a4e240b6464ea0c6d6ed0 | |
| parent | 70bf03a91044f338aed8acd819c15dc8d5968103 (diff) | |
| parent | dde2af913b3f26958f93f604d7a75e61e64ec7f1 (diff) | |
| download | python-apt-0a5aacc19bfe31eda221e2f6476712097d693a06.tar.gz | |
* merge with main
92 files changed, 29927 insertions, 16169 deletions
diff --git a/DistUpgrade/DistUpgrade.cfg b/DistUpgrade/DistUpgrade.cfg index c594f296..9d6001fb 100644 --- a/DistUpgrade/DistUpgrade.cfg +++ b/DistUpgrade/DistUpgrade.cfg @@ -32,8 +32,8 @@ KeyDependencies=xubuntu-artwork-usplash, xubuntu-default-settings, xfce4 BackupExt=distUpgrade [Sources] -From=breezy -To=dapper +From=dapper +To=edgy ValidOrigin=Ubuntu ValidMirrors = mirrors.txt diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 91d5b33f..a31df120 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -38,7 +38,7 @@ <child> <widget class="GtkLabel" id="label_title"> <property name="visible">True</property> - <property name="label" translatable="yes"><span weight="bold" size="x-large">Upgrading to Ubuntu 6.06 LTS</span></property> + <property name="label" translatable="yes"><span weight="bold" size="x-large">Upgrading to Ubuntu 6.10</span></property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index b6b52c72..9842484d 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -143,7 +143,7 @@ class DistUpgradeControler(object): def updateSourcesList(self): logging.debug("updateSourcesList()") - self.sources = SourcesList() + self.sources = SourcesList(withMatcher=False) if not self.rewriteSourcesList(mirror_check=True): logging.error("No valid mirror found") res = self._view.askYesNoQuestion(_("No valid mirror found"), @@ -446,7 +446,7 @@ class DistUpgradeControler(object): # this is the core - def dapperUpgrade(self): + def edgyUpgrade(self): # sanity check (check for ubuntu-desktop, brokenCache etc) self._view.updateStatus(_("Checking package manager")) self._view.setStep(1) @@ -516,6 +516,6 @@ class DistUpgradeControler(object): subprocess.call(["reboot"]) def run(self): - self.dapperUpgrade() + self.edgyUpgrade() diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement index baa35883..2d4e03a4 100644 --- a/DistUpgrade/ReleaseAnnouncement +++ b/DistUpgrade/ReleaseAnnouncement @@ -1,9 +1,9 @@ -Welcome to Ubuntu 6.06 LTS --------------------------- +Welcome to Ubuntu 6.10 'Edgy Eft' +--------------------------------- +*WARNING: THIS IS A DEVELOPMENT SNAPSHOT* -The Ubuntu team is proud to announce Ubuntu 6.06 LTS (Long Term -Support). +The Ubuntu team is proud to announce Ubuntu 6.10 'Edgy Eft'. Ubuntu is a Linux distribution for your desktop or server, with a fast and easy install, regular releases, a tight selection of excellent diff --git a/DistUpgrade/aptsources.py b/DistUpgrade/aptsources.py index 2f041121..3cadeee7 120000 --- a/DistUpgrade/aptsources.py +++ b/DistUpgrade/aptsources.py @@ -1 +1 @@ -../SoftwareProperties/aptsources.py
\ No newline at end of file +../UpdateManager/Common/aptsources.py
\ No newline at end of file diff --git a/DistUpgrade/build-dist.sh b/DistUpgrade/build-dist.sh index fd06fede..4af768ef 100755 --- a/DistUpgrade/build-dist.sh +++ b/DistUpgrade/build-dist.sh @@ -9,7 +9,7 @@ TARGETDIR=../dist-upgrade-build SOURCEDIR=`pwd` -DIST=dapper +DIST=edgy MAINTAINER="Michael Vogt <michael.vogt@ubuntu.com>" NOTES=ReleaseAnnouncement version=$(date +%Y%m%d.%H%M) diff --git a/DistUpgrade/build-tarball.sh b/DistUpgrade/build-tarball.sh index a30e40a0..4f88b848 100755 --- a/DistUpgrade/build-tarball.sh +++ b/DistUpgrade/build-tarball.sh @@ -1,6 +1,6 @@ #!/bin/sh -DIST=dapper +DIST=edgy # cleanup rm -f *~ *.bak *.pyc *.moved '#'* diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 65b72cda..18e5d260 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -21,6 +21,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA +#import pdb import sys import apt import apt_pkg @@ -30,15 +31,18 @@ import gettext import tempfile from gettext import gettext as _ import os +import string +import re #sys.path.append("@prefix/share/update-manager/python") from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp from UpdateManager.Common.HelpViewer import HelpViewer -import aptsources +import UpdateManager.Common.aptsources as aptsources import dialog_add import dialog_edit import dialog_cache_outdated +import dialog_add_sources_list from dialog_apt_key import apt_key from utils import * @@ -53,10 +57,27 @@ CONF_MAP = { "max_age" : "APT::Archives::MaxAge" } +( + COLUMN_ACTIVE, + COLUMN_DESC +) = range(2) + +RESPONSE_REPLACE = 1 +RESPONSE_ADD = 2 + +# columns of the source_store +( + STORE_ACTIVE, + STORE_DESCRIPTION, + STORE_SOURCE, + STORE_SEPARATOR, + STORE_VISIBLE +) = range(5) + class SoftwareProperties(SimpleGladeApp): - def __init__(self, datadir=None, options=None, parent=None): + def __init__(self, datadir=None, options=None, parent=None, file=None): gtk.window_set_default_icon_name("software-properties") # FIXME: some saner way is needed here @@ -67,8 +88,20 @@ class SoftwareProperties(SimpleGladeApp): None, domain="update-manager") self.modified = False - #self.gnome_program = gnome.init("Software Properties", "0.41") - #self.gconfclient = gconf.client_get_default() + self.file = file + + self.distro = aptsources.Distribution() + cell = gtk.CellRendererText() + self.combobox_server.pack_start(cell, True) + self.combobox_server.add_attribute(cell, 'text', 0) + + # set up the handler id for the callbacks + self.handler_server_changed = self.combobox_server.connect("changed", + self.on_combobox_server_changed) + self.handler_source_code_changed = self.checkbutton_source_code.connect( + "toggled", + self.on_checkbutton_source_code_toggled + ) if parent: self.window_main.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG) @@ -83,13 +116,12 @@ class SoftwareProperties(SimpleGladeApp): toplevel = gtk.gdk.window_foreign_new(int(options.toplevel)) self.window_main.window.set_transient_for(toplevel) - self.window_main.show() - self.init_sourceslist() self.reload_sourceslist() + self.backup_sourceslist() + + self.window_main.show() - # internet update setings - # this maps the key (combo-box-index) to the auto-update-interval value # where (-1) means, no key self.combobox_interval_mapping = { 0 : 1, @@ -184,30 +216,396 @@ class SoftwareProperties(SimpleGladeApp): self.init_keyslist() self.reload_keyslist() + # drag and drop support for sources.list + self.treeview_sources.drag_dest_set(gtk.DEST_DEFAULT_ALL, \ + [('text/uri-list',0, 0)], \ + gtk.gdk.ACTION_COPY) + self.treeview_sources.connect("drag_data_received",\ + self.on_sources_drag_data_received) + + # call the add sources.list dialog if we got a file from the cli + if self.file != None: + self.open_file(file) + + def distro_to_widgets(self): + """ + Represent the distro information in the user interface + """ + # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu + self.label_updates.set_label("<b>%s</b>" % (_("%s updates") %\ + self.distro.id)) + # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu + self.label_dist_name.set_label("%s" % self.distro.description) + + # Setup the checkbuttons for the components + for checkbutton in self.vbox_dist_comps.get_children(): + self.vbox_dist_comps.remove(checkbutton) + for comp in self.distro.source_template.components.keys(): + checkbox = gtk.CheckButton(label=self.distro.source_template.components[comp][2]) + # check if the comp is enabled + # FIXME: use inconsistence if there are main sources with not all comps + if comp in self.distro.download_comps: + checkbox.set_active(True) + # setup the callback and show the checkbutton + checkbox.connect("toggled", self.on_component_toggled, comp) + self.vbox_dist_comps.add(checkbox) + checkbox.show() + + # Setup the checkbuttons for the child repos / updates + for checkbutton in self.vbox_updates.get_children(): + self.vbox_updates.remove(checkbutton) + for template in self.distro.source_template.children: + checkbox = gtk.CheckButton(label=template.description) + comps = [] + for child in self.distro.child_sources: + if child.template == template: + comps.extend(child.comps) + # check if all comps of the main source are also enabled + # for the corresponding child sources + if len(comps) > 0 and \ + len(self.distro.enabled_comps ^ set(comps)) == 0: + # the cild source covers all components + checkbox.set_active(True) + elif len(comps) > 0 and\ + len(self.distro.enabled_comps ^ set(comps)) != 0: + # the cild is enabled, but doesn't cover + # all components + checkbox.set_active(False) + checkbox.set_inconsistent(True) + else: + # there is no corresponding child source at all + checkbox.set_active(False) + # setup the callback and show the checkbutton + checkbox.connect("toggled", self.on_checkbutton_child_toggled, + template) + self.vbox_updates.add(checkbox) + checkbox.show() + + if len(self.distro.enabled_comps) < 1: + self.vbox_updates.set_sensitive(False) + else: + self.vbox_updates.set_sensitive(True) + + # Intiate the combobox which allows do specify a server for all + # distro related sources + self.combobox_server.handler_block(self.handler_server_changed) + server_store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + self.combobox_server.set_model(server_store) + server_store.append([_("Main server"), + self.distro.main_server]) + if self.distro.country != None: + # TRANSLATORS: %s is a country + server_store.append([_("Server for %s") % gettext.dgettext("iso-3166", + self.distro.country).rstrip(), + self.distro.nearest_server]) + else: + server_store.append([_("Nearest server"), + self.distro.nearest_server]) + if len(self.distro.used_servers) > 0: + for server in self.distro.used_servers: + if not re.match(server, self.distro.main_server) and \ + not re.match(server, self.distro.nearest_server): + #FIXME: an ubuntu hack + i = server.find("http://") + l = server.find(".archive.ubuntu.com") + if i != -1 and l != -1: + country = server[i+7:l] + if self.distro.countries.has_key(country): + # TRANSLATORS: %s is a country + server_store.append([_("Server for %s") % \ + gettext.dgettext("iso-3166", + self.distro.countries[country].rstrip()), + server]) + else: + server_store.append(["%s" % server, server]) + if len(self.distro.used_servers) > 1: + server_store.append([_("Custom servers"), None]) + self.combobox_server.set_active(2) + elif self.distro.used_servers[0] == self.distro.main_server: + self.combobox_server.set_active(0) + elif self.distro.used_servers[0] == self.distro.nearest_server: + self.combobox_server.set_active(1) + elif len(self.distro.used_servers) == 1: + self.combobox_server.set_active(2) + + else: + self.combobox_server.set_active(0) + + self.combobox_server.handler_unblock(self.handler_server_changed) + + # Check for source code sources + self.checkbutton_source_code.handler_block(self.handler_source_code_changed) + self.checkbutton_source_code.set_inconsistent(False) + if len(self.distro.source_code_sources) < 1: + # we don't have any source code sources, so + # uncheck the button + self.checkbutton_source_code.set_active(False) + self.distro.get_source_code = False + else: + # there are source code sources, so we check the button + self.checkbutton_source_code.set_active(True) + self.distro.get_source_code = True + # check if there is a corresponding source code source for + # every binary source. if not set the checkbutton to inconsistent + templates = {} + sources = [] + sources.extend(self.distro.main_sources) + sources.extend(self.distro.child_sources) + for source in sources: + if templates.has_key(source.template): + for comp in source.comps: + templates[source.template].add(comp) + else: + templates[source.template] = set(source.comps) + # add fake http sources for the cdrom, since the sources + # for the cdrom are only available in the internet + if len(self.distro.cdrom_sources) > 0: + templates[self.distro.source_template] = self.distro.cdrom_comps + for source in self.distro.source_code_sources: + if not templates.has_key(source.template) or \ + (templates.has_key(source.template) and not \ + (len(set(templates[source.template]) ^ set(source.comps)) == 0\ + or (len(set(source.comps) ^ self.distro.enabled_comps) == 0))): + self.checkbutton_source_code.set_inconsistent(True) + self.distro.get_source_code = False + break + self.checkbutton_source_code.handler_unblock(self.handler_source_code_changed) + + if len(self.cdrom_store) == 0: + self.treeview_cdroms.set_sensitive(False) + else: + self.treeview_cdroms.set_sensitive(True) + + def on_combobox_server_changed(self, combobox): + """ + Replace the servers used by the main and update sources with + the selected one + """ + server_store = combobox.get_model() + iter = combobox.get_active_iter() + uri_selected = server_store.get_value(iter, 1) + sources = [] + sources.extend(self.distro.main_sources) + sources.extend(self.distro.child_sources) + sources.extend(self.distro.source_code_sources) + for source in sources: + # FIXME: ugly + if not "security.ubuntu.com" in source.uri: + source.uri = uri_selected + self.distro.ddefault_server = uri_selected + self.modified_sourceslist() + + def on_component_toggled(self, checkbutton, comp): + """ + Sync the components of all main sources (excluding cdroms), + child sources and source code sources + """ + if checkbutton.get_active() == True: + self.distro.enable_component(self.sourceslist, comp) + else: + self.distro.disable_component(self.sourceslist, comp) + self.modified_sourceslist() + + def massive_debug_output(self): + """ + do not write our changes yet - just print them to std_out + """ + print "START SOURCES.LIST:" + for source in self.sourceslist: + print source.str() + print "END SOURCES.LIST\n" + + def on_checkbutton_child_toggled(self, checkbutton, template): + """ + Enable or disable a child repo of the distribution main repository + """ + if checkbutton.get_active() == False: + for source in self.distro.child_sources: + if source.template == template: + self.sourceslist.remove(source) + else: + self.distro.add_source(self.sourceslist, + uri=template.base_uri, + dist=template.name) + self.modified_sourceslist() + + def on_checkbutton_source_code_toggled(self, checkbutton): + """ + Disable or enable the source code for all sources + """ + self.distro.get_source_code = checkbutton.get_active() + sources = [] + sources.extend(self.distro.main_sources) + sources.extend(self.distro.child_sources) + + # remove all exisiting sources + for source in self.distro.source_code_sources: + self.sourceslist.remove(source) + + if checkbutton.get_active() == True: + for source in sources: + self.sourceslist.add("deb-src", + source.uri, + source.dist, + source.comps, + "Added by software-properties", + self.sourceslist.list.index(source)+1, + source.file) + for source in self.distro.cdrom_sources: + self.sourceslist.add("deb-src", + self.distro.source_template.base_uri, + self.distro.source_template.name, + source.comps, + "Added by software-properties", + self.sourceslist.list.index(source)+1, + source.file) + self.modified_sourceslist() + + def on_checkbutton_popcon_toggled(self, widget): + """ The user clicked on the popcon paritipcation button """ + popcon = "/etc/popularity-contest.conf" + if widget.get_active(): + new_value = "yes" + else: + new_value = "no" + if os.path.exists(popcon): + # read it + lines = open(popcon).read().split("\n") + for line in lines: + try: + (key,value) = line.split("=") + if key == "PARTICIPATE": + lines[lines.index(line)] = 'PARTICIPATE=\"%s"' % new_value + except ValueError: + continue + # write it + open(popcon,"w").write("\n".join(lines)) + + + def open_file(self, file): + """Show an confirmation for adding the channels of the specified file""" + dialog = dialog_add_sources_list.AddSourcesList(self.window_main, + self.sourceslist, + self.render_source, + self.get_comparable, + self.datadir, + file) + (res, new_sources) = dialog.run() + if res == RESPONSE_REPLACE: + self.sourceslist.list = [] + if res in (RESPONSE_ADD, RESPONSE_REPLACE): + for source in new_sources: + self.sourceslist.add(source.type, + source.uri, + source.dist, + source.comps, + source.comment) + self.modified_sourceslist() + + def on_sources_drag_data_received(self, widget, context, x, y, + selection, target_type, timestamp): + """Extract the dropped file pathes and open the first file, only""" + uri = selection.data.strip() + uri_splitted = uri.split() + if len(uri_splitted)>0: + self.open_file(uri_splitted[0]) + def hide(self): self.window_main.hide() def init_sourceslist(self): - self.source_store = gtk.ListStore(str, bool, gobject.TYPE_PYOBJECT) + """ + Read all valid sources into our ListStore + """ + # STORE_ACTIVE - is the source enabled or disabled + # STORE_DESCRIPTION - description of the source entry + # STORE_SOURCE - the source entry object + # STORE_SEPARATOR - if the entry is a separator + # STORE_VISIBLE - if the entry is shown or hidden + self.cdrom_store = gtk.ListStore(gobject.TYPE_BOOLEAN, + gobject.TYPE_STRING, + gobject.TYPE_PYOBJECT, + gobject.TYPE_BOOLEAN, + gobject.TYPE_BOOLEAN) + self.treeview_cdroms.set_model(self.cdrom_store) + self.source_store = gtk.ListStore(gobject.TYPE_BOOLEAN, + gobject.TYPE_STRING, + gobject.TYPE_PYOBJECT, + gobject.TYPE_BOOLEAN, + gobject.TYPE_BOOLEAN) self.treeview_sources.set_model(self.source_store) - - tr = gtk.CellRendererText() - tr.set_property("xpad", 10) - tr.set_property("ypad", 10) - - source_col = gtk.TreeViewColumn("Description", tr, markup=LIST_MARKUP) - #source_col.set_max_width(500) + self.treeview_sources.set_row_separator_func(self.is_separator, + STORE_SEPARATOR) - toggle = gtk.CellRendererToggle() - toggle.connect("toggled", self.on_channel_toggled) - toggle_col = gtk.TreeViewColumn("Active", toggle, active=LIST_ENABLED) + cell_desc = gtk.CellRendererText() + cell_desc.set_property("xpad", 2) + cell_desc.set_property("ypad", 2) + col_desc = gtk.TreeViewColumn(_("Software Channel"), cell_desc, + markup=COLUMN_DESC) + col_desc.set_max_width(1000) + + cell_toggle = gtk.CellRendererToggle() + cell_toggle.set_property("xpad", 2) + cell_toggle.set_property("ypad", 2) + cell_toggle.connect('toggled', self.on_channel_toggled, self.cdrom_store) + col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, + active=COLUMN_ACTIVE) + + self.treeview_cdroms.append_column(col_active) + self.treeview_cdroms.append_column(col_desc) + + cell_desc = gtk.CellRendererText() + cell_desc.set_property("xpad", 2) + cell_desc.set_property("ypad", 2) + col_desc = gtk.TreeViewColumn(_("Software Channel"), cell_desc, + markup=COLUMN_DESC) + col_desc.set_max_width(1000) + + cell_toggle = gtk.CellRendererToggle() + cell_toggle.set_property("xpad", 2) + cell_toggle.set_property("ypad", 2) + cell_toggle.connect('toggled', self.on_channel_toggled, self.source_store) + col_active = gtk.TreeViewColumn(_("Active"), cell_toggle, + active=COLUMN_ACTIVE) + + self.treeview_sources.append_column(col_active) + self.treeview_sources.append_column(col_desc) - self.treeview_sources.append_column(toggle_col) - self.treeview_sources.append_column(source_col) - self.sourceslist = aptsources.SourcesList() - self.matcher = aptsources.SourceEntryMatcher() - + + def backup_sourceslist(self): + """ + Duplicate the list of sources + """ + self.sourceslist_backup = [] + for source in self.sourceslist.list: + source_bkp = aptsources.SourceEntry(line=source.line,file=source.file) + self.sourceslist_backup.append(source_bkp) + + def on_channel_activate(self, treeview, path, column): + """Open the edit dialog if a channel was double clicked""" + self.on_edit_clicked(treeview) + + def on_treeview_sources_cursor_changed(self, treeview): + """Enable the buttons remove and edit if a channel is selected""" + sel = self.treeview_sources.get_selection() + (model, iter) = sel.get_selected() + if iter: + self.button_edit.set_sensitive(True) + self.button_remove.set_sensitive(True) + else: + self.button_edit.set_sensitive(False) + self.button_remove.set_sensitive(False) + + def on_channel_toggled(self, cell_toggle, path, store): + """Enable or disable the selected channel""" + #FIXME cdroms need to disable the comps in the childs and sources + iter = store.get_iter((int(path),)) + source_entry = store.get_value(iter, STORE_SOURCE) + source_entry.disabled = not source_entry.disabled + store.set_value(iter, STORE_ACTIVE, not source_entry.disabled) + self.modified_sourceslist() + def init_keyslist(self): self.keys_store = gtk.ListStore(str) self.treeview2.set_model(self.keys_store) @@ -217,29 +615,122 @@ class SoftwareProperties(SimpleGladeApp): keys_col = gtk.TreeViewColumn("Key", tr, text=0) self.treeview2.append_column(keys_col) + def on_button_revert_clicked(self, button): + """Restore the source list from the startup of the dialog""" + self.sourceslist.list = [] + for source in self.sourceslist_backup: + source_reset = aptsources.SourceEntry(line=source.line,file=source.file) + self.sourceslist.list.append(source_reset) + self.save_sourceslist() + self.reload_sourceslist() + self.button_revert.set_sensitive(False) + self.modified = False + + def modified_sourceslist(self): + """The sources list was changed and now needs to be saved and reloaded""" + self.massive_debug_output() + self.modified = True + self.button_revert.set_sensitive(True) + self.save_sourceslist() + self.reload_sourceslist() + + def render_source(self, source): + """Render a nice output to show the source in a treeview""" + + if source.template == None: + if source.comment: + contents = "<b>%s</b>" % source.comment + # Only show the components if there are more than one + if len(source.comps) > 1: + for c in source.comps: + contents += " %s" % c + else: + contents = "<b>%s %s</b>" % (source.uri, source.dist) + for c in source.comps: + contents += " %s" % c + if source.type in ("deb-src", "rpm-src"): + contents += " %s" % _("(Source Code)") + return contents + else: + # try to make use of an corresponding template + contents = "<b>%s</b>" % source.template.description + if source.type in ("deb-src", "rpm-src"): + contents += " (%s)" % _("Source Code") + if source.comment: + contents +=" %s" % source.comment + if source.template.child == False: + for comp in source.comps: + if source.template.components.has_key(comp): + print source.template.components[comp] + (desc, enabled, desc_long) = source.template.components[comp] + contents += "\n%s" % desc + else: + contents += "\n%s" % comp + return contents + + def get_comparable(self, source): + """extract attributes to sort the sources""" + cur_sys = 1 + has_template = 1 + has_comment = 1 + is_source = 1 + revert_numbers = string.maketrans("0123456789", "9876543210") + if source.template: + has_template = 0 + desc = source.template.description + if source.template.distribution == self.distro: + cur_sys = 0 + else: + desc = "%s %s %s" % (source.uri, source.dist, source.comps) + if source.comment: + has_comment = 0 + if source.type.find("src"): + is_source = 0 + return (cur_sys, has_template, has_comment, is_source, + desc.translate(revert_numbers)) + def reload_sourceslist(self): (path_x, path_y) = self.treeview_sources.get_cursor() self.source_store.clear() + self.cdrom_store.clear() + self.sourceslist.refresh() + self.sourceslist_visible=[] + self.distro.get_sources(self.sourceslist) + # Only show sources that are no binary or source code repos for + # the current distribution, but show cdrom based repos for source in self.sourceslist.list: - if source.invalid: - continue - (a_type, dist, comps) = self.matcher.match(source) - - contents = "" - if source.comment != "": - contents += "<i>%s</i>\n\n" % (source.comment) - contents +="<big><b>%s </b></big> (%s) <small>\n%s</small>" % (dist,a_type, comps) - - self.source_store.append([contents, not source.disabled, source]) - # try to reselect the latest selected channel or if it fails the first - # one - if len(self.source_store) > 0 and \ - (path_x == None or self.treeview_sources.set_cursor(path_x)): - self.treeview_sources.set_cursor(0) - else: - # call the cursor_changed signal if no channel is selected - self.treeview_sources.emit("cursor_changed") + if not source.invalid and\ + (source not in self.distro.main_sources and\ + source not in self.distro.cdrom_sources and\ + source not in self.distro.child_sources and\ + source not in self.distro.disabled_sources) and\ + source not in self.distro.source_code_sources: + self.sourceslist_visible.append(source) + elif not source.invalid and source in self.distro.cdrom_sources: + contents = self.render_source(source) + self.cdrom_store.append([not source.disabled, contents, + source, False, True]) + + # Sort the sources list + self.sourceslist_visible.sort(key=self.get_comparable) + + for source in self.sourceslist_visible: + contents = self.render_source(source) + self.source_store.append([not source.disabled, contents, + source, False, True]) + + if len(self.source_store) < 1: + self.button_remove.set_sensitive(False) + self.button_edit.set_sensitive(False) + else: + self.treeview_sources.set_cursor(0) + self.distro.get_sources(self.sourceslist) + self.distro_to_widgets() + + def is_separator(self, model, iter, column): + return model.get_value(iter, column) + def reload_keyslist(self): self.keys_store.clear() for key in self.apt_key.list(): @@ -357,20 +848,14 @@ class SoftwareProperties(SimpleGladeApp): #shutil.copy(location, location + ".save") self.sourceslist.backup(".save") self.sourceslist.save() - # show a dialog that a reload of the channel information is required - # only if there is no parent defined - if self.modified == True and \ - self.options.toplevel == None: - d = dialog_cache_outdated.DialogCacheOutdated(self.window_main, - self.datadir) - res = d.run() def on_add_clicked(self, widget): dialog = dialog_add.dialog_add(self.window_main, self.sourceslist, self.datadir) - if dialog.run() == gtk.RESPONSE_OK: - self.reload_sourceslist() - self.modified = True + line = dialog.run() + if line != None: + self.sourceslist.list.append(aptsources.SourceEntry(line)) + self.modified_sourceslist() def on_edit_clicked(self, widget): sel = self.treeview_sources.get_selection() @@ -378,28 +863,19 @@ class SoftwareProperties(SimpleGladeApp): if not iter: return source_entry = model.get_value(iter, LIST_ENTRY_OBJ) - # see if we know what this thing should look like - found_matcher = False - for item in aptsources.SourceEntryTemplates(self.datadir).templates: - if item.matches(source_entry): - found_matcher = True - break - if found_matcher: - dialog = dialog_add.dialog_add(self.window_main, self.sourceslist, - self.datadir, source_entry) - else: - dialog = dialog_edit.dialog_edit(self.window_main, self.sourceslist, - source_entry, self.datadir) + dialog = dialog_edit.dialog_edit(self.window_main, self.sourceslist, + source_entry, self.datadir) if dialog.run() == gtk.RESPONSE_OK: - self.reload_sourceslist() - self.modified = True + self.modified_sourceslist() + # FIXME:outstanding from merge def on_channel_activated(self, treeview, path, column): """Open the edit dialog if a channel was double clicked""" # check if the channel can be edited if self.button_edit.get_property("sensitive") == True: self.on_edit_clicked(treeview) + # FIXME:outstanding from merge def on_treeview_sources_cursor_changed(self, treeview): """set the sensitiveness of the edit and remove button corresponding to the selected channel""" @@ -420,14 +896,14 @@ class SoftwareProperties(SimpleGladeApp): self.button_edit.set_sensitive(True) def on_remove_clicked(self, widget): - sel = self.treeview_sources.get_selection() - (model, iter) = sel.get_selected() + model = self.treeview_sources.get_model() + (path, column) = self.treeview_sources.get_cursor() + iter = model.get_iter(path) if iter: source = model.get_value(iter, LIST_ENTRY_OBJ) self.sourceslist.remove(source) - self.reload_sourceslist() - self.modified = True - + self.modified_sourceslist() + def add_key_clicked(self, widget): chooser = gtk.FileChooserDialog(title=_("Import key"), parent=self.window_main, @@ -462,11 +938,16 @@ class SoftwareProperties(SimpleGladeApp): self.reload_keyslist() def on_delete_event(self, widget, args): - self.save_sourceslist() - self.quit() - + self.on_close_button(widget) + def on_close_button(self, widget): - self.save_sourceslist() + # show a dialog that a reload of the channel information is required + # only if there is no parent defined + if self.modified == True and \ + self.options.toplevel == None: + d = dialog_cache_outdated.DialogCacheOutdated(self.window_main, + self.datadir) + res = d.run() self.quit() def on_help_button(self, widget): @@ -512,13 +993,13 @@ class SoftwareProperties(SimpleGladeApp): self.reload_sourceslist() self.modified = True - def on_channel_toggled(self, cell_toggle, path): - """Enable or disable the selected channel""" - iter = self.source_store.get_iter((int(path),)) - source_entry = self.source_store.get_value(iter, LIST_ENTRY_OBJ) - source_entry.disabled = not source_entry.disabled - self.reload_sourceslist() - self.modified = True + # def on_channel_toggled(self, cell_toggle, path, store): + # """Enable or disable the selected channel""" + # iter = store.get_iter((int(path),)) + # source_entry = store.get_value(iter, LIST_ENTRY_OBJ) + # source_entry.disabled = not source_entry.disabled + # self.reload_sourceslist() + # self.modified = True # FIXME: move this into a different file class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp): @@ -574,3 +1055,4 @@ class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp): return True return False + diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py deleted file mode 100644 index 74ef2f4a..00000000 --- a/SoftwareProperties/aptsources.py +++ /dev/null @@ -1,573 +0,0 @@ -# aptsource.py.in - parse sources.list -# -# Copyright (c) 2004,2005 Canonical -# 2004 Michiel Sikkes -# -# Author: Michiel Sikkes <michiel@eyesopened.nl> -# Michael Vogt <mvo@debian.org> -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA - -import string -import gettext -import re -import apt_pkg -import glob -import shutil -import time -import os.path - -from UpdateManager.Common.DistInfo import DistInfo - - -# some global helpers -def is_mirror(master_uri, compare_uri): - """check if the given add_url is idential or a mirror of orig_uri - e.g. master_uri = archive.ubuntu.com - compare_uri = de.archive.ubuntu.com - -> True - """ - # remove traling spaces and "/" - compare_uri = compare_uri.rstrip("/ ") - master_uri = master_uri.rstrip("/ ") - # uri is identical - if compare_uri == master_uri: - #print "Identical" - return True - # add uri is a master site and orig_uri has the from "XX.mastersite" - # (e.g. de.archive.ubuntu.com) - try: - compare_srv = compare_uri.split("//")[1] - master_srv = master_uri.split("//")[1] - #print "%s == %s " % (add_srv, orig_srv) - except IndexError: # ok, somethings wrong here - #print "IndexError" - return False - # remove the leading "<country>." (if any) and see if that helps - if "." in compare_srv and \ - compare_srv[compare_srv.index(".")+1:] == master_srv: - #print "Mirror" - return True - return False - -def uniq(s): - """ simple (and not efficient) way to return uniq list """ - u = [] - for x in s: - if x not in u: - u.append(x) - return u - - - -# actual source.list entries -class SourceEntry: - - def __init__(self, line,file=None): - self.invalid = False - self.disabled = False - self.type = "" - self.uri = "" - self.dist = "" - self.comps = [] - self.comment = "" - self.line = line - if file == None: - file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") - self.file = file - self.parse(line) - - # works mostely like split but takes [] into account - def mysplit(self, line): - line = string.strip(line) - pieces = [] - tmp = "" - # we are inside a [..] block - p_found = False - space_found = False - for i in range(len(line)): - if line[i] == "[": - p_found=True - tmp += line[i] - elif line[i] == "]": - p_found=False - tmp += line[i] - elif space_found and not line[i].isspace(): # we skip one or more space - space_found = False - pieces.append(tmp) - tmp = line[i] - elif line[i].isspace() and not p_found: # found a whitespace - space_found = True - else: - tmp += line[i] - # append last piece - if len(tmp) > 0: - pieces.append(tmp) - return pieces - - - # parse a given source line and split it into the fields we need - def parse(self,line): - line = string.strip(self.line) - #print line - # check if the source is enabled/disabled - if line == "" or line == "#": # empty line - self.invalid = True - return - if line[0] == "#": - self.disabled = True - pieces = string.split(line[1:]) - # if it looks not like a disabled deb line return - if not (pieces[0] == "deb" or pieces[0] == "deb-src"): - self.invalid = True - return - else: - line = line[1:] - # check for another "#" in the line (this is treated as a comment) - i = line.find("#") - if i > 0: - self.comment = line[i+1:] - line = line[:i] - # source is ok, split it and see what we have - pieces = self.mysplit(line) - # Sanity check - if len(pieces) < 3: - self.invalid = True - return - # Type, deb or deb-src - self.type = string.strip(pieces[0]) - # Sanity check - if self.type not in ("deb", "deb-src"): - self.invalid = True - return - # URI - self.uri = string.strip(pieces[1]) - if len(self.uri) < 1: - self.invalid = True - # distro and components (optional) - # Directory or distro - self.dist = string.strip(pieces[2]) - if len(pieces) > 3: - # List of components - self.comps = pieces[3:] - else: - self.comps = [] - - #print self.__dict__ - - - # set enabled/disabled - def set_enabled(self, new_value): - self.disabled = not new_value - # enable, remove all "#" from the start of the line - if new_value == True: - i=0 - self.line = string.lstrip(self.line) - while self.line[i] == "#": - i += 1 - self.line = self.line[i:] - else: - # disabled, add a "#" - if string.strip(self.line)[0] != "#": - self.line = "#" + self.line - - def __str__(self): - """ debug helper """ - return self.str().strip() - - def str(self): - """ return the current line as string """ - if self.invalid: - return self.line - line = "" - if self.disabled: - line = "# " - line += "%s %s %s" % (self.type, self.uri, self.dist) - if len(self.comps) > 0: - line += " " + " ".join(self.comps) - if self.comment != "": - line += " #"+self.comment - line += "\n" - return line - -# the SourceList file as a class -class SourcesList: - def __init__(self): - self.list = [] # of Type SourceEntries - self.refresh() - - def refresh(self): - self.list = [] - # read sources.list - dir = apt_pkg.Config.FindDir("Dir::Etc") - file = apt_pkg.Config.Find("Dir::Etc::sourcelist") - self.load(dir+file) - # read sources.list.d - partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") - for file in glob.glob("%s/*.list" % partsdir): - self.load(file) - - def __iter__(self): - for entry in self.list: - yield entry - raise StopIteration - - def add(self, type, uri, dist, comps, comment="", pos=-1): - # if there is a repo with the same (type, uri, dist) just add the - # components - for i in self.list: - if i.type == type and is_mirror(uri,i.uri) and i.dist == dist: - comps = uniq(i.comps + comps) - # set to the old position and preserve comment - comment = i.comment - pos = self.list.index(i) - self.list.remove(i) - line = "%s %s %s" % (type,uri,dist) - for c in comps: - line = line + " " + c; - if comment != "": - line = "%s #%s\n" %(line,comment) - line = line + "\n" - self.list.insert(pos, SourceEntry(line)) - - def remove(self, source_entry): - self.list.remove(source_entry) - - def restoreBackup(self, backup_ext): - " restore sources.list files based on the backup extension " - dir = apt_pkg.Config.FindDir("Dir::Etc") - file = apt_pkg.Config.Find("Dir::Etc::sourcelist") - if os.path.exists(dir+file+backup_ext): - shutil.copy(dir+file+backup_ext,dir+file) - # now sources.list.d - partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") - for file in glob.glob("%s/*.list" % partsdir): - if os.path.exists(file+backup_ext): - shutil.copy(file+backup_ext,file) - - def backup(self, backup_ext=None): - """ make a backup of the current source files, if no backup extension - is given, the current date/time is used (and returned) """ - already_backuped = set() - if backup_ext == None: - backup_ext = time.strftime("%y%m%d.%H%M") - for source in self.list: - if not source.file in already_backuped: - shutil.copy(source.file,"%s%s" % (source.file,backup_ext)) - return backup_ext - - def load(self,file): - """ (re)load the current sources """ - f = open(file, "r") - lines = f.readlines() - for line in lines: - source = SourceEntry(line,file) - self.list.append(source) - f.close() - - def save(self): - """ save the current sources """ - files = {} - for source in self.list: - if not files.has_key(source.file): - files[source.file]=open(source.file,"w") - files[source.file].write(source.str()) - for f in files: - files[f].close() - -# templates for the add dialog -class SourceEntryTemplate(SourceEntry): - def __init__(self,a_type,uri,dist,description,comps): - self.comps_descriptions = [] - self.type = a_type - self.uri = uri - self.dist = dist - self.description = description - self.comps = comps - - def matches(self,source_entry): - """ check if a given source_entry matches this one """ - if (self.type != source_entry.type): - return False - if (self.dist != source_entry.dist): - return False - if not is_mirror(self.uri,source_entry.uri): - return False - for e_comp in source_entry.comps: - for t_comp in self.comps: - if e_comp == t_comp.name: break - else: - return False - return True - -class SourceCompTemplate: - def __init__(self, name, description, on_by_default): - self.name = name - self.description = description - self.on_by_default = on_by_default - -class SourceEntryTemplates: - def __init__(self,datadir): - _ = gettext.gettext - self.templates = [] - - dinfo = DistInfo (base_dir=datadir+"channels/") - - for suite in dinfo.suites: - comps = [] - for comp in suite.components: - comps.append(SourceCompTemplate(comp.name, _(comp.description), - comp.enabled)) - self.templates.append (SourceEntryTemplate(suite.repository_type, - suite.base_uri, - suite.name, - suite.description, - comps)) - -# matcher class to make a source entry look nice -# lots of predefined matchers to make it i18n/gettext friendly -class SourceEntryMatcher: - class MatchType: - def __init__(self, a_type,a_descr): - self.type = a_type - self.description = a_descr - - class MatchDist: - def __init__(self,a_uri,a_dist, a_descr,l_comps, l_comps_descr): - self.uri = a_uri - self.dist = a_dist - self.description = a_descr - self.comps = l_comps - self.comps_descriptions = l_comps_descr - - def __init__(self): - _ = gettext.gettext - self.type_list = [] - self.type_list.append(self.MatchType("^deb$",_("Binary"))) - self.type_list.append(self.MatchType("^deb-src$",_("Source"))) - - self.dist_list = [] - - ubuntu_comps = ["^main$","^restricted$","^universe$","^multiverse$"] - ubuntu_comps_descr = [_("Officially supported"), - _("Restricted copyright"), - _("Community maintained (Universe)"), - _("Non-free (Multiverse)")] - # CDs - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06", - ".*", - _("CD disk with Ubuntu 6.06 LTS"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", - ".*", - _("CD disk with Ubuntu 5.10"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", - ".*", - _("CD disk with Ubuntu 5.04"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", - ".*", - _("CD disk with Ubuntu 4.10"), - ubuntu_comps, ubuntu_comps_descr)) - # URIs - # Warty - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty$", - "Ubuntu 4.10", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^warty-security$", - _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-security$", - _("Ubuntu 4.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-updates$", - _("Ubuntu 4.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^warty-backports$", - _("Ubuntu 4.10 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - # Hoary - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-security$", - _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^hoary-security$", - _("Ubuntu 5.04 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary$", - "Ubuntu 5.04", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-updates$", - _("Ubuntu 5.04 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^hoary-backports$", - _("Ubuntu 5.04 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - # Breezy - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-security$", - _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^breezy-security$", - _("Ubuntu 5.10 Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy$", - "Ubuntu 5.10", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-backports$", - _("Ubuntu 5.10 Backports"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^breezy-updates$", - _("Ubuntu 5.10 Updates"), - ubuntu_comps, ubuntu_comps_descr)) - # dapper - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-security$", - _("Ubuntu 6.06 LTS Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", - "^dapper-security$", - _("Ubuntu 6.06 LTS Security Updates"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper$", - "Ubuntu 6.06 LTS", - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-backports$", - _("Ubuntu 6.06 LTS Backports"), - ubuntu_comps, ubuntu_comps_descr)) - self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", - "^dapper-updates$", - _("Ubuntu 6.06 LTS Updates"), - ubuntu_comps, ubuntu_comps_descr)) - - - # DEBIAN - debian_comps = ["^main$","^contrib$","^non-free$","^non-US$"] - debian_comps_descr = [_("Officially supported"), - _("Contributed software"), - _("Non-free software"), - _("US export restricted software") - ] - - # dists by name - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^sarge$", - _("Debian 3.1 \"Sarge\""), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^woody$", - _("Debian 3.0 \"Woody\""), - debian_comps, debian_comps_descr)) - # securtiy - self.dist_list.append(self.MatchDist(".*security.debian.org", - "^stable.*$", - _("Debian Stable Security Updates"), - debian_comps, debian_comps_descr)) - # dists by status - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^stable$", - _("Debian Stable"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^testing$", - _("Debian Testing"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian", - "^unstable$", - _("Debian Unstable \"Sid\""), - debian_comps, debian_comps_descr)) - - # non-us - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^stable.*$", - _("Debian Non-US (Stable)"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^testing.*$", - _("Debian Non-US (Testing)"), - debian_comps, debian_comps_descr)) - self.dist_list.append(self.MatchDist(".*debian.org/debian-non-US", - "^unstable.*$", - _("Debian Non-US (Unstable)"), - debian_comps, debian_comps_descr)) - - - - - def match(self,source): - _ = gettext.gettext - # some sane defaults first - type_description = source.type - dist_description = source.uri + " " + source.dist - comp_description = "" - for c in source.comps: - comp_description = comp_description + " " + c - - for t in self.type_list: - if re.match(t.type, source.type): - type_description = _(t.description) - break - - for d in self.dist_list: - #print "'%s'" %source.uri - if re.match(d.uri, source.uri) and re.match(d.dist,source.dist): - dist_description = d.description - comp_description = "" - for c in source.comps: - found = False - for i in range(len(d.comps)): - if re.match(d.comps[i], c): - comp_description = comp_description+"\n"+d.comps_descriptions[i] - found = True - if found == False: - comp_description = comp_description+" "+c - break - - - return (type_description,dist_description,comp_description) - - -# some simple tests -if __name__ == "__main__": - apt_pkg.InitConfig() - sources = SourcesList() - - for entry in sources: - print entry.str() - #print entry.uri - - mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", - "http://de.archive.ubuntu.com/ubuntu/") - print "is_mirror(): %s" % mirror - - print is_mirror("http://archive.ubuntu.com/ubuntu", - "http://de.archive.ubuntu.com/ubuntu/") diff --git a/SoftwareProperties/dialog_add.py b/SoftwareProperties/dialog_add.py index b5fbe07f..cf9e22c2 100644 --- a/SoftwareProperties/dialog_add.py +++ b/SoftwareProperties/dialog_add.py @@ -6,7 +6,8 @@ # Authors: # Michael Vogt <mvo@debian.org> # Michiel Sikkes <michiels@gnome.org> -# +# Sebastian Heinlein <glatzor@ubuntu.com> +# # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as # published by the Free Software Foundation; either version 2 of the @@ -28,168 +29,44 @@ import gtk import gtk.glade from gettext import gettext as _ -import aptsources -import dialog_edit +import UpdateManager.Common.aptsources as aptsources class dialog_add: - def __init__(self, parent, sourceslist, datadir, source_entry = None): + def __init__(self, parent, sourceslist, datadir): + """ + Initialize the dialog that allows to add a new source entering the + raw apt line + """ self.sourceslist = sourceslist self.parent = parent self.datadir = datadir - self.custom = False - # we have a source_entry that we want to modify - self.source_entry = source_entry - if source_entry: - self.source_entry_index = sourceslist.list.index(source_entry) - else: - self.source_entry_index = None - - # templates - self.templatelist = aptsources.SourceEntryTemplates(datadir) - - # FIXME: simple-glade-app should be able to do all this! - # gtk stuff - self.gladexml = gtk.glade.XML("%s/glade/SoftwarePropertiesDialogs.glade" % datadir) - - self.main = widget = self.gladexml.get_widget("dialog_add") - self.main.set_transient_for(self.parent) - - combo = self.gladexml.get_widget("combobox_what") - self.gladexml.signal_connect("on_combobox_what_changed", self.on_combobox_what_changed, None) - # combox box needs - cell = gtk.CellRendererText() - combo.pack_start(cell, True) - combo.add_attribute(cell, 'text', 0) - self.fill_combo(combo) - if source_entry: - self.main.set_title(_("Edit Channel")) - self.gladexml.get_widget("button_add").set_label("gtk-ok") - self.gladexml.signal_connect("on_button_custom_clicked", - self.on_button_custom_clicked, None) - + self.gladexml = gtk.glade.XML("%s/glade/SoftwarePropertiesDialogs.glade" %\ + datadir) + self.dialog = self.gladexml.get_widget("dialog_add_custom") + self.dialog.set_transient_for(self.parent) + self.entry = self.gladexml.get_widget("entry_source_line") + self.button_add = self.gladexml.get_widget("button_add_source") + self.entry.connect("changed", self.check_line) - def fill_combo(self,combo): - liststore = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT) - matched_template = None - for item in self.templatelist.templates: - liststore.append((item.description, item)) - if self.source_entry and item.matches(self.source_entry): - matched_template = item - combo.set_model(liststore) - if matched_template: - try: - combo.set_active(self.templatelist.templates.index(matched_template)) - vbox = self.gladexml.get_widget("vbox_comps") - for c in vbox.get_children(): - c.set_active(c.get_data("name") in self.source_entry.comps) - except ValueError: - pass + def run(self): + res = self.dialog.run() + self.dialog.hide() + if res == gtk.RESPONSE_OK: + line = self.entry.get_text() + "\n" else: - combo.set_active(0) - - def on_combobox_what_changed(self, combobox, user): - #print "on_combobox_what_changed" - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(lambda widget,vbox: vbox.remove(widget), vbox) - liststore = combobox.get_model() - a_iter = liststore.iter_nth_child(None, combobox.get_active()) - (name, template) = liststore.get(a_iter, 0,1) - self.selected = template - comps = template.comps - for c in comps: - checkbox = gtk.CheckButton(c.description) - checkbox.set_active(c.on_by_default) - checkbox.set_data("name",c.name) - vbox.pack_start(checkbox) - checkbox.show() + line = None + return line - def on_button_custom_clicked(self, widget, data): - #print "on_button_custom_clicked()" - # this hide here is ugly :/ - self.main.hide() - # check if we are in add or edit-matched mode - if self.source_entry: - # we are in "edit" mode - # get the SourceEntry as it is now (with local changes) - # and display the "old" edit dialog - self.selected_comps = [] - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(self.get_enabled_comps) - source_entry = self._make_source_entry() - # since we're passing the SourceEntry as it is now, - # this SourceEntry needs to be in the sourceslist, - # so temporarily swap the original for the current - if source_entry: - self.sourceslist.list[self.source_entry_index] = source_entry - dialog = dialog_edit.dialog_edit(self.parent, self.sourceslist, - source_entry, self.datadir) - res = dialog.run() - if res == gtk.RESPONSE_CANCEL: - # restore original SourceEntry - self.sourceslist.list[self.source_entry_index] = self.source_entry - elif res == gtk.RESPONSE_OK: - # the sourceslist is allready updated, but we'll overwrite it - # in self.run if we're not carefull - self.custom = True + def check_line(self, *args): + """ + Check for a valid apt line and set the sensitiveness of the + button 'add' accordingly + """ + line = self.entry.get_text() + "\n" + source_entry = aptsources.SourceEntry(line) + if source_entry.invalid == True or source_entry.disabled == True: + self.button_add.set_sensitive(False) else: - # we are in "add" mode - dialog = self.gladexml.get_widget("dialog_add_custom") - dialog.set_transient_for(self.parent) - res = dialog.run() - dialog.hide() - entry = self.gladexml.get_widget("entry_source_line") - line = entry.get_text() + "\n" - self.sourceslist.list.append(aptsources.SourceEntry(line)) - self.main.response(res) + self.button_add.set_sensitive(True) - def get_enabled_comps(self, checkbutton): - if checkbutton.get_active(): - self.selected_comps.append(checkbutton.get_data("name")) - - def _make_source_entry(self): - " helper for the 'edit' mode " - # we use "selected" for pretty much everything *but* we use - # self.source_entry.uri to make sure that the mirror information is - # preserved - - line = "%s %s %s" % (self.selected.type, self.source_entry.uri, self.selected.dist) - if self.source_entry.disabled: - line = "#" + line - if len(self.selected.comps) > 0 and len(self.selected_comps) == 0: - line = "#" + line - elif len(self.selected_comps) > 0: - line += " " + " ".join(self.selected_comps) - if self.selected.matches(self.source_entry) and self.source_entry.comment != "": - line += " #"+self.source_entry.comment - line += "\n" - return aptsources.SourceEntry(line,self.source_entry.file) - - def run(self): - res = self.main.run() - if res == gtk.RESPONSE_OK: - # add repository - self.selected_comps = [] - vbox = self.gladexml.get_widget("vbox_comps") - vbox.foreach(self.get_enabled_comps) - - # check if we are in 'add' or 'edit' mode - if self.source_entry: - # 'edit' - ode - # check if there are no selected components - if len(self.selected_comps) < 1: - # remove the source - self.sourceslist.remove(self.source_entry) - else: - if not self.custom: - entry = self._make_source_entry() - if entry: - self.sourceslist.list[self.source_entry_index] = entry - else: - # 'add' mode - self.sourceslist.add(self.selected.type, - self.selected.uri, - self.selected.dist, - self.selected_comps) - self.main.hide() - return res diff --git a/SoftwareProperties/dialog_add_sources_list.py b/SoftwareProperties/dialog_add_sources_list.py new file mode 100644 index 00000000..3b581c6c --- /dev/null +++ b/SoftwareProperties/dialog_add_sources_list.py @@ -0,0 +1,127 @@ +#!/usr/bin/env python +import pygtk +import gtk +import gtk.glade +import gobject +import os +from optparse import OptionParser +from gettext import gettext as _ +import gettext +import urllib +from utils import * + +from UpdateManager.Common.aptsources import SourcesList, SourceEntryMatcher + + +class AddSourcesList: + def __init__(self, parent, sourceslist, source_renderer, + get_comparable, datadir, file): + print file + self.parent = parent + self.source_renderer = source_renderer + self.sourceslist = sourceslist + self.get_comparable = get_comparable + 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_add_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.button_replace = self.glade.get_widget("button_replace") + self.treeview = self.glade.get_widget("treeview_sources") + 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.new_sources = SingleSourcesList(self.file) + except: + self.error() + return + + # show the found channels or an error message + if len(self.new_sources.list) > 0: + counter = 0 + + for source in self.new_sources.list: + if source.invalid or source.disabled: + continue + self.new_sources.matcher.match(source) + # sort the list + self.new_sources.list.sort(key=self.get_comparable) + + for source in self.new_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("Install software additionally or " + "only from this source?", + "Install software additionally or " + "only from these sources?", + counter) + body = _("You can either add the following sources or replace your " + "current sources by them. Only install software from " + "trusted sources.") + self.label.set_markup("<big><b>%s</b></big>\n\n%s" % (header, body)) + else: + self.error() + return + + def error(self): + self.button_add.hide() + self.button_cancel.set_use_stock(True) + self.button_cancel.set_label("gtk-close") + self.button_replace.hide() + self.scrolled.hide() + self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) + header = _("There are no sources to install software from") + body = _("The file '%s' does not contain any valid " + "software sources." % self.file) + self.label.set_markup("<big><b>%s</b></big>\n\n%s" % (header, body)) + + def run(self): + res = self.dialog.run() + self.dialog.destroy() + return res, self.new_sources + + 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/SoftwareProperties/dialog_edit.py b/SoftwareProperties/dialog_edit.py index 59788915..0eedd3b8 100644 --- a/SoftwareProperties/dialog_edit.py +++ b/SoftwareProperties/dialog_edit.py @@ -27,7 +27,7 @@ import gobject import gtk import gtk.glade -import aptsources +import UpdateManager.Common.aptsources as aptsources class dialog_edit: def __init__(self, parent, sourceslist, source_entry, datadir): diff --git a/UpdateManager/Common/DistInfo.py b/UpdateManager/Common/DistInfo.py index 102b981c..7d2d37ad 100644 --- a/UpdateManager/Common/DistInfo.py +++ b/UpdateManager/Common/DistInfo.py @@ -28,21 +28,30 @@ import ConfigParser _ = gettext.gettext class Suite: - name = None - description = None - base_uri = None - repository_type = None - components = None + def __init__(self): + self.name = None + self.child = False + self.match_name = None + self.description = None + self.base_uri = None + self.type = None + self.components = {} + self.children = [] + self.match_uri = None + self.distribution = None + self.available = True class Component: - name = None - description = None - enabled = None + def __init__(self): + self.name = "" + self.description = "" + self.description_long = "" + self.enabled = None class DistInfo: def __init__(self, dist = None, - base_dir = "/usr/share/update-manager/dists"): + base_dir = "/usr/share/update-manager/channels"): self.metarelease_uri = '' self.suites = [] @@ -73,43 +82,68 @@ class DistInfo: elif field == 'Suite': if suite: if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled, + component.description_long) component = None self.suites.append (suite) suite = Suite () suite.name = value - suite.components = [] + suite.distribution = dist + suite.match_name = "^%s$" % value + elif field == 'MatchName': + suite.match_name = value + elif field == 'ParentSuite': + suite.child = True + for nanny in self.suites: + if nanny.name == value: + nanny.children.append(suite) + elif field == 'Available': + suite.available = value elif field == 'RepositoryType': - suite.repository_type = value + suite.type = value elif field == 'BaseURI': suite.base_uri = value + suite.match_uri = value + elif field == 'MatchURI': + suite.match_uri = value elif field == 'Description': suite.description = _(value) elif field == 'Component': if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled, + component.description_long) component = Component () component.name = value elif field == 'Enabled': component.enabled = bool(int(value)) elif field == 'CompDescription': component.description = _(value) + elif field == 'CompDescriptionLong': + component.description_long = _(value) if suite: if component: - suite.components.append (component) + suite.components["%s" % component.name] = \ + (component.description, component.enabled, + component.description_long) component = None self.suites.append (suite) suite = None if __name__ == "__main__": - d = DistInfo ("Debian", "../../channels") + d = DistInfo ("Ubuntu", "../../channels") print d.changelogs_uri for suite in d.suites: - print suite.name - print suite.description - print suite.base_uri + print "\nSuite: %s" % suite.name + print "Desc: %s" % suite.description + print "BaseURI: %s" % suite.base_uri + print "MatchURI: %s" % suite.match_uri for component in suite.components: - print component.name - print component.description - print component.enabled + print " %s - %s - %s - %s" % (component, + suite.components[component][0], + suite.components[component][1], + suite.components[component][2]) + for child in suite.children: + print " %s" % child.description diff --git a/UpdateManager/Common/aptsources.py b/UpdateManager/Common/aptsources.py new file mode 100644 index 00000000..3d317b15 --- /dev/null +++ b/UpdateManager/Common/aptsources.py @@ -0,0 +1,672 @@ +# aptsource.py.in - parse sources.list +# +# Copyright (c) 2004,2005 Canonical +# 2004 Michiel Sikkes +# +# Author: Michiel Sikkes <michiel@eyesopened.nl> +# Michael Vogt <mvo@debian.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA + +import string +import gettext +import re +import apt_pkg +import glob +import shutil +import time +import os.path + +#import pdb + +from UpdateManager.Common.DistInfo import DistInfo + + +# some global helpers +def is_mirror(master_uri, compare_uri): + """check if the given add_url is idential or a mirror of orig_uri + e.g. master_uri = archive.ubuntu.com + compare_uri = de.archive.ubuntu.com + -> True + """ + # remove traling spaces and "/" + compare_uri = compare_uri.rstrip("/ ") + master_uri = master_uri.rstrip("/ ") + # uri is identical + if compare_uri == master_uri: + #print "Identical" + return True + # add uri is a master site and orig_uri has the from "XX.mastersite" + # (e.g. de.archive.ubuntu.com) + try: + compare_srv = compare_uri.split("//")[1] + master_srv = master_uri.split("//")[1] + #print "%s == %s " % (add_srv, orig_srv) + except IndexError: # ok, somethings wrong here + #print "IndexError" + return False + # remove the leading "<country>." (if any) and see if that helps + if "." in compare_srv and \ + compare_srv[compare_srv.index(".")+1:] == master_srv: + #print "Mirror" + return True + return False + +def uniq(s): + """ simple and efficient way to return uniq list """ + return list(set(s)) + + + +# actual source.list entries +class SourceEntry: + + def __init__(self, line,file=None): + self.invalid = False + self.disabled = False + self.type = "" + self.uri = "" + self.dist = "" + self.comps = [] + self.comment = "" + self.line = line + if file == None: + file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") + self.file = file + self.parse(line) + self.template = None + self.children = [] + + # works mostely like split but takes [] into account + def mysplit(self, line): + line = string.strip(line) + pieces = [] + tmp = "" + # we are inside a [..] block + p_found = False + space_found = False + for i in range(len(line)): + if line[i] == "[": + p_found=True + tmp += line[i] + elif line[i] == "]": + p_found=False + tmp += line[i] + elif space_found and not line[i].isspace(): # we skip one or more space + space_found = False + pieces.append(tmp) + tmp = line[i] + elif line[i].isspace() and not p_found: # found a whitespace + space_found = True + else: + tmp += line[i] + # append last piece + if len(tmp) > 0: + pieces.append(tmp) + return pieces + + + # parse a given source line and split it into the fields we need + def parse(self,line): + line = string.strip(self.line) + #print line + # check if the source is enabled/disabled + if line == "" or line == "#": # empty line + self.invalid = True + return + if line[0] == "#": + self.disabled = True + pieces = string.split(line[1:]) + # if it looks not like a disabled deb line return + if not (pieces[0] == "deb" or pieces[0] == "deb-src"): + self.invalid = True + return + else: + line = line[1:] + # check for another "#" in the line (this is treated as a comment) + i = line.find("#") + if i > 0: + self.comment = line[i+1:] + line = line[:i] + # source is ok, split it and see what we have + pieces = self.mysplit(line) + # Sanity check + if len(pieces) < 3: + self.invalid = True + return + # Type, deb or deb-src + self.type = string.strip(pieces[0]) + # Sanity check + if self.type not in ("deb", "deb-src"): + self.invalid = True + return + # URI + self.uri = string.strip(pieces[1]) + if len(self.uri) < 1: + self.invalid = True + # distro and components (optional) + # Directory or distro + self.dist = string.strip(pieces[2]) + if len(pieces) > 3: + # List of components + self.comps = pieces[3:] + else: + self.comps = [] + + #print self.__dict__ + + + # set enabled/disabled + def set_enabled(self, new_value): + self.disabled = not new_value + # enable, remove all "#" from the start of the line + if new_value == True: + i=0 + self.line = string.lstrip(self.line) + while self.line[i] == "#": + i += 1 + self.line = self.line[i:] + else: + # disabled, add a "#" + if string.strip(self.line)[0] != "#": + self.line = "#" + self.line + + def __str__(self): + """ debug helper """ + return self.str().strip() + + def str(self): + """ return the current line as string """ + if self.invalid: + return self.line + line = "" + if self.disabled: + line = "# " + line += "%s %s %s" % (self.type, self.uri, self.dist) + if len(self.comps) > 0: + line += " " + " ".join(self.comps) + if self.comment != "": + line += " #"+self.comment + line += "\n" + return line + +# the SourceList file as a class +class NullMatcher(object): + def match(self, s): + return True + +class SourcesList: + def __init__(self, withMatcher=True): + self.list = [] # of Type SourceEntries + if withMatcher: + self.matcher = SourceEntryMatcher() + else: + self.matcher = NullMatcher() + self.refresh() + + def refresh(self): + self.list = [] + # read sources.list + dir = apt_pkg.Config.FindDir("Dir::Etc") + file = apt_pkg.Config.Find("Dir::Etc::sourcelist") + self.load(dir+file) + # read sources.list.d + partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + self.load(file) + # check if the source item fits a predefined template + for source in self.list: + if source.invalid == False: + self.matcher.match(source) + + def __iter__(self): + for entry in self.list: + yield entry + raise StopIteration + + def add(self, type, uri, dist, comps, comment="", pos=-1, file=None): + """ + Add a new source to the sources.list. + The method will search for existing matching repos and will try to + reuse them as far as possible + """ + for source in self.list: + # if there is a repo with the same (type, uri, dist) just add the + # components + if source.disabled == False and source.invalid == False and \ + source.type == type and uri == source.uri and \ + source.dist == dist: + comps = uniq(source.comps + comps) + source.comps = comps + return source + # if there is a corresponding repo which is disabled, enable it + elif source.disabled == True and source.invalid == False and \ + source.type == type and uri == source.uri and \ + source.dist == dist and \ + len(set(source.comps) & set(comps)) == len(comps): + source.disabled = False + return source + # there isn't any matching source, so create a new line and parse it + line = "%s %s %s" % (type,uri,dist) + for c in comps: + line = line + " " + c; + if comment != "": + line = "%s #%s\n" %(line,comment) + line = line + "\n" + new_entry = SourceEntry(line) + if file != None: + new_entry.file = file + self.matcher.match(new_entry) + self.list.insert(pos, new_entry) + return new_entry + + def remove(self, source_entry): + self.list.remove(source_entry) + + def restoreBackup(self, backup_ext): + " restore sources.list files based on the backup extension " + dir = apt_pkg.Config.FindDir("Dir::Etc") + file = apt_pkg.Config.Find("Dir::Etc::sourcelist") + if os.path.exists(dir+file+backup_ext): + shutil.copy(dir+file+backup_ext,dir+file) + # now sources.list.d + partsdir = apt_pkg.Config.FindDir("Dir::Etc::sourceparts") + for file in glob.glob("%s/*.list" % partsdir): + if os.path.exists(file+backup_ext): + shutil.copy(file+backup_ext,file) + + def backup(self, backup_ext=None): + """ make a backup of the current source files, if no backup extension + is given, the current date/time is used (and returned) """ + already_backuped = set() + if backup_ext == None: + backup_ext = time.strftime("%y%m%d.%H%M") + for source in self.list: + if not source.file in already_backuped: + shutil.copy(source.file,"%s%s" % (source.file,backup_ext)) + return backup_ext + + def load(self,file): + """ (re)load the current sources """ + try: + f = open(file, "r") + lines = f.readlines() + for line in lines: + source = SourceEntry(line,file) + self.list.append(source) + except: + print "could not open file '%s'" % file + else: + f.close() + + def save(self): + """ save the current sources """ + files = {} + for source in self.list: + if not files.has_key(source.file): + files[source.file]=open(source.file,"w") + files[source.file].write(source.str()) + for f in files: + files[f].close() + + def check_for_relations(self, sources_list): + """get all parent and child channels in the sources list""" + parents = [] + used_child_templates = {} + for source in sources_list: + # try to avoid checking uninterressting sources + if source.template == None: + continue + # set up a dict with all used child templates and corresponding + # source entries + if source.template.child == True: + key = source.template + if not used_child_templates.has_key(key): + used_child_templates[key] = [] + temp = used_child_templates[key] + temp.append(source) + else: + # store each source with children aka. a parent :) + if len(source.template.children) > 0: + parents.append(source) + #print self.used_child_templates + #print self.parents + return (parents, used_child_templates) + +# templates for the add dialog +class SourceEntryTemplate(SourceEntry): + def __init__(self,a_type,uri,dist,description,comps): + self.comps_descriptions = [] + self.type = a_type + self.uri = uri + self.dist = dist + self.description = description + self.comps = comps + + def matches(self,source_entry): + """ check if a given source_entry matches this one """ + if (self.type != source_entry.type): + return False + if (self.dist != source_entry.dist): + return False + if not is_mirror(self.uri,source_entry.uri): + return False + for e_comp in source_entry.comps: + for t_comp in self.comps: + if e_comp == t_comp.name: break + else: + return False + return True + +class SourceCompTemplate: + def __init__(self, name, description, on_by_default): + self.name = name + self.description = description + self.on_by_default = on_by_default + +class SourceEntryTemplates: + def __init__(self,datadir): + _ = gettext.gettext + self.templates = [] + + dinfo = DistInfo (base_dir=datadir+"channels/") + + for suite in dinfo.suites: + comps = [] + for comp in suite.components: + comps.append(SourceCompTemplate(comp.name, _(comp.description), + comp.enabled)) + self.templates.append (SourceEntryTemplate(suite.repository_type, + suite.base_uri, + suite.name, + suite.description, + comps)) + +# matcher class to make a source entry look nice +# lots of predefined matchers to make it i18n/gettext friendly +class SourceEntryMatcher: + class MatchType: + def __init__(self, a_type,a_descr): + self.type = a_type + self.description = a_descr + + class MatchDist: + def __init__(self,a_uri,a_dist, a_descr,l_comps, l_comps_descr): + self.uri = a_uri + self.dist = a_dist + self.description = a_descr + self.comps = l_comps + self.comps_descriptions = l_comps_descr + + def __init__(self): + self.templates = [] + # Get the human readable channel and comp names from the channel .infos + spec_files = glob.glob("/usr/share/update-manager/channels/*.info") + for f in spec_files: + f = os.path.basename(f) + i = f.find(".info") + f = f[0:i] + dist = DistInfo(f) + for suite in dist.suites: + if suite.match_uri != None: + self.templates.append(suite) + return + + def match(self, source): + """Add a matching template to the source""" + _ = gettext.gettext + found = False + for template in self.templates: + #print "'%s'" %source.uri + if re.search(template.match_uri, source.uri) and \ + re.match(template.match_name, source.dist): + found = True + source.template = template + break + return found + +class Distribution: + def __init__(self): + """" + Container for distribution specific informations + """ + # LSB information + self.id = "" + self.codename = "" + self.description = "" + self.release = "" + + # get the LSB information + lsb_info = [] + for lsb_option in ["-i", "-c", "-d", "-r"]: + pipe = os.popen("lsb_release %s | cut -d : -f 2-" % lsb_option) + lsb_info.append(pipe.read().strip()) + del pipe + (self.id, self.codename, self.description, self.release) = lsb_info + + # get a list of country codes and real names + self.countries = {} + try: + f = open("/usr/share/iso-codes/iso_3166.tab", "r") + lines = f.readlines() + for line in lines: + parts = line.split("\t") + self.countries[parts[0].lower()] = parts[1] + except: + print "could not open file '%s'" % file + else: + f.close() + + def get_sources(self, sources_list): + """ + Find the corresponding template, main and child sources + for the distribution + """ + # corresponding sources + self.source_template = None + self.child_sources = [] + self.main_sources = [] + self.disabled_sources = [] + self.cdrom_sources = [] + self.download_comps = [] + self.enabled_comps = [] + self.cdrom_comps = [] + self.used_media = [] + self.get_source_code = False + self.source_code_sources = [] + + # location of the sources + self.default_server = "" + self.main_server = "" + self.nearest_server = "" + self.used_servers = [] + + # find the distro template + for template in sources_list.matcher.templates: + if template.name == self.codename and\ + template.distribution == self.id: + #print "yeah! found a template for %s" % self.description + #print template.description, template.base_uri, template.components + self.source_template = template + break + if self.source_template == None: + print "Error: could not find a distribution template" + # FIXME: will go away - only for debugging issues + sys.exit(1) + + # find main and child sources + media = [] + comps = [] + cdrom_comps = [] + enabled_comps = [] + source_code = [] + for source in sources_list.list: + if source.invalid == False and\ + source.dist == self.codename and\ + source.template and\ + source.template.name == self.codename: + #print "yeah! found a distro repo: %s" % source.line + # cdroms need do be handled differently + if source.uri.startswith("cdrom:") and \ + source.disabled == False: + self.cdrom_sources.append(source) + cdrom_comps.extend(source.comps) + elif source.uri.startswith("cdrom:") and \ + source.disabled == True: + self.cdrom_sources.append(source) + elif source.type == "deb" and source.disabled == False: + self.main_sources.append(source) + comps.extend(source.comps) + media.append(source.uri) + elif source.type == "deb" and source.disabled == True: + self.disabled_sources.append(source) + elif source.type.endswith("-src") and source.disabled == False: + self.source_code_sources.append(source) + elif source.type.endswith("-src") and source.disabled == True: + self.disabled_sources.append(source) + if source.template in self.source_template.children: + #print "yeah! child found: %s" % source.template.name + if source.type == "deb": + self.child_sources.append(source) + elif source.type == "deb-src": + self.source_code_sources.append(source) + self.download_comps = set(comps) + self.cdrom_comps = set(cdrom_comps) + enabled_comps.extend(comps) + enabled_comps.extend(cdrom_comps) + self.enabled_comps = set(enabled_comps) + self.used_media = set(media) + + self.get_mirrors() + + def get_mirrors(self): + """ + Provide a set of mirrors where you can get the distribution from + """ + # the main server is stored in the template + self.main_server = self.source_template.base_uri + + # try to guess the nearest mirror from the locale + # FIXME: for debian we need something different + if self.id == "Ubuntu": + locale = os.getenv("LANG", default="en.UK") + a = locale.find("_") + z = locale.find(".") + if z == -1: + z = len(locale) + country_code = locale[a+1:z].lower() + self.nearest_server = "http://%s.archive.ubuntu.com/ubuntu/" % \ + country_code + if self.countries.has_key(country_code): + self.country = self.countries[country_code] + else: + self.country = None + + # other used servers + for medium in self.used_media: + if not medium.startswith("cdrom:"): + # seems to be a network source + self.used_servers.append(medium) + + if len(self.main_sources) == 0: + self.default_server = self.main_server + else: + self.default_server = self.main_sources[0].uri + + def add_source(self, sources_list, type=None, + uri=None, dist=None, comps=None, comment=""): + """ + Add distribution specific sources + """ + if uri == None: + # FIXME: Add support for the server selector + uri = self.default_server + if dist == None: + dist = self.codename + if comps == None: + comps = list(self.enabled_comps) + if type == None: + type = "deb" + if comment == "": + comment == "Added by software-properties" + new_source = sources_list.add(type, uri, dist, comps, comment) + # if source code is enabled add a deb-src line after the new + # source + if self.get_source_code == True and not type.endswith("-src"): + sources_list.add("%s-src" % type, uri, dist, comps, comment, + file=new_source.file, + pos=sources_list.list.index(new_source)+1) + + def enable_component(self, sourceslist, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + + sourceslist: an aptsource.sources_list + comp: the component that should be enabled + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + # check if there is a main source at all + if len(self.main_sources) < 1: + # create a new main source + self.add_source(sourceslist, comps=["%s"%comp]) + else: + # add the comp to all main, child and source code sources + for source in sources: + if comp not in source.comps: + source.comps.append(comp) + if self.get_source_code == True: + for source in self.source_code_sources: + if comp not in source.comps: source.comps.append(comp) + + def disable_component(self, sourceslist, comp): + """ + Disable a component in all main, child and source code sources + (excluding cdrom based sources) + """ + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + sources.extend(self.source_code_sources) + if comp in self.cdrom_comps: + sources = [] + sources.extend(self.main_sources) + + for source in sources: + if comp in source.comps: + source.comps.remove(comp) + if len(source.comps) < 1: + sourceslist.remove(source) + + +# some simple tests +if __name__ == "__main__": + apt_pkg.InitConfig() + sources = SourcesList() + + for entry in sources: + print entry.str() + #print entry.uri + + mirror = is_mirror("http://archive.ubuntu.com/ubuntu/", + "http://de.archive.ubuntu.com/ubuntu/") + print "is_mirror(): %s" % mirror + + print is_mirror("http://archive.ubuntu.com/ubuntu", + "http://de.archive.ubuntu.com/ubuntu/") diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index aa51066a..af07cfb4 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -105,15 +105,13 @@ class DistUpgradeFetcher(object): return True def gpgauthenticate(self, file, signature, - keyring='/etc/apt/trusted.gpg', - trustdb='/etc/apt/trustdb.gpg'): + keyring='/etc/apt/trusted.gpg'): """ authenticated a file against a given signature, if no keyring is given use the apt default keyring """ gpg = GnuPGInterface.GnuPG() gpg.options.extra_args = ['--no-options', '--no-default-keyring', - '--trustdb-name',trustdb, '--keyring', keyring] proc = gpg.run(['--verify', signature, file], create_fhs=['status','logger','stderr']) @@ -190,7 +188,10 @@ class DistUpgradeFetcher(object): def runDistUpgrader(self): #print "runing: %s" % script - os.execv(self.script,[]) + if os.getuid() != 0: + os.execv("/usr/bin/gksu",["gksu",self.script]) + else: + os.execv(self.script,[self.script]) def cleanup(self): # cleanup diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py index 57a808ee..70993eaf 100644 --- a/UpdateManager/MetaRelease.py +++ b/UpdateManager/MetaRelease.py @@ -60,8 +60,15 @@ class MetaRelease(gobject.GObject): def __init__(self, useDevelopmentRelase=False): gobject.GObject.__init__(self) + # check what uri to use if useDevelopmentRelase: self.METARELEASE_URI = self.METARELEASE_URI_UNSTABLE + # check if we can access the METARELEASE_FILE + if not os.access(self.METARELEASE_FILE, os.F_OK|os.W_OK|os.R_OK): + path = os.path.expanduser("~/.update-manager/") + if not os.path.exists(path): + os.mkdir(path) + self.METARELEASE_FILE = os.path.join(path,"meta-release") self.metarelease_information = None self.downloading = True # we start the download thread here and we have a timeout @@ -168,6 +175,3 @@ class MetaRelease(gobject.GObject): if os.path.exists(self.METARELEASE_FILE): f=open(self.METARELEASE_FILE,"r") -# register in the gobject system, needed for older versions of pygtk, -# never ones do this automatically -gobject.type_register(MetaRelease) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index d4cc7a59..2e2433a8 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -69,8 +69,7 @@ from MetaRelease import Dist, MetaRelease # - kill "all_changes" and move the changes into the "Update" class # list constants -(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_SHORTDESC, - LIST_VERSION, LIST_LONG_DESCR, LIST_PKG) = range(7) +(LIST_INSTALL, LIST_CONTENTS, LIST_NAME, LIST_PKG) = range(4) # actions for "invoke_manager" (INSTALL, UPDATE) = range(2) @@ -83,11 +82,19 @@ CHANGELOGS_URI="http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chan class MyCache(apt.Cache): def __init__(self, progress): apt.Cache.__init__(self, progress) + self._initDepCache() assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0 self.all_changes = {} + def _initDepCache(self): + #apt_pkg.Config.Set("Debug::pkgPolicy","1") + #self.depcache = apt_pkg.GetDepCache(self.cache) + #self._depcache = apt_pkg.GetDepCache(self._cache) + self._depcache.ReadPinFile() + if os.path.exists(SYNAPTIC_PINFILE): + self._depcache.ReadPinFile(SYNAPTIC_PINFILE) + self._depcache.Init() def clean(self): - for pkg in self: - pkg.markKeep() + self._initDepCache() def saveDistUpgrade(self): """ this functions mimics a upgrade but will never remove anything """ self._depcache.Upgrade(True) @@ -193,23 +200,44 @@ class MyCache(apt.Cache): lock.release() class UpdateList: + ORIGIN_MAPPING = { ("edgy-security","Ubuntu"): _("Ubuntu security updates"), + ("edgy-updates","Ubuntu"): _("Ubuntu important updates"), + ("edgy-backports","Ubuntu"): _("Ubuntu backports"), + ("edgy","Ubuntu"): _("Ubuntu updates") + } + def __init__(self, parent_window): - self.pkgs = [] + # a map of packages under their origin + self.pkgs = {} self.num_updates = 0 self.parent_window = parent_window def update(self, cache): held_back = [] broken = [] + + # do the upgrade cache.saveDistUpgrade() + + # sort by origin for pkg in cache: if pkg.markedUpgrade or pkg.markedInstall: - self.pkgs.append(pkg) + originstr = _("Unknown") + for aorigin in pkg.candidateOrigin: + archive = aorigin.archive + origin = aorigin.origin + if self.ORIGIN_MAPPING.has_key((archive,origin)) and aorigin.trusted: + originstr = self.ORIGIN_MAPPING[(archive,origin)] + if not self.pkgs.has_key(originstr): + self.pkgs[originstr] = [] + self.pkgs[originstr].append(pkg) self.num_updates = self.num_updates + 1 elif pkg.isUpgradable: - #print "MarkedKeep: %s " % pkg.name held_back.append(pkg.name) - self.pkgs.sort(lambda x,y: cmp(x.name,y.name)) + for l in self.pkgs.keys(): + self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) + + # check if we have held-back something if cache._depcache.KeepCount > 0: #print "WARNING, keeping packages" msg = ("<big><b>%s</b></big>\n\n%s" % \ @@ -287,8 +315,7 @@ class UpdateManager(SimpleGladeApp): self.button_close.connect("clicked", lambda w: self.exit()) # the treeview (move into it's own code!) - self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, str, str, str, - gobject.TYPE_PYOBJECT) + self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, gobject.TYPE_PYOBJECT) self.treeview_update.set_model(self.store) self.treeview_update.set_headers_clickable(True); @@ -299,20 +326,23 @@ class UpdateManager(SimpleGladeApp): cr.set_property("activatable", True) cr.set_property("xpad", 10) cr.connect("toggled", self.toggled) - self.cb = gtk.TreeViewColumn("Install", cr, active=LIST_INSTALL) - c0 = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) - c0.set_resizable(True) + + column_install = gtk.TreeViewColumn("Install", cr) + column_install.set_cell_data_func (cr, self.install_column_view_func) + column = gtk.TreeViewColumn("Name", tr, markup=LIST_CONTENTS) + column.set_cell_data_func (tr, self.package_column_view_func) + column.set_resizable(True) major,minor,patch = gtk.pygtk_version if (major >= 2) and (minor >= 5): - self.cb.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - self.cb.set_fixed_width(30) - c0.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) - c0.set_fixed_width(100) + column_install.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column_install.set_fixed_width(30) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + column.set_fixed_width(100) #self.treeview_update.set_fixed_height_mode(True) - self.treeview_update.append_column(self.cb) - self.cb.set_visible(True) - self.treeview_update.append_column(c0) + self.treeview_update.append_column(column_install) + column_install.set_visible(True) + self.treeview_update.append_column(column) self.treeview_update.set_search_column(LIST_NAME) @@ -348,6 +378,24 @@ class UpdateManager(SimpleGladeApp): self.restore_state() self.window_main.show() + def header_column_func(self, cell_layot, renderer, model, iter): + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + renderer.set_property("cell-background","yellow") + else: + renderer.set_property("cell-background", None) + + def install_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + pkg = model.get_value(iter, LIST_PKG) + to_install = model.get_value(iter, LIST_INSTALL) + renderer.set_property("active", to_install) + # hide it if we are only a header line + renderer.set_property("visible", pkg != None) + + def package_column_view_func(self, cell_layout, renderer, model, iter): + self.header_column_func(cell_layout, renderer, model, iter) + def setupDbus(self): """ this sets up a dbus listener if none is installed alread """ # check if there is another g-a-i already and if not setup one @@ -389,24 +437,17 @@ class UpdateManager(SimpleGladeApp): return for line in lines: - end_iter = changes_buffer.get_end_iter() - - version_match = re.match(r'^%s \((.*)\)(.*)$' % re.escape(srcpkg), line) + version_match = re.match(r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line) #bullet_match = re.match("^.*[\*-]", line) author_match = re.match("^.*--.*<.*@.*>.*$", line) if version_match: version = version_match.group(1) + upload_archive = version_match.group(2).strip() version_text = _("Version %s: \n") % version changes_buffer.insert_with_tags_by_name(end_iter, version_text, "versiontag") - # mvo: disabled for now as it does not catch multi line entries - # (see ubuntu #7034 for rational) - #elif bullet_match and not author_match: - # bullet_text = " " + line + "\n" - # changes_buffer.insert(end_iter, bullet_text) elif (author_match): pass - #chanages_buffer.insert(end_iter, "\n") else: changes_buffer.insert(end_iter, line+"\n") @@ -421,7 +462,10 @@ class UpdateManager(SimpleGladeApp): iter = model.get_iter(path) # set descr - long_desc = model.get_value(iter, LIST_LONG_DESCR) + pkg = model.get_value(iter, LIST_PKG) + if pkg == None: + return + long_desc = pkg.description if long_desc == None: return # Skip the first line - it's a duplicate of the summary @@ -518,7 +562,7 @@ class UpdateManager(SimpleGladeApp): self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() - self.treeview_update.set_cursor(0) + self.treeview_update.set_cursor(1) self.label_header.set_markup(text_header) self.label_downsize.set_markup(text_download) @@ -649,17 +693,16 @@ class UpdateManager(SimpleGladeApp): self.list.update(self.cache) if self.list.num_updates > 0: i=0 - for pkg in self.list.pkgs: - - name = xml.sax.saxutils.escape(pkg.name) - summary = xml.sax.saxutils.escape(pkg.summary) - contents = "<big><b>%s</b></big>\n<small>%s\n\n" % (name, summary) - contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "</small>" - - iter = self.store.append([True, contents, pkg.name, pkg.summary, - pkg.candidateVersion, pkg.description, pkg]) - self.add_update(pkg) - i = i + 1 + for origin in self.list.pkgs.keys(): + self.store.append([False, '<span weight="bold" size="large">%s</span>' % origin, origin, None]) + for pkg in self.list.pkgs[origin]: + name = xml.sax.saxutils.escape(pkg.name) + summary = xml.sax.saxutils.escape(pkg.summary) + contents = "<big><b>%s</b></big>\n<small>%s\n\n" % (name, summary) + contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "</small>" + iter = self.store.append([True, contents, pkg.name, pkg]) + self.add_update(pkg) + i = i + 1 self.update_count() # use the normal cursor @@ -687,23 +730,6 @@ class UpdateManager(SimpleGladeApp): fetcher.run() def new_dist_available(self, meta_release, upgradable_to): - #print "new_dist_available: %s" % upgradable_to.name - # check if the user already knowns about this dist - #seen = self.gconfclient.get_string("/apps/update-manager/seen_dist") - #if name == seen: - # return - - #msg = "<big><b>%s</b></big>\n\n%s" % (_("There is a new release of Ubuntu available!"), _("A new release with the codename '%s' is available. Please see http://www.ubuntulinux.org/ for upgrade instructions.") % name) - #dialog = gtk.MessageDialog(self.window_main, 0, gtk.MESSAGE_INFO, - # gtk.BUTTONS_CLOSE, "") - #dialog.set_markup(msg) - #check = gtk.CheckButton(_("Never show this message again")) - #check.show() - #dialog.vbox.pack_start(check) - #dialog.run() - #if check.get_active(): - # self.gconfclient.set_string("/apps/update-manager/seen_dist",name) - #dialog.destroy() self.frame_new_release.show() self.label_new_release.set_markup(_("<b>New distribution release '%s' is available</b>") % upgradable_to.version) self.new_dist = upgradable_to @@ -755,13 +781,6 @@ class UpdateManager(SimpleGladeApp): sys.exit(1) else: progress.hide() - #apt_pkg.Config.Set("Debug::pkgPolicy","1") - #self.depcache = apt_pkg.GetDepCache(self.cache) - self.cache._depcache.ReadPinFile() - if os.path.exists(SYNAPTIC_PINFILE): - self.cache._depcache.ReadPinFile(SYNAPTIC_PINFILE) - self.cache._depcache.Init() - def check_auto_update(self): # Check if automatic update is enabled. If not show a dialog to inform diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in deleted file mode 100644 index 94833aca..00000000 --- a/channels/Ubuntu.info.in +++ /dev/null @@ -1,70 +0,0 @@ -_ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog - -Suite: dapper -RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.06 LTS -Component: main -Enabled: 1 -_CompDescription: Officially supported -Component: restricted -Enabled: 1 -_CompDescription: Restricted copyright -Component: universe -Enabled: 0 -_CompDescription: Community maintained (Universe) -Component: multiverse -Enabled: 0 -_CompDescription: Non-free (Multiverse) - -Suite: dapper-security -RepositoryType: deb -BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.06 LTS Security Updates -Component: main -Enabled: 1 -_CompDescription: Officially supported -Component: restricted -Enabled: 1 -_CompDescription: Restricted copyright -Component: universe -Enabled: 0 -_CompDescription: Community maintained (Universe) -Component: multiverse -Enabled: 0 -_CompDescription: Non-free (Multiverse) - -Suite: dapper-updates -RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.06 LTS Updates -Component: main -Enabled: 1 -_CompDescription: Officially supported -Component: restricted -Enabled: 1 -_CompDescription: Restricted copyright -Component: universe -Enabled: 0 -_CompDescription: Community maintained (Universe) -Component: multiverse -Enabled: 0 -_CompDescription: Non-free (Multiverse) - -Suite: dapper-backports -RepositoryType: deb -BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.06 LTS Backports -Component: main -Enabled: 1 -_CompDescription: Officially supported -Component: restricted -Enabled: 1 -_CompDescription: Restricted copyright -Component: universe -Enabled: 0 -_CompDescription: Community maintained (Universe) -Component: multiverse -Enabled: 0 -_CompDescription: Non-free (Multiverse) - diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade deleted file mode 100644 index 085a3a57..00000000 --- a/data/SoftwareProperties.glade +++ /dev/null @@ -1,744 +0,0 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - -<glade-interface> - -<widget class="GtkWindow" id="window_main"> - <property name="border_width">6</property> - <property name="width_request">620</property> - <property name="height_request">400</property> - <property name="title" translatable="yes">Software Preferences</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_CENTER</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="delete_event" handler="on_delete_event" last_modification_time="Mon, 04 Jul 2005 21:19:11 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkNotebook" id="notebook1"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">True</property> - <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkFrame" id="frame1"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">6</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="treeview_sources"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - <signal name="row_activated" handler="on_channel_activated" last_modification_time="Fri, 24 Mar 2006 12:56:00 GMT"/> - <signal name="cursor_changed" handler="on_treeview_sources_cursor_changed" last_modification_time="Fri, 24 Mar 2006 13:00:27 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVButtonBox" id="vbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="button_add"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_add_clicked" last_modification_time="Tue, 05 Jul 2005 01:31:37 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button_remove"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_remove_clicked" last_modification_time="Tue, 05 Jul 2005 02:21:36 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button_edit"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-edit</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_edit_clicked" last_modification_time="Tue, 05 Jul 2005 02:18:34 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button_add_cdrom"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_button_add_cdrom_clicked" last_modification_time="Fri, 09 Dec 2005 17:39:58 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-cdrom</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="label" translatable="yes">Add _Cdrom</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Channels</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Installation Media</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame2"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">6</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="checkbutton_auto_update"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Check for updates automatically:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_opt_autoupdate_toggled" last_modification_time="Tue, 07 Feb 2006 12:36:16 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="combobox_update_interval"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_combobox_update_interval_changed" last_modification_time="Wed, 18 Jan 2006 09:43:34 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="checkbutton_auto_download"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Download updates in the background, but do not install them</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_opt_autodownload_toggled" last_modification_time="Wed, 01 Feb 2006 04:12:21 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="checkbutton_unattended"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Install security updates without confirmation</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_opt_unattended_toggled" last_modification_time="Wed, 01 Feb 2006 04:11:56 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox5"> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkCheckButton" id="checkbutton_auto_delete"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">D_elete downloaded software files:</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_opt_autodelete_toggled" last_modification_time="Wed, 01 Feb 2006 04:23:43 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="combobox_delete_interval"> - <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_combobox_delete_interval_changed" last_modification_time="Wed, 01 Feb 2006 04:11:18 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Internet updates</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="label" translatable="yes">Internet Updates</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkFrame" id="frame3"> - <property name="border_width">12</property> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment3"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">6</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox4"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="treeview2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - <property name="fixed_height_mode">False</property> - <property name="hover_selection">False</property> - <property name="hover_expand">False</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="button_auth_restor"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Restore _Defaults</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_restore_clicked" last_modification_time="Tue, 05 Jul 2005 04:24:19 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button_auth_remove"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="remove_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:19:25 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="button_auth_add"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Import Key File</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="add_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:09:24 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Keys</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">Authentication</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="type">tab</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_EDGE</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkButton" id="button_help"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_help_button" last_modification_time="Mon, 04 Jul 2005 21:19:04 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button_close"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button" last_modification_time="Mon, 04 Jul 2005 21:18:56 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - -</glade-interface> diff --git a/channels/Debian.info.in b/data/channels/Debian.info.in index ea2d1e53..ea2d1e53 100644 --- a/channels/Debian.info.in +++ b/data/channels/Debian.info.in diff --git a/channels/Makefile b/data/channels/Makefile index 3901f9cc..3901f9cc 100644 --- a/channels/Makefile +++ b/data/channels/Makefile diff --git a/channels/Makefile.am b/data/channels/Makefile.am index c9d63742..c9d63742 100644 --- a/channels/Makefile.am +++ b/data/channels/Makefile.am diff --git a/data/channels/README.channels b/data/channels/README.channels new file mode 100644 index 00000000..6bc76872 --- /dev/null +++ b/data/channels/README.channels @@ -0,0 +1,47 @@ +Channel Definition +------------------ + +The .info files allow to specify a set of default channels that is available +in the dialog "add channel". The .info file whose name corresponds to the +LSB release name is used, e.g. 'Ubuntu.info' on a Ubuntu system. + +Furthermore all .info files are used to render the channels presented in the +sources list more user friendly. + + +Tags +---- + +Suite: the name of the dist used in the repository + +MatchSuite: mainly used for cdroms. defaults to Suite + +ParentSuite: the channel only appears as a component of the parent suite in + the add dialog + the components/sections of the suite correspond to the ones of + the parent suite. specified components of the suite itself + are ignored + +Available: determs the availabilty of the suite in the add dialog. + defaults to False + +RepositoryType: does the repository contain binary or source packages + +BaseURI: the base URI of the repository + +MatchURI: used for identifing mirrors + +Description: description of the suite. the translation is done through + gettext at runtime + +Component: a component/section of the suite (ignored if ParentSuite is + set) + +Enabled: activate the component by default (ignored if ParentSuite is + set) + +CompDescription: humand readable description of the component/section + (ignored if ParentSuite is set). the translation is done + through gettext at runtime + + diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in new file mode 100644 index 00000000..f3eb60d6 --- /dev/null +++ b/data/channels/Ubuntu.info.in @@ -0,0 +1,264 @@ +_ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog + +Suite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.10 'Edgy Eft' +Component: main +Enabled: 1 +_CompDescription: Officially supported +_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +_CompDescription: Community maintained (universe) +_CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +_CompDescription: Restricted software (Multiverse) +_CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: edgy +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.10 +_Description: Cdrom with Ubuntu 6.10 'Edgy Eft' +Available: False +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright + +Suite: edgy-security +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Important security updates + +Suite: edgy-updates +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Recommended updates + +Suite: edgy-backports +ParentSuite: edgy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Backported updates + +Suite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 6.06 LTS 'Dapper Drake' +Component: main +Enabled: 1 +_CompDescription: Officially supported +_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main) +Component: universe +Enabled: 0 +_CompDescription: Community maintained (universe) +_CompDescriptionLong: OpenSource software that is maintained by the community (universe) +Component: restricted +Enabled: 1 +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices (restricted) +Component: multiverse +Enabled: 0 +_CompDescription: Restricted software (Multiverse) +_CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse) + +Suite: dapper +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*6.06 +_Description: Cdrom with Ubuntu 6.06 LTS 'Dapper Drake' +Available: False +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright + +Suite: dapper-security +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Important security updates + +Suite: dapper-updates +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Recommended updates + +Suite: dapper-backports +ParentSuite: dapper +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Backported updates + +Suite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 'Breezy Badger' +Component: main +Enabled: 1 +_CompDescription: Officially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright +Component: universe +Enabled: 0 +_CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +_CompDescription: Non-free (Multiverse) + +Suite: breezy +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.10 +_Description: Cdrom with Ubuntu 5.10 'Breezy Badger' +Available: False +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright + +Suite: breezy-security +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Ubuntu 5.10 Security Updates + +Suite: breezy-updates +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 Updates + +Suite: breezy-backports +ParentSuite: breezy +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.10 Backports + +Suite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 'Hoary Hedgehog' +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright +Component: universe +Enabled: 0 +_CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +_CompDescription: Non-free (Multiverse) + +Suite: hoary +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*5.04 +_Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog' +Available: False +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright + +Suite: hoary-security +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Ubuntu 5.04 Security Updates + +Suite: hoary-updates +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 Updates + +Suite: hoary-backports +ParentSuite: hoary +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 Backports + +Suite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 4.10 'Warty Warthog' +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright +Component: universe +Enabled: 0 +_CompDescription: Community maintained (Universe) +Component: multiverse +Enabled: 0 +_CompDescription: Non-free (Multiverse) + +Suite: warty +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*4.10 +_Description: Cdrom with Ubuntu 4.10 'Warty Warthog' +Available: False +Component: main +Enabled: 1 +_CompDescription: Oficially supported +Component: restricted +Enabled: 1 +_CompDescription: Restricted copyright + +Suite: warty-security +ParentSuite: warty +RepositoryType: deb +BaseURI: http://security.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com +_Description: Ubuntu 4.10 Security Updates + +Suite: warty-updates +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 4.10 Updates + +Suite: warty-backports +ParentSuite: warty +RepositoryType: deb +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 4.10 Backports diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade new file mode 100644 index 00000000..d262980d --- /dev/null +++ b/data/glade/SoftwareProperties.glade @@ -0,0 +1,1278 @@ +<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> +<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> + +<glade-interface> + +<widget class="GtkWindow" id="window_main"> + <property name="border_width">6</property> + <property name="title" translatable="yes">Software Sources</property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_CENTER</property> + <property name="modal">False</property> + <property name="resizable">True</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <signal name="delete_event" handler="on_delete_event" last_modification_time="Mon, 04 Jul 2005 21:19:11 GMT"/> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkNotebook" id="notebook1"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="show_tabs">True</property> + <property name="show_border">True</property> + <property name="tab_pos">GTK_POS_TOP</property> + <property name="scrollable">False</property> + <property name="enable_popup">False</property> + + <child> + <widget class="GtkVBox" id="vbox5"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> + + <child> + <widget class="GtkFrame" id="frame4"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">6</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> + + <child> + <widget class="GtkVBox" id="vbox13"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkVBox" id="vbox21"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkVBox" id="vbox_dist_comps"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="checkbutton_source_code"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Source code</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label15"> + <property name="visible">True</property> + <property name="label" translatable="yes">Download from:</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combobox_server"> + <property name="visible">True</property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label_dist_name"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Downloadable software</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame7"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">6</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox11"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="height_request">75</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview_cdroms"> + <property name="height_request">109</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>CDROM/DVD</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_dist_name"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox8"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> + + <child> + <widget class="GtkFrame" id="frame6"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">6</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox_updates"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <placeholder/> + </child> + + <child> + <placeholder/> + </child> + + <child> + <placeholder/> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label_updates"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Internet updates</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0.5</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">1</property> + <property name="yscale">1</property> + <property name="top_padding">6</property> + <property name="bottom_padding">0</property> + <property name="left_padding">12</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="checkbutton_auto_update"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Check for updates automatically:</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_opt_autoupdate_toggled" last_modification_time="Tue, 07 Feb 2006 12:36:16 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combobox_update_interval"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_combobox_update_interval_changed" last_modification_time="Wed, 18 Jan 2006 09:43:34 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox9"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="checkbutton_auto_download"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Download updates automatically, but do not install them</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_opt_autodownload_toggled" last_modification_time="Wed, 01 Feb 2006 04:12:21 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="checkbutton_unattended"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Install security updates without confirmation</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_opt_unattended_toggled" last_modification_time="Wed, 01 Feb 2006 04:11:56 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox5"> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="checkbutton_auto_delete"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">D_elete downloaded software files:</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_opt_autodelete_toggled" last_modification_time="Wed, 01 Feb 2006 04:23:43 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="combobox_delete_interval"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + <signal name="changed" handler="on_combobox_delete_interval_changed" last_modification_time="Wed, 01 Feb 2006 04:11:18 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Automatic updates</b></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label_updates12"> + <property name="visible">True</property> + <property name="label" translatable="yes">Internet Updates</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox2"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview_sources"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + <signal name="row_activated" handler="on_channel_activated" last_modification_time="Fri, 24 Mar 2006 12:56:00 GMT"/> + <signal name="cursor_changed" handler="on_treeview_sources_cursor_changed" last_modification_time="Fri, 24 Mar 2006 13:00:27 GMT"/> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox8"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">18</property> + + <child> + <widget class="GtkHBox" id="hbox9"> + <property name="visible">True</property> + <property name="homogeneous">True</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="button_add"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_add_clicked" last_modification_time="Tue, 05 Jul 2005 01:31:37 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_add_cdrom"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_button_add_cdrom_clicked" last_modification_time="Thu, 27 Jul 2006 22:19:37 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment11"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox12"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label21"> + <property name="visible">True</property> + <property name="label">Add Cdrom</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_edit"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-edit</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_edit_clicked" last_modification_time="Tue, 05 Jul 2005 02:18:34 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_remove"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-remove</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_remove_clicked" last_modification_time="Tue, 05 Jul 2005 02:21:36 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Third Party</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox4"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="button_auth_add"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Import the public key from a trusted software provider</property> + <property name="can_focus">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="add_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:09:24 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment10"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox10"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Import Key File</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_auth_restor"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Restore the default keys of your distribution</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Restore _Defaults</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_restore_clicked" last_modification_time="Tue, 05 Jul 2005 04:24:19 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_auth_remove"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-remove</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="remove_key_clicked" last_modification_time="Tue, 05 Jul 2005 04:19:25 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Authentication</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox18"> + <property name="border_width">12</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="label" translatable="yes"><i>To improve the user experience of Ubuntu please take part in the popularity contest. If you do so the list of installed software and how often it was used will be collected and sent anonymously to the Ubuntu project on a weekly basis. + +The results are used to improve the support for popular applications and to rank applications in the search results.</i></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkCheckButton" id="checkbutton_popcon"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Submit statistical information</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_checkbutton_popcon_toggled" last_modification_time="Fri, 21 Jul 2006 17:13:17 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + <property name="tab_fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="label" translatable="yes">Statistics</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="type">tab</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox11"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkButton" id="button_help"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-help</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_help_button" last_modification_time="Mon, 04 Jul 2005 21:19:04 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_close"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_close_button" last_modification_time="Mon, 04 Jul 2005 21:18:56 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="button_revert"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-revert-to-saved</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_button_revert_clicked" last_modification_time="Thu, 27 Jul 2006 21:47:47 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + +</glade-interface> diff --git a/data/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade index 8c5b00c6..b4bf6180 100644 --- a/data/SoftwarePropertiesDialogs.glade +++ b/data/glade/SoftwarePropertiesDialogs.glade @@ -3,292 +3,6 @@ <glade-interface> -<widget class="GtkDialog" id="dialog_add"> - <property name="border_width">6</property> - <property name="title" translatable="yes">Add Channel</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">True</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <property name="has_separator">False</property> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="hbuttonbox2"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="button_custom"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Custom</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - <signal name="clicked" handler="on_button_custom_clicked" last_modification_time="Mon, 29 Nov 2004 11:06:40 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button2"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="button_add"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox19"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkVBox" id="vbox20"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label31"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Channel</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox35"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label68"> - <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkComboBox" id="combobox_what"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_combobox_what_changed" last_modification_time="Thu, 25 Nov 2004 13:35:11 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox21"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkLabel" id="label32"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Components</b></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="hbox34"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label69"> - <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox_comps"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <placeholder/> - </child> - - <child> - <placeholder/> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - <widget class="GtkDialog" id="dialog_add_custom"> <property name="border_width">6</property> <property name="title" translatable="yes"></property> @@ -331,8 +45,9 @@ </child> <child> - <widget class="GtkButton" id="button6"> + <widget class="GtkButton" id="button_add_source"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="can_focus">True</property> @@ -379,7 +94,7 @@ <child> <widget class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="label" translatable="yes">_Add Channel</property> + <property name="label" translatable="yes">_Add Source</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -449,9 +164,9 @@ <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes"><big><b>Enter the complete APT line of the channel that you want to add</b></big> + <property name="label" translatable="yes"><big><b>Enter the complete APT line of the source that you want to add</b></big> -The APT line includes the type, location and components of a channel, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> +The APT line includes the type, location and components of a source, for example <i>"deb http://ftp.debian.org sarge main"</i>.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -549,7 +264,7 @@ The APT line includes the type, location and components of a channel, for exampl <widget class="GtkDialog" id="dialog_edit"> <property name="border_width">6</property> - <property name="title" translatable="yes">Edit Channel</property> + <property name="title" translatable="yes">Edit Source</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">True</property> @@ -1180,4 +895,182 @@ You need a working internet connection to continue.</property> </child> </widget> +<widget class="GtkDialog" id="dialog_add_sources_list"> + <property name="border_width">6</property> + <property name="title" translatable="yes"></property> + <property name="type">GTK_WINDOW_TOPLEVEL</property> + <property name="window_position">GTK_WIN_POS_NONE</property> + <property name="modal">False</property> + <property name="resizable">False</property> + <property name="destroy_with_parent">False</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> + + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + + <child> + <widget class="GtkButton" id="button_replace"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">_Replace</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">1</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button_cancel"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">-6</property> + </widget> + </child> + + <child> + <widget class="GtkButton" id="button_add"> + <property name="visible">True</property> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="response_id">2</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="border_width">6</property> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkImage" id="image_sources_list"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-question</property> + <property name="icon_size">6</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="label_sources"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkScrolledWindow" id="scrolled_window"> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="treeview_sources"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + </child> +</widget> + </glade-interface> diff --git a/data/UpdateManager.glade b/data/glade/UpdateManager.glade index 1221e78c..1221e78c 100644 --- a/data/UpdateManager.glade +++ b/data/glade/UpdateManager.glade diff --git a/data/dialog_add_channels.glade b/data/glade/dialog_add_channels.glade index a0e00a53..a0e00a53 100644 --- a/data/dialog_add_channels.glade +++ b/data/glade/dialog_add_channels.glade diff --git a/data/mime/apt.xml.in b/data/mime/apt.xml.in new file mode 100644 index 00000000..6861cde9 --- /dev/null +++ b/data/mime/apt.xml.in @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> + <mime-type type="text/x-apt-sources-list"> + <sub-class-of type="text/plain"/> + <comment>Software sources list</comment> + <glob pattern="sources.list"/> + </mime-type> +</mime-info> diff --git a/data/software-properties.desktop.in b/data/software-properties.desktop.in index c125b4f7..acd01211 100644 --- a/data/software-properties.desktop.in +++ b/data/software-properties.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Software Properties -_GenericName=Software Properties -_Comment=Configure software channels and internet updates +_Name=Software Sources +_GenericName=Software Sources +_Comment=Configure the sources for installable software and updates Exec=gksu /usr/bin/software-properties Icon=software-properties Terminal=false @@ -9,5 +9,6 @@ X-MultipleArgs=false Type=Application Encoding=UTF-8 Categories=Application;System;Settings; +MimeType=text/x-apt-sources-list X-KDE-SubstituteUID=true X-Ubuntu-Gettext-Domain=update-manager diff --git a/data/update-manager.schemas.in b/data/update-manager.schemas.in index 275f8be5..ad72c893 100644 --- a/data/update-manager.schemas.in +++ b/data/update-manager.schemas.in @@ -52,7 +52,7 @@ <applyto>/apps/update-manager/check_dist_upgrades</applyto> <owner>update-manager</owner> <type>bool</type> - <default>False</default> + <default>True</default> <locale name="C"> <short>Check for new distribution releases</short> diff --git a/debian/changelog b/debian/changelog index 31679a80..3686ed50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +update-manager (0.44.1) edgy; urgency=low + + * make UpdateManager check for new distribution releases by + default again + * fix dist-upgrade fetching when run as non-root. + * sort the package list by the origin (UpdateManagerEdgy spec) + + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 2 Aug 2006 13:00:42 +0200 + +update-manager (0.44) edgy; urgency=low + + * new SoftwareProperties GUI (thanks to Sebastian Heinlein) + * support easy Popcon pariticipation + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 28 Jul 2006 01:06:16 +0200 + +update-manager (0.43) edgy; urgency=low + + * fixes in the changelog reading code + * speedup in the cache clear code + * runs as user by default now + * uses dbus to implement singleton behaviour + * updated the software-properties code to know about edgy + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 11:16:31 +0200 + update-manager (0.42.2ubuntu22) dapper; urgency=low * UpdateManager/UpdateManager.py: diff --git a/debian/control b/debian/control index a4999f1a..af942223 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.2 Package: update-manager Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu +Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release, python-gnupginterface, unattended-upgrades, gksu, iso-codes Recommends: python-gnome2 Description: GNOME application that manages apt updates This is the GNOME apt update manager. It checks for updates and lets the user diff --git a/po/POTFILES.in b/po/POTFILES.in index c74e2d16..b383e84c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,13 +12,14 @@ UpdateManager/fakegconf.py UpdateManager/ReleaseNotesViewer.py UpdateManager/GtkProgress.py UpdateManager/UpdateManager.py -data/UpdateManager.glade -data/SoftwareProperties.glade -data/SoftwarePropertiesDialogs.glade +data/mime/apt.xml.in +data/glade/UpdateManager.glade +data/glade/SoftwareProperties.glade +data/glade/SoftwarePropertiesDialogs.glade data/update-manager.desktop.in data/update-manager.schemas.in data/software-properties.desktop.in -[type: gettext/rfc822deb] channels/Ubuntu.info.in -[type: gettext/rfc822deb] channels/Debian.info.in +[type: gettext/rfc822deb] data/channels/Ubuntu.info.in +[type: gettext/rfc822deb] data/channels/Debian.info.in [type: python] update-manager [type: python] software-properties @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Jadmadi <contact@jadmadi.net>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -17,65 +17,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n == 2 ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "يوميا" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "كل يومين" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "اسبوعي" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "كل اسبوعين" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "كل %s يوم" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "بعد اسبوع" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "بعد اسبوعين" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "بعد شهر" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "بعد %s يوم" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "خطاء في استيراد الملف" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "خطاء في ازالة المفتاح" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "الرجاء ادخال اسم القرص" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "الرجاء ادخال القرص في الجهاز" @@ -101,54 +144,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +200,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "قراءة من الكاش" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +221,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +234,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "importing" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "مصدر الطرف الثالث غير مفعل" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "خطاء خلال التحديث" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "لا يوجد مساحة كافية على القرص الصلب" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +278,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "هل تريد البدء في عملية التحديث الان؟" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +315,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +365,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -406,18 +449,20 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -425,7 +470,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -433,7 +478,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -441,40 +486,40 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -493,7 +538,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -514,8 +559,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -664,52 +708,56 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -717,64 +765,48 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -782,7 +814,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -790,143 +822,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -936,74 +1004,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1055,101 +1107,231 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid " " +#~ msgstr " " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:40+0000\n" "Last-Translator: Nikola Kasabov <nikola.kasabov@gmail.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -17,67 +17,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Ежедневно" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Всеки два дни" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Ежеседмично" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Всеки две седмици" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Всеки %s дни" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "След една седмица" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "След две седмици" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "След един месец" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "След %s дни" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Инсталиране на актуализациите" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Обновления на софтуера" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Изходен код" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Изходен код" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Внасяне на ключ" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл, или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключът, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +134,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Моля, въведете име за диска" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Моля, поставете диск в устройството:" @@ -109,20 +155,20 @@ msgstr "" "този софтуер. Моля, поправете ги със synaptic или apt-get преди да " "продължите!" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не може да бъдат надградени изисквани мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ще трябва да бъде премахнат важен пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не може да бъде планирано надграждането" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -131,11 +177,11 @@ msgstr "" "това като грешка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Грешка при удостоверяването автентичността на някои пакети" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -145,12 +191,12 @@ msgstr "" "да е временен проблем с мрежата. Може би бихте искали да опитате отново по-" "късно. Вижте по-долу списъка на неудоствоерените пакети." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Не може да се инсталира '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -159,11 +205,11 @@ msgstr "" "грешка! " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Не могат да бъдат предположени мета-пакети" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -176,15 +222,15 @@ msgstr "" " Моля, преди да продължите, инсталирайте един от тези пакети, като " "използвате synaptic или apt-get!" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Четене на кеша" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Не е открит валиден огледален сървър" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -204,11 +250,11 @@ msgstr "" "Ако изберете \"Не\", актуализирането ще бъде отменено." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Генериране на източници по подразбиране?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -222,11 +268,11 @@ msgstr "" "Да бъдат ли добавени записи по подразбиране за \"%s\"? Ако изберете \"Не\", " "актуализацията ще бъде отменена." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Информацията от хранилището е невалидна" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -234,11 +280,11 @@ msgstr "" "Надграждане на информацията от хранилището доведе до невалиден файл. Моля, " "съобщете това като грешка!" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Забранени са източници от трети страни" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -248,11 +294,11 @@ msgstr "" "Можете да ги разрешите отново след надграждането чрез инструмента software-" "properties или чрез synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Грешка по време на надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -260,11 +306,11 @@ msgstr "" "Възникна проблем при актуализацията. Това обикновено е накакъв проблем с " "мрежата. Моля, проверете мрежовата връзка и опитайте пак!" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Недостатъчно свободно място на диска" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -273,15 +319,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Желаете ли да започне надграждането?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Не можеше да бъдат инсталирани надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -289,11 +335,11 @@ msgstr "" "Надграждането сега ще бъде прекратено. Системата Ви може да е в " "неизползваемо състояние. Бе изпълнено възстановяване (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Не можеше да бъдат свалени надгражданията" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -301,11 +347,11 @@ msgstr "" "Надграждането се прекратява. Моля, проверете Интернет връзката или " "инсталационния носител и опитайте отново! " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -314,23 +360,23 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Премахване на остарелите пакети?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "П_рескачане на стъпката" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Премахване" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Грешка при прехвърляне" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -339,27 +385,27 @@ msgstr "" "информация! " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Рестартиране на системата" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Проверка на диспечера на пакети" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Актуализиране информацията от хранилището" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 #, fuzzy msgid "Invalid package information" msgstr "Невалидна информация за пакет" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -370,19 +416,19 @@ msgstr "" "бъде открит.\n" "Това показва сериозна грешка. Моля, съобщете за това!" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Запитване за потвърждение" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Надграждане" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Търсене на остарял софтуер" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Надграждането на системата завърши." @@ -456,11 +502,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Командата \"diff\" не бе намерена" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Възникна фатална грешка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -472,65 +518,67 @@ msgstr "" "Оригиналният \"sources.list\" was saved inбе съхранен в \"/etc/apt/sources." "list.distUpgrade\"." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Пакетът %s ще бъде премахнат." msgstr[1] "Пакетите %s ще бъдат премахнати." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s нов пакет ще бъде инсталиран." msgstr[1] "%s нови пакети ще бъдат инталирани." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s пакет ще бъде надграден." msgstr[1] "%s нови пакети ще бъдат надградени." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Трябва да изтеглите данни общо %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Надграждането може да отнеме няколко часа, като не може да бъде отменено по-" "нататък." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "За да предодвратите загуба на данни, затворете всички отворени приложения и " "документи." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Не можеше да бъдат намерени надграждания" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Системата Ви вече е надградена." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Премахване на %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Инсталиране на %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Надграждане на %s" @@ -549,7 +597,7 @@ msgstr "Надграждането е завършено и има нужда о #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -575,8 +623,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Започване на надграждането?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Надграждане до Ubuntu 6.06 LTS</span>" @@ -737,11 +785,16 @@ msgstr "Сваляне на файл %li от %li при %s/сек" msgid "Downloading file %li of %li with unknown speed" msgstr "Сваляне на файл %li от %li при неизвестна скорост" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Списъкът с промените още не е наличен. Моля, опитайте по-късно!" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -750,11 +803,11 @@ msgstr "" "връзката си." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Не могат да бъдат инсталирани всички актуализации" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -765,62 +818,54 @@ msgstr "" "пакети „Synaptic” или задействайте „sudo apt-get dist-upgrade” в терминален " "прозорец, за да актуализирате напълно системата си." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Следните актуализации ще бъдат пропуснати:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Сваляне на списъка с промени..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Размер за изтегляне: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Системата Ви е актуална" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Можете да инсталирате %s актуализация" msgstr[1] "Можете да инсталирате %s актуализации" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Скрий детайлите" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Покажи детайлите" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Моля, изчакайте! Това може да отнеме известно време." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Актуализацията е завършена" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Нова версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуция вече не се поддържа" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -830,27 +875,17 @@ msgstr "" "Надградете до по-късна версия на Ubuntu Linux. Вижте http://www.ubuntu.com " "за повече информация за надграждането!" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Позволено е да оперира само един диспечер на софтуера в даден момент" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Моля, затворете всички други приложения, преди всичко \"aptitude\" или " -"\"Synaptic\"." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Индексът на софтуера е повреден" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -860,7 +895,7 @@ msgstr "" "ползвайте диспечера на пакети \"Synaptic\" или първо задействайте \"sudo apt-" "get install -f\" в терминален прозорец, за да поправите този проблем!" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -872,7 +907,7 @@ msgstr "" "Системата Ви не проверява автоматично за актуализации. Можете да настроите " "това в „Система” -> „Администрация” -> „Свойства на софтуера”" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -884,43 +919,47 @@ msgstr "" "Софтуерните актуализации поправят грешки, премахват уаизвими места в " "сигурността и предлагат нови възможности." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Поддържане на системата в съвременно състояние</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Отмяна на _изтеглянето" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Промени" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Провер_ка" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Проверка на софтуерните канали за нови актуализации" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Описание" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Бележки към изданието" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Показване напредъка на отделните файлове" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Актуализации на софтуера" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -928,63 +967,85 @@ msgstr "" "Софтуерните актуализации поправят грешки, премахват уаизвими места в " "сигурността и предлагат нови възможности." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Надграждане" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Надграждане до последната версия на Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Проверка" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Скрий тази информация за в бъдеще" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Инсталиране на актуализациите" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Канали</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Промени" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Актуализации по Интернет</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Ключове</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Добавяне на Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Актуализации по Интернет</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Идентифициране" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Изтриване на изтеглените софтуерни файлове:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Свалянето е завършено" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Актуализации по Интернет" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -992,40 +1053,56 @@ msgstr "" "Само актуализации на сигурността от официалните сървъри на Ubuntu ще бъдат " "инсталирани автоматично" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Връщане на _стандартните стойности" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Връщане на стандартните ключове на Вашата дистрибуция" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Настройки на софтуера" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Изходен код" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Проверявай за актуализации автоматично:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "И_зтегли актуализациите във фонов режим, но не ги инсталирай" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Внасяне на ключ" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Инсталирай актуализациите на сигурноста без потвърждение" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1041,40 +1118,33 @@ msgstr "" "\n" "Нужна Ви е Интернет връзка, за да продължите." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Канал</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Компоненти:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Компоненти</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибуция:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Вид:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Добавете пълния APT ред за канала, който искате да добавите</b></" @@ -1083,15 +1153,11 @@ msgstr "" "APT редът съдържа вида, местонахождението и компонентите за даден канал. " "Например <i>„deb http://ftp.debian.org sarge main“</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Ред за APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Добавяне на канал" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1099,24 +1165,21 @@ msgstr "" "Двоичен\n" "Изходен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Редакция на канал" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Изходен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Сканиране на CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Добави канал" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Лично" +msgid "_Add Source" +msgstr "Изходен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Презареждане" @@ -1175,127 +1238,319 @@ msgid "The window size" msgstr "Размерът на прозореца" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Настройка на софтуерните канали и актуализациите по Интернет" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Настройки на софтуера" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS актуализации" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 актуализации" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS актуализации на сигурността" +#: ../data/channels/Ubuntu.info.in:28 +#, fuzzy +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS актуализации" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Поддържани от обществото (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Несвободни (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Несвободни (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 актуализации на сигурността" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Състарени версии" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официално поддържани" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Ограничени авторски права" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 актуализации на сигурността" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 актуализации" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Състарени версии" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 актуализации на сигурността" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 актуализации" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Състарени версии" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Поддържани от обществото (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Несвободни (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD с Ubuntu 4.10 „Warty Warthog“" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Официално поддържан" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Ограничени авторски права" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 обновления по сигурността" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 обновления" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Състарени версии" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" актуализации на сигурността" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (тестване)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (нестабилен)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-съвместим софтуер с несвободни зависимости" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Софтуер несъвместим с DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Скрий детайлите" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Show details" +#~ msgstr "Покажи детайлите" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 актуализации на сигурността" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Позволено е да оперира само един диспечер на софтуера в даден момент" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Моля, затворете всички други приложения, преди всичко \"aptitude\" или " +#~ "\"Synaptic\"." -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 актуализации" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Канали</b>" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Състарени версии" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Ключове</b>" -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>Раздели</b>" +#~ msgid "Add _Cdrom" +#~ msgstr "Добавяне на Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Носител на инсталацията" + +#~ msgid "Software Preferences" +#~ msgstr "Настройки на софтуера" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Канал</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Компоненти</b>" + +#~ msgid "Add Channel" +#~ msgstr "Добавяне на канал" + +#~ msgid "Edit Channel" +#~ msgstr "Редакция на канал" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Добави канал" + +#~ msgid "_Custom" +#~ msgstr "_Лично" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Официално поддържан" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS актуализации" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS актуализации на сигурността" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS актуализации" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Състарени версии" + +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>Раздели</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Раздели:</b>" @@ -1304,10 +1559,6 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "Reload the latest information about updates" #~ msgstr "Презареждане от сървъра на информацията за пакетите." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Обновления на софтуера" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1321,10 +1572,6 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgstr "Показване на наличните обновления и избиране кои да се инсталират" #, fuzzy -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "CD с Ubuntu 5.04 „Hoary Hedgehog“" - -#, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Грешка при премахване на ключа" @@ -1457,18 +1704,6 @@ msgstr "Софтуер несъвместим с DFSG" #~ msgid "Binary" #~ msgstr "Двоични" -#~ msgid "Source" -#~ msgstr "Изходен код" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD с Ubuntu 4.10 „Warty Warthog“" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 обновления по сигурността" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 обновления" - #~ msgid "Contributed software" #~ msgstr "Допринесен софтуер" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 12:09+0000\n" "Last-Translator: Khandakar Mujahidul Islam <suzan@bengalinux.org>\n" "Language-Team: Bengali <bn@li.org>\n" @@ -17,65 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "দৈনিক" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "প্রত্যেক দুই দিনে" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "সাপ্তাহিক" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "প্রত্যেক দুই সপ্তাহে" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "প্রত্যেক %s দিনে" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "এক সপ্তাহ পর" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "দুই সপ্তাহ পর" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "এক মাস পর" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s দিন পর" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "আপডেট ইন্সটল করো (_I)" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "সফ্টওয়্যার আপডেট" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "কী ইম্পোর্ট" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "নির্বাচিত ফাইলটি ইম্পোর্ট করতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "বেছে নেয়া ফাইলটি মনে হয় কোন GPG কী ফাইল নয় অথবা এটি নষ্ট।" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "কী সরাতে সমস্যা হয়েছে" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -86,11 +130,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "ডিস্কের জন্য একটি নাম দিন" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "অনুগ্রহ করে ড্রাইভে একটি ডিস্ক দিন:" @@ -104,43 +148,43 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "দরকারী meta-packages আপগ্রেড করতে পারে নি" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "একটি প্রয়োজনীয় প্যকেজ অপসারণ করা হতে পারে" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "আপগ্রেড গণনা করতে পারছে না" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s' ইন্সটল করা যাচ্ছে না" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -149,11 +193,11 @@ msgstr "" "রিপোর্ট করুন। " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "meta-package অনুমান করা যাচ্ছ না" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -162,15 +206,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "ক্যাশ পড়া হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "কোন সঠিক মিরর পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -183,11 +227,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "ডিফল্ট sources তৈরি করে?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -201,11 +245,11 @@ msgstr "" "'%s' জন্য ডিফল্ট যুক্ত করার উচিত? আপনি যদি 'না' নির্বাচন করেন তাহলে আপডেট বাতিল " "হবে।" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "রিপোজিটরির তথ্য সঠিক নয়" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -213,22 +257,22 @@ msgstr "" "রিপোজিটোরি তথ্য আপগ্রেড করার সময় একটি ভুল ফাইল তৈরী হয়েছে। অনুগ্রহ করে এটিকে বাগ " "হিসাবে রিপোর্ট করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "তৃতীয় পার্টির উত্স নিষ্ক্রিয়" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "আপগ্রেড করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -236,11 +280,11 @@ msgstr "" "আপগ্রেড করার সময় একটি সমস্যা হয়েছে। এটি সাধারনত নেটওয়ার্কের সমস্যা, অনুগ্রহ করে " "আপনার নেটওয়ার্ক সংযোগ পরীক্ষা করুন এবং পুনরায় চেষ্টা করুন।" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "ডিস্কে যথেস্ট ফাঁকা জায়গা নেই" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -249,25 +293,25 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "আপনি কি আপগ্রেড শুরু করতে চান?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "আপগ্রেড ইন্সটল করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "আপগ্রেড ডাউনলোড করা যায় নি" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -275,11 +319,11 @@ msgstr "" "আপগ্রেড এখন বন্ধ হবে। দয়া করে আপনার ইন্টারনেট সংযুক্তি বা ইনস্টলেশন মিডিয়া পরীক্ষা " "করুন এবং আবার চেষ্টা করুন। " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "কিছু সফটওয়্যার অফিসিয়ালি আর সমর্থিত নয়" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -288,49 +332,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "অপ্রচলিত প্যাকেজগুলো মুছে ফেলা হবে?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "এই ধাপটি এড়িয়ে যাও (_এ)" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "সরাও (_স)" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "প্রেরণ করার সময় সমস্যা" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "সিস্টেমটি রিস্টার্ট করছি" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "প্যাকেজ ম্যানেজার পরীক্ষা করা হচ্ছ" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "রিপজিটরির তথ্য আপডেট করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "ভুল প্যাকেজ তথ্য" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -338,19 +382,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "তথ্যের জন্য জিজ্ঞাসা" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "আপগ্রেড করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "অপ্রচলিত সফ্টওয়্যার অনুসন্ধান করা হচ্ছে" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "সিস্টেম আপগ্রেড সম্পন্ন।" @@ -424,72 +468,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' কমান্ডটি পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "একটি মারাত্মক সমস্যা সংঘটিত হয়েছে" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s টি প্যাকেজ মোছা হবে।" msgstr[1] "%s টি প্যাকেজ মোছা হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ ইনস্টল হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" msgstr[1] "%s টি নতুন প্যাকেজ আপগ্রেড হতে যাচ্ছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "আপনাকে সর্বমোট %s ডাউনলোড করতে হবে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "আপগ্রেড করতে কয়েক ঘন্টা লেগে যেতে পারে এবং পরে এটি বাতিল করা যাবে না।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "তথ্য হারাতে না চাইলে সকল অ্যাপলিকেশন এবং ডকুমেন্ট বন্ধ রাখুন।" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "কোন আপগ্রেড পাওয়া যায় নি" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "আপনার সিস্টেম ইতিমধ্যেই আপগ্রেড করা হয়েছে।" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s মুছো</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s ইন্সটল" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s আপগ্রেড" @@ -508,7 +554,7 @@ msgstr "আপগ্রেডটি সম্পন্ন এবং রিবু #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -529,8 +575,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>আপগ্রেড শুরু করবো?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">উবুন্টু \"ড্যাপার\" ৬.০৬ এ আপগ্রেড করছি</" "span>" @@ -683,11 +729,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "পরিবর্তনের তালিকা এখনে উপস্হিত নয়। অনুগ্রহ করে পরে আবার চেষ্টা করুন।" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -696,106 +747,89 @@ msgstr "" "পরিবর্তন তালিকা ডাউনলোড করতে ব্যর্থ। অনুগ্রহ করে আপনার ইন্টারনেট সংযোগ পরীক্ষা করুন।" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "সকল উপস্হিত আপডেট ইন্সটল করা যায় নি" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "নিম্নের আপডেটগুলো বাদ দেয়া হবে:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "ভার্সন %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "পরিবর্তনের তালিকা ডাউনলোড করা হচ্ছ..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "ডাউনলোড এর আকার: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "আপনার সিস্টেম আপ-টু-ডেট" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "আপনি %s আপডেট ইনস্টল করতে পারেন" msgstr[1] "আপনি %s আপডেট ইনস্টল করতে পারেন" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "বিস্তারিত আড়াল" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "বিস্তারিত প্রদর্শন" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "অনুগ্রহ করে অপেক্ষা করুন, এটি কিছুটা সময় নিতে পারে।" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "আপডেট সম্পন্ন" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "নতুন ভার্সন: %s (আকার: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "আপনার ডিস্ট্রিবিউশনটি আর সমর্থিত নয়" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "শুধুমাত্র একটি সফ্টওয়্যার ম্যানেজমেন্ট টুল একসময়ে চালানো যাবে" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে বন্ধ করুন।" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "সফ্টওয়্যার ইন্ডেক্সটি নস্ট" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -803,7 +837,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -811,143 +845,184 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>আপনার সিস্টেম আপ-টু-ডেট রাখুন</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "ডাউনলোড বাতিল (_D)" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "পরিবর্তন" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "পরীক্ষা করো (_k)" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "নতুন আপডেট এর জন্য সফ্টওয়্যার চ্যানেল পরীক্ষা করো" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "বর্ননা" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "রিলিজ নোট" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "একটি ফাইলের অগ্রগতি দেখাও" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "সফ্টওয়্যার আপডেট" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "আপগ্রেড (_p)" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "উবুন্টু এর সর্বশেষ ভার্সনে আপগ্রেড করো" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "পরীক্ষা করো (_C)" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "ভবিষ্যতে এই তথ্য আড়াল রাখো (_H)" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "আপডেট ইন্সটল করো (_I)" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>চ্যানেল</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "পরিবর্তন" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>ইন্টারনেট আপডেট</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>কী</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>ইন্টারনেট আপডেট</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "সিডিরম যোগ (_C)" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "প্রমাণীকরন" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "ডাউনলোড করা সফ্টওয়্যার ফাইল মুছো (_e):" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "ডাউনলোড সম্পন্ন" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "ইন্টারনেট আপডেট" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "ডিফল্ট পুনঃস্হাপন (_D)" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "আপনার ডিস্ট্রিবিউশনের ডিফল্ট কী পুনঃস্হাপন করুন" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "সফ্টওয়্যার অগ্রাধিকার" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "সফ্টওয়্যার বৈশিষ্ট্য" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "স্বয়ংক্রিয় ভাবে আপডেট পরীক্ষা করো (_C):" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "আড়ালে আপডেট ডাউনলোড করো, কিন্তু তাদেরকে ইন্সটল করো না (_D)" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "কী ফাইল ইম্পোর্ট(_ই)" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "নিরাপত্তা জনিত আপডেট গুলো অনুমদন ছাড়াই ইন্সটল করো (_I)" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -957,52 +1032,40 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>চ্যানেল</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>মন্তব্য:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>উপাদান:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>উপাদান</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>ডিস্ট্রিবিউসন:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>ধরন:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>ইউ-আর-আই:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT লাইন:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "চ্যানেল যোগ" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1010,24 +1073,19 @@ msgstr "" "বাইনারী\n" "উৎস" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "চ্যানেন সম্পাদন" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "সিডিরম স্ক্যান করা হচ্ছে" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "চ্যানেল যোগ (_A)" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "নিজ হাতে (_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "পুনরায় পড়ো (_R)" @@ -1079,116 +1137,309 @@ msgid "The window size" msgstr "উইনডোর আকার" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "সফ্টওয়্যার চ্যানেল এবং ইন্টারনেট আপডেট কনফিগার" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "সফ্টওয়্যার বৈশিষ্ট্য" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "উবুন্টু ৬.০৬ LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "উবুন্টু ৫.১০ আপডেট" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "উবুন্টু ৬.০৬ নিরাপত্তামুলক আপডেট" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "উবুন্টু ৬.০৬ আপডেট" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "ফ্রি নয় (মাল্টিভার্স)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "ফ্রি নয় (মাল্টিভার্স)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "অফিসিয়াল ভাবে সমর্থিত" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "উবুন্টু ৫.১০ আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "উবুন্টু ৫.১০ আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" + #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "ফ্রি নয় (মাল্টিভার্স)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "অফিসিয়াল ভাবে সমর্থিত" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "উবুন্টু ৫.১০ আপডেট" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "ডেবিয়ান ৩.১ \"সার্জ\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "ডেবিয়ান ৩.১ \"Sarge\" নিরাপত্তামুলক আপডেট" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "ডেবিয়ান \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "ডেবিয়ান \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "উবুন্টু ৬.০৬ 'ড্যাপার ড্রেক'" +#~ msgid "Hide details" +#~ msgstr "বিস্তারিত আড়াল" + +#~ msgid "Show details" +#~ msgstr "বিস্তারিত প্রদর্শন" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "শুধুমাত্র একটি সফ্টওয়্যার ম্যানেজমেন্ট টুল একসময়ে চালানো যাবে" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "অনুগ্রহ করে অন্যান্য অ্যাপলিকেশন যেমন, 'aptitude' অথবা 'Synaptic' প্রথমে বন্ধ " +#~ "করুন।" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>চ্যানেল</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>কী</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "সিডিরম যোগ (_C)" + +#~ msgid "Installation Media" +#~ msgstr "ইন্সটলেশন মাধ্যম" + +#~ msgid "Software Preferences" +#~ msgstr "সফ্টওয়্যার অগ্রাধিকার" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>চ্যানেল</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>উপাদান</b>" + +#~ msgid "Add Channel" +#~ msgstr "চ্যানেল যোগ" + +#~ msgid "Edit Channel" +#~ msgstr "চ্যানেন সম্পাদন" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "চ্যানেল যোগ (_A)" + +#~ msgid "_Custom" +#~ msgstr "নিজ হাতে (_C)" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "উবুন্টু ৫.১০ 'ব্রিজী ব্যাজার'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "উবুন্টু ৬.০৬ LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "উবুন্টু ৫.১০ নিরাপত্তামুলক আপডেট" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "উবুন্টু ৬.০৬ নিরাপত্তামুলক আপডেট" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "উবুন্টু ৫.১০ আপডেট" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "উবুন্টু ৬.০৬ আপডেট" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "উবুন্টু ৫.১০ ব্যাকপোর্ট" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "উবুন্টু ৬.০৬ ব্যাকপোর্ট" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:42+0000\n" "Last-Translator: Oublieuse <oublieuse@gmail.com>\n" "Language-Team: Breton <br@li.org>\n" @@ -17,69 +17,112 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Bep %s devezh" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "War-lerc'h %s devezh" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Emborzhiañ an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Fazi en ur emborzhiañ ar restr dibabet" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Moarvat n'eo ket ur restr alc'hwezh GPG ar restr dibabet, pe neuze eo " "gwastet." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Fazi en ur zilemel an alc'hwezh" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "N'eus ket tu da zilemel an alc'whezh ho peus dibabet. Kelaouit eo ur bug " "marplij." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +130,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Roit un anv evit ar bladenn marplij" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Lakait ur bladenn e-barzh ul lenner marplij:" @@ -105,54 +148,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -161,15 +204,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -182,11 +225,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -195,42 +238,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -239,35 +282,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -276,49 +319,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -326,19 +369,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -410,72 +453,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -494,7 +539,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -515,8 +560,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -665,116 +709,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -782,7 +814,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -790,144 +822,180 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Emborzhiañ an alc'hwezh" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -937,74 +1005,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1056,101 +1108,231 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid " " +#~ msgstr " " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 21:18+0000\n" "Last-Translator: Jordi Irazuzta <irazuzta@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.org>\n" @@ -16,69 +16,115 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Diàriament" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Cada dos dies" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Setmanalment" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Cada dues setmanes" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Cada %s dies" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Després d'una setmana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Després de dues setmanes" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Després d'un mes" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Després de %s dies" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Instal·la les actualitzacions" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Actualitzacions de programari" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Font" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Font" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importa un clau" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "S'ha produït un error en importar el fitxer seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "El fitxer que heu seleccionat no correspon a una clau GPG o pot estar " "corromput." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "S'ha produït un error en esborrar la clau" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clau que heu seleccionat no es pot esborrar. Notifiqueu-ho com a error de " "programació." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -89,11 +135,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Introduïu un nom per al disc" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Inseriu un disc a la unitat:" @@ -109,21 +155,21 @@ msgstr "" "El vostre sistema conté paquets trencats que no es poden arreglar amb " "aquesta aplicació. Utilitzeu el Synaptic o apt-get abans de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, fuzzy msgid "Can't upgrade required meta-packages" msgstr "No s'han pogut actualitzar els metapaquets sol·licitats" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "S'haurà d'esborrar un paquet essencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No s'ha pogut calcular l'actualització" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -132,11 +178,11 @@ msgstr "" "de l'error. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "S'ha produït un error en autenticar alguns paquets" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -146,12 +192,12 @@ msgstr "" "amb la xarxa. Podeu provar-ho després. A continuació es mostra la llista amb " "els paquets no autenticats." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "No s'ha pogut instal·lar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -160,11 +206,11 @@ msgstr "" "els error. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -178,15 +224,15 @@ msgstr "" " Instal·leu algun dels paquets anteriors des del Synaptic o amb l'apt-get " "per poder continuar." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "S'està llegint la memòria cau" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "No s'ha trobat una rèplica vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -199,11 +245,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -212,11 +258,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "La informació del dipòsit no és vàlida" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -224,11 +270,11 @@ msgstr "" "En actualitzar la informació del dipòsit s'ha produït un error. Informeu de " "l'error." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "S'han desactivat les fonts de tercers" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -238,11 +284,11 @@ msgstr "" "reactivar-los, després de l'actualització de programari, des de 'propietats " "del programari' o des del Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "S'ha produït un error en l'actualització" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -250,11 +296,11 @@ msgstr "" "S'ha produït un error mentre s'actualizava el vostre sistema. Comproveu la " "vostra connexió de xarxa i torneu a intentar-ho." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "No disposeu de suficient espai al disc" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -267,15 +313,15 @@ msgstr "" "apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Voleu iniciar l'actualització?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "No s'han pogut instal·lar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -283,11 +329,11 @@ msgstr "" "L'actualització s'ha cancel·lat. El vostre sistema ha pogut quedar " "inservible. S'ha executat una recuperació del sistema (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "No s'han pogut descarregar les actualitzacions" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -295,11 +341,11 @@ msgstr "" "S'ha cancel·lat l'actualització. Comproveu la vostra connexió a Internet o " "el mitjà d'instal·lació i torneu-ho a provar. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Algun programari ja no es mantindrà oficialment" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -312,49 +358,49 @@ msgstr "" "\n" "Si no teniu activat 'universe' se us sugerirà que els desintal·leu. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Voleu esborrar els paquets obsolets?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Omet aquest pas" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "Esbo_rra" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "S'està restaurant l'estat original del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "S'està comprovant el gestor de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "S'està actualitzant la informació del dipòsit" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "La informació del paquet no és valida" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -362,19 +408,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Actualitzant" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "S'està cercant programari obsolet" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "S'ha completat l'actualització del sistema" @@ -448,76 +494,78 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "No s'ha trobat l'ordre 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "S'ha produït un error greu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "S'esborrarà %s paquet" msgstr[1] "S'esborraran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "S'instal·larà %s paquet" msgstr[1] "S'instal·laran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "S'actualitzarà %s paquet" msgstr[1] "S'actualitzaran %s paquets" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Heu de descarregar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "L'actualització pot durar algunes hores i no la podreu cancel·lar un cop " "hagi començat." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Per a evitar una possible pèrdua de dades, tanqueu tos els documents i " "aplicacions." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "No s'han pogut trobar actualitzacions" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "El vostre sistema ja està actualitzat" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Esborra %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instal·la %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Actualitza %s" @@ -538,7 +586,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -563,8 +611,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Voleu iniciar l'actualització?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">S'està actualitzant a Ubuntu 6.06 " "LTS</span>" @@ -716,11 +764,16 @@ msgstr "S'està descarregant el fitxer %li de %li amb %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "S'està descarregant el fitxer %li de %li a una velocitat desconeguda" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "La llista de canvis encara no està disponible. Proveu-ho després." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "La llista de canvis encara no està disponible. Proveu-ho després." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -729,11 +782,11 @@ msgstr "" "a Internet." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "No es poden instal·lar les actualitzacions disponibles" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -744,62 +797,54 @@ msgstr "" "funció \"Marca totes les actualitzacions\" del gestor de paquets \"Synaptic" "\" o executeu \"sudo apt-get dist-upgrade\" en un terminal." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Les següents actualitzacions s'ometran:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versió %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "S'està descarregant la llista de canvis..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Mida de la descàrrega: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "El vostre sistema està actualitzat" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podeu instal·lar %s actualització" msgstr[1] "Podeu instal·lar %s actualitzacions" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Amaga els detalls" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Mostra els detalls" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Espereu, això pot tardar una estona." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "S'ha completat l'actualització" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Versió nova: %s (Mida: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "La vostra distribució ja no es mantindrà més" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -809,27 +854,17 @@ msgstr "" "sistema a la darrera versió d'Ubuntu. Vegeu http://www.ubuntu.com per a més " "informació." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ja disposeu de la nova distribució '%s'</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Només podeu utilitzar un gestor de programari alhora." - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Abans heu de tancar l'altre gestor de paquets, p. ex. l'Aptitude o el " -"Synaptic" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "L'índex de programari s'ha trencat" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -839,7 +874,7 @@ msgstr "" "utilitzeu el gestor de paquets \"Synaptic\" o executeu \"sudo apt-get " "install -f\" en un terminal." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -852,7 +887,7 @@ msgstr "" "que ho faci, configureu-ho a \"Sistema\" -> \"Administració\" -> " "\"Propietats del programari\"" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -864,43 +899,47 @@ msgstr "" "L'actualització del programari corregeix errors, elimina problemes de " "seguretat i afegeix prestacions noves." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Manteniu el vostre sistema actualitzat</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Cancel·la la _descàrrega" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Canvis" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Compro_va" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Comprova els canals de programari per a actualitzacions noves" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descripció" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Notes de la versió" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostra el progrés per als fitxers individuals" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualitzacions de programari" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -908,101 +947,139 @@ msgstr "" "Les actualitzacions de programari corregeixen errors, eliminen problemes de " "seguretat i proporcionen prestacions noves." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Actualitza" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualitza a la darrera versió d'Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Comprova" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_En el futur oculta aquesta informació" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instal·la les actualitzacions" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Canals</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Canvis" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Actualitzacions d'Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Claus</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Afegeix un _CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Actualitzacions d'Internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticació" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Esborra els fitxers de programari descarregats:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "S'ha completat la descàrrega" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importa la clau pública d'un proveïdor de confiança" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Mitjà d'instal·lació" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Actualitzacions d'Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Restaura els valors per _defecte" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Restaura les claus per defecte de la vostra distribució" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Preferències del programari" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Propietats del programari" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Font" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Comprova les actualitzacions automàticament" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Descarrega les actualitzacions en segon pla, però no les instal·lis" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importa una clau" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instal·la actualitzacions de seguretat sense confirmació" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1018,40 +1095,33 @@ msgstr "" "\n" "Necessiteu una connexió a Internet per poder continuar." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Canal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentari:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Components:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Components</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribució:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipus:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduïu la línia APT del canal que voleu afegir</b></big>\n" @@ -1059,15 +1129,11 @@ msgstr "" "La línia APT inclou el tipus, la ubicació i els components del canal, per " "exemple <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Línia APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Afegeix un canal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1075,24 +1141,21 @@ msgstr "" "Binari\n" "Font" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Edita el canal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Font" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "S'està analitzant el CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Afegeix el canal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalitza" +msgid "_Add Source" +msgstr "Font" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "Act_ualitza" @@ -1147,119 +1210,313 @@ msgid "The window size" msgstr "La mida de la finestra" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configura els canals de programari i les actualitzacions d'Internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Propietats del programari" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Actualitzacions d'Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Actualitzacions de seguretat d'Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +#, fuzzy +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Actualitzacions d'Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Paquets mantinguts per la comunitat (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Paquets sense llicència lliure (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Paquets sense llicència lliure (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Actualitzacions d'Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Debian Stable Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Paquets mantinguts oficialment (Main)" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Paquets amb restriccions per copyright (Restricted)" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Actualitzacions d'Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Actualitzacions d'Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "Actualitzacions d'Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Actualitzacions d'Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Paquets mantinguts per la comunitat (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Paquets sense llicència lliure (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Paquets mantinguts oficialment (Main)" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Paquets amb restriccions per copyright (Restricted)" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Actualitzacions d'Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Actualitzacions d'Ubuntu 6.06 LTS" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualitzacions de seguretat de Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Programari compatible DFSG amb dependències no lliures" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Programari no compatible DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Amaga els detalls" + +#~ msgid "Show details" +#~ msgstr "Mostra els detalls" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Només podeu utilitzar un gestor de programari alhora." + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Abans heu de tancar l'altre gestor de paquets, p. ex. l'Aptitude o el " +#~ "Synaptic" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Actualitzacions de seguretat d'Ubuntu 5.10" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Canals</b>" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Actualitzacions d'Ubuntu 5.10" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Claus</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Afegeix un _CD-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Mitjà d'instal·lació" + +#~ msgid "Software Preferences" +#~ msgstr "Preferències del programari" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Canal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" + +#~ msgid "Add Channel" +#~ msgstr "Afegeix un canal" + +#~ msgid "Edit Channel" +#~ msgstr "Edita el canal" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Afegeix el canal" + +#~ msgid "_Custom" +#~ msgstr "_Personalitza" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Actualitzacions de seguretat d'Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Actualitzacions d'Ubuntu 6.06 LTS" #~ msgid "Edit software sources and settings" #~ msgstr "Edita les fonts i els paràmetres del programari" @@ -1434,30 +1691,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "Binary" #~ msgstr "Binari" -#~ msgid "Source" -#~ msgstr "Font" - -#~ msgid "CD disk with Ubuntu 5.10 \"Breezy Badger\"" -#~ msgstr "CD amb Ubuntu 5.10 \"Breezy Badger\"" - -#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "CD amb Ubuntu 5.04 \"Hoary Hedgehog\"" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD amb Ubuntu 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Actualitzacions de seguretat d'Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Actualitzacions d'Ubuntu 4.10" - -#~ msgid "Ubuntu 5.04 Security Updates" -#~ msgstr "Actualitzacions de seguretat d'Ubuntu 5.04" - -#~ msgid "Ubuntu 5.04 Updates" -#~ msgstr "Actualitzacions d'Ubuntu 5.04" - #~ msgid "Contributed software" #~ msgstr "Programari de la comunitat" @@ -1470,9 +1703,6 @@ msgstr "Programari no compatible DFSG" #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" -#~ msgid "Debian Stable Security Updates" -#~ msgstr "Debian Stable Security Updates" - #~ msgid "Debian Stable" #~ msgstr "Debian Stable" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:52+0000\n" "Last-Translator: Tomáš Hála <tomas@monty.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -18,65 +18,109 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Denně" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Obden" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Týdně" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Každé dva týdny" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Po týdnu" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Po dvou týdnech" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Po měsíci" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Po %s dnech" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Instaluji aktualizace" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Aktualizace softwaru" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importovat klíč" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Chyba při importování vybraného souboru" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný soubor nemusí obsahovat GPG klíč nebo může být porušen." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Chyba při odstraňování klíče" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný klíč nemohl být odstraněn. Prosím oznamte to jako chybu." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Prosím zadejte jméno disku" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Prosím vložte disk do mechaniky:" @@ -107,20 +151,20 @@ msgstr "" "Váš systém obsahuje poškozené balíky, které nemohou být tímto programem " "opraveny. Před pokračováním oje prosím pravte použitím synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemohu aktualizovat požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Základní balík by musel být odstraněn" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemohu vypočítat aktualizaci" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -129,11 +173,11 @@ msgstr "" "chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Chyba při ověření některých balíků" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -143,12 +187,12 @@ msgstr "" "problémem v síti. Možná to budete chtít zkusit později. Níže je uveden " "seznam neověřených balíků." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Nemohu nainstalovat '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -156,11 +200,11 @@ msgstr "" "Nebylo možné nainstalovat požadovaný balík. Prosím oznamte to jako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Nemohu odhadnout meta-balík" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -173,15 +217,15 @@ msgstr "" " Před pokračováním si prosím nainstalujte si jeden z výše uvedených balíků " "pomocí synaptic nebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Probíhá čtení cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nenalezeno správné zrcadlo" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -194,11 +238,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Vytvořit standardní zdroje?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -207,11 +251,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Neplatná informace zdroje" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -219,22 +263,22 @@ msgstr "" "Upgrade informací o úložišti vrátil neplatný soubor. Prosím oznamte to jako " "chybu." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Zdroje třetích stran vypnuté" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Chyba během aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -242,11 +286,11 @@ msgstr "" "Nastala chyba během aktualizace. Toto je obvykle způsobeno chybou síťového " "připojení. Prosím zkontrolujte své připojení a zkuste to znovu." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Nedostatek volného místa na disku" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -255,15 +299,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Chcete spustit aktualizaci?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Nelze nainstalovat aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -272,11 +316,11 @@ msgstr "" "stavu. Zkuste ho prosím opravit pomocí 'sudo apt-get install -f' nebo " "Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Nelze stáhnout aktualizace" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -284,11 +328,11 @@ msgstr "" "Aktualizace byla předčasně ukončena. Prosím zkontrolujte si připojení k " "internetu nebo instalační médium a zkuste to znovu. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -297,23 +341,23 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Odebrat zastaralé balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Přeskočit tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Odebrat" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Chyba při zaznamenávání" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -322,26 +366,26 @@ msgstr "" "prohléhněte níže uvedenou zprávu. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Obnovuje se původní stav systému" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Kontroluje se manažer balíků" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Aktualizují se informace o úložišti" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -349,19 +393,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Požaduje se potvrzení" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Probíhá upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Vyhledáván zastaralý software" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Upgrade systému je dokončen." @@ -435,11 +479,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Příkaz \"diff\" nebyl nalezen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Nastala fatální chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -450,7 +494,9 @@ msgstr "" "nyní předčasně ukončen. Váš původní sources.list byl uložen do /etc/apt/" "sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -458,7 +504,7 @@ msgstr[0] "%s balík bude odstraněn." msgstr[1] "%s balíky budou odstraněny." msgstr[2] "%s balíků bude odstraněno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -466,7 +512,7 @@ msgstr[0] "%s nový balík bude nainstalován." msgstr[1] "%s nové balíky budou nainstalovány." msgstr[2] "%s nových balíků bude nainstalováno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -474,40 +520,40 @@ msgstr[0] "%s balík bude nahrazen vyšší verzí." msgstr[1] "%s balíky budou nahrazeny vyšší verzí." msgstr[2] "%s balíky bude nahrazeno vyšší verzí." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Bude staženo celkem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "Upgrade může trvat několik hodin a nesmí být později přerušen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "Pro zamezení ztráty dat, uzavřete všechny aplikace a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Žádné upgrady nebyly nalezeny." -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Váš systém byl již upgradován." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Odstranit %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Nainstalovat %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Upgradovat %s" @@ -527,7 +573,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -552,8 +598,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Spustit upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Přechází se na Ubuntu 6.06 LTS</span>" @@ -710,11 +756,16 @@ msgstr "Stahuji %li. soubor z %li rychlostí %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Stahuji %li. soubor z %li neznámou rychlostí" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Seznam změn ještě není dostupný. Prosím, zkuste to později znovu." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -722,41 +773,41 @@ msgstr "" "Selhalo stažení seznamu změn. Prosím zkontrolujte své internetové připojení." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Nelze nainstalovat všechny dostupné aktualizace" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Následující aktualizace budou přeskočeny:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Verze %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Stahuji seznam změn ..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Stahovaná velikost: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Váš systém je aktuální" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -764,32 +815,24 @@ msgstr[0] "Můžete instalovat %s aktualizaci" msgstr[1] "Můžete instalovat %s aktualizace" msgstr[2] "Můžete instalovat %s aktualizací" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Skrýt detaily" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Zobrazit detaily" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Prosím čekejte, může to nějakou dobu trvat." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Aktualizace je dokončena" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nová verze: %s (Velikost: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Vaše distribude už není podporovaná" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -799,34 +842,24 @@ msgstr "" "Přejděte na další verzi Ubuntu Linuxu. Pro více informací o přechodu na " "vyšší verzi se podívejte na http://www.ubuntu.com." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "V jednu chvíli může běžet jen jeden nástroj pro správu software" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Uzavřete nejdříve prosím jiné aplikace, jako např. \"aptitude\" nebo " -"\"Synaptic\"." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -838,7 +871,7 @@ msgstr "" "Váš systéme nezjišťuje nové aktualizace automaticky. Nastavení můžete změnit " "v \"Systém\" -> \"Správa\" -> \"Vlastnosti Software\"" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -850,43 +883,47 @@ msgstr "" "Aktualizace softwaru opravují chyby, eliminují bezpečnostní zranitelnosti a " "poskytují nové funkce." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Udržujte Váš systém aktuální</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Přerušit _stahování" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Změny" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Z_kontrolovat" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Zkontrolovat dostupnost nových aktualizací v distribučních kanálech" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Popis" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Poznámky k vydáni" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Zobrazit průběh stahování jednotlivých souborů" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aktualizace softwaru" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -894,63 +931,85 @@ msgstr "" "Aktualizace softwaru opravuje chyby, eliminuje bezpečnostní zranitelnosti a " "poskytují nové vlastnosti." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgradovat na poslední verzi Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Zkontrolovat" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Nezobrazovat příště tyto informace" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Na_instalovat Aktualizace" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Zdroje</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Změny" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Síťové aktualizace</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Klíče</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Přidat _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Síťové aktualizace</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Ověření" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Smazat stažené soubory programů:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Stahování bylo dokončeno" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importovat veřejný klíč od důvěryhodného poskytovate softwaru" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Instalační Medium" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Síťové aktualizace" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -958,40 +1017,55 @@ msgstr "" "Automaticky instalovány budou pouze bezpečností aktualizace z oficiálních " "serverů Ubuntu." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Obnovit _Původní" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Obnovit původní klíče vaší distribuce" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Předvolby software" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Vlastnosti softwaru" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Zkontrolovat aktualizace automaticky" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Stáhnout aktualizace na pozadí, ale neinstalovat je." -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Importovat klíč" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instalovat bezpečnostní aktualizace bez potvrzení" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1007,40 +1081,33 @@ msgstr "" "\n" "Pro pokračování je třeba funkční připojení k internetu." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Zdroje</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentář:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Součásti:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Součásti:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribuce:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>Adresa:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Zadejte úplný řádek pro cestu APT kanálu, který chcete přidat</b></" @@ -1049,15 +1116,11 @@ msgstr "" "Řádek pro APT obsahuje typ, umístění a součásti kanálu, např. <i>\"deb " "http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT řádek:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Přidat zdroj" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1065,24 +1128,19 @@ msgstr "" "Binární\n" "Zdroj" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Editvat zdroj" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Prohledávám CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Přidat kanál" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Uživatelský" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Obnovit" @@ -1139,120 +1197,313 @@ msgid "The window size" msgstr "Velikost okna" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Konfigurovat kanály softwaru a internetové aktualizace" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Vlastnosti softwaru" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS aktualizace" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Aktualizace" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS bezpečnostní aktualizace" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS aktualizace" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Udržováno komunitou (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Nesvobodný (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Nesvobodný (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS backporty" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálně podporováno" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Omezeno copyrightem" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Udržováno komunitou (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Nesvobodný (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Oficiálně podporované" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Omezeno copyrightem" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Aktualizace" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Bezpoečnostní Aktualizace" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Žádný DFSG kompatibilní Software" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Skrýt detaily" + +#~ msgid "Show details" +#~ msgstr "Zobrazit detaily" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "V jednu chvíli může běžet jen jeden nástroj pro správu software" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Uzavřete nejdříve prosím jiné aplikace, jako např. \"aptitude\" nebo " +#~ "\"Synaptic\"." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Zdroje</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Klíče</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Přidat _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Instalační Medium" + +#~ msgid "Software Preferences" +#~ msgstr "Předvolby software" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid " " +#~ msgstr " " -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Bezpečnostní Aktualizace" +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Zdroje</b>" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Aktualizace" +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Součásti:</b>" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Add Channel" +#~ msgstr "Přidat zdroj" + +#~ msgid "Edit Channel" +#~ msgstr "Editvat zdroj" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Přidat kanál" + +#~ msgid "_Custom" +#~ msgstr "_Uživatelský" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS aktualizace" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS bezpečnostní aktualizace" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS aktualizace" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS backporty" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1264,12 +1515,6 @@ msgstr "Žádný DFSG kompatibilní Software" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sekce</b>" -#~ msgid "Oficially supported" -#~ msgstr "Oficiálně podporované" - -#~ msgid "Installing updates" -#~ msgstr "Instaluji aktualizace" - #~ msgid "Check for available updates" #~ msgstr "Zkontrolovat dostupné aktualizace" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Mathias-K <mathias@computergeil.dk>\n" "Language-Team: Danish <da@li.org>\n" @@ -17,66 +17,110 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Dagligt" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Hver 2. dag" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Ugentligt" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Hver 2. uge" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, fuzzy, python-format msgid "Every %s days" msgstr "Hver %s. dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Efter 1 uge" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Efter 2 uger" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Efter 1 måned" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Efter %s dag(e)" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Installer Opdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Opdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importér nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Fejl under importering af den valgte fil" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte fil er ikke en GPG-nøglefil eller den er i stykker." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Fejl ved fjernelse af nøgle" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Den valgte nøgle kunne ikke fjernes. Rapporter venligst dette som en fejl." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Indtast venligst et navn til disken" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Indsæt venligst en disk i drevet:" @@ -107,22 +151,22 @@ msgstr "" "Dit system indeholder ødelagte pakker som ikke kan repareres med dette " "program. Reparer dem venligst med synaptic eller apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke opgradere de krævede meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "A essential package would have to be removed" msgstr "Det ville være nødvendigt at fjerne en vigtig pakke" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "Kunne ikke udregne opgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -132,11 +176,11 @@ msgstr "" "Rapportér venligst dette som en fejl. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Fejl ved godkendelse af nogle pakker" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -146,12 +190,12 @@ msgstr "" "Det anbefales du prøver igen senere. Se længere nede for en liste over " "pakker som ikke kunne godkendes." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -160,12 +204,12 @@ msgstr "" "som en fejl. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 #, fuzzy msgid "Can't guess meta-package" msgstr "Kan ikke gætte meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -179,15 +223,15 @@ msgstr "" " Installer venligst en af pakkerne nævnt herover ved hjælp af Synaptic eller " "apt-get før du fortsætter." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Læser cache-mellemlager" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -200,11 +244,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -213,11 +257,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Arkivinformation ugyldig." -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -225,22 +269,22 @@ msgstr "" "Opgradering af arkivet resulterede i en ødelagt fil. raporter venligst dette " "som en fejl." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Trediepartskilder er fravalgt" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Fejl under opdatering" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -248,11 +292,11 @@ msgstr "" "En fejl forekom under opdateringen. Dette skyldes som regel et " "netværksproblem, tjek venligst din netværksforbindelse og prøv igen." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Der er ikke nok fri diskplads" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -264,15 +308,15 @@ msgstr "" "køre 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Vil du starte opgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Kunne ikke installere opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -280,11 +324,11 @@ msgstr "" "Upgraderingen afbrydes nu. Dit system kan forekomme ustabilt. En oprydning " "blev foretaget (dpkg --configura -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Kunne ikke hente opgraderingerne" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -292,11 +336,11 @@ msgstr "" "Opgraderingen afbryder nu. Tjek venligst din internetforbindelse eller dit " "installationsmedie og prøv igen. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Noget software er ikke længere officielt understøttet" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -310,25 +354,25 @@ msgstr "" "Hvis du ikke har slået 'universe' til, vil fjernelsen af disse pakker blive " "foreslået i det næste trin. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Fjern forældede pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 #, fuzzy msgid "_Skip This Step" msgstr "_Spring dette trin over" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "Error during commit" msgstr "Fejl under udførsel" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -337,26 +381,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Genstarter oprindelig systemtilstand" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Undersøger pakkehåndtering" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Opdaterer arkivinformation" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -364,19 +408,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Opgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Søger efter forældet software" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Systemopgradering er fuldført" @@ -450,11 +494,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' blev ikke fundet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "En alvorlig fejl opstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " @@ -466,61 +510,63 @@ msgstr "" "afbryder nu.\n" "Din originale fil sources.list blev gemt i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pakke vil blive fjernet." msgstr[1] "%s pakker vil blive fjernet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s ny pakke vil blive installeret." msgstr[1] "%s nye pakker vil blive installeret." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakke vil blive opgraderet." msgstr[1] "%s pakker vil bliver opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, fuzzy, python-format msgid "You have to download a total of %s." msgstr "Der skal i alt hentes %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "Opgraderingen kan tage flere timer og kan ikke fortrydes senere." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "Luk alle åbne programmer og dokumenter for at undgå tab af data." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Kunne ikke finde nogen tilgængelige opgraderinger" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Dit system er allerede opgraderet." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Fjern %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Opgrader %s" @@ -541,7 +587,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -566,8 +612,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Start opgraderinegn?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Opgraderer til Ubuntu 6.06 LTS</span>" @@ -727,11 +773,16 @@ msgstr "Henter fil %li af %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Henter fil %li af %li med ukendt hastighed" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen med ændringer er ikke klar endnu. Prøv venligst igen senere." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -741,11 +792,11 @@ msgstr "" "internetforbindelse." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgængelige opdateringer" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -755,62 +806,54 @@ msgstr "" "opgraderinger\" i pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo " "apt-get dist-upgrade\" i en terminal for at opdatere dit system fuldstændigt." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Følgende opdateringer vil blive sprunget over:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Henter listen med ændringer..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Overføringsstørelse: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Dit system er opdateret" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s opdatering" msgstr[1] "Du kan installere %s opdateringer" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Skjul detaljer" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Vis detaljer" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Vent venligst, dette kan tage et stykke tid." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Opdatering udført" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Ny version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Din distribution understøtes ikke længere" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -820,27 +863,17 @@ msgstr "" "opdateringer. Opgrader til en senere version af Ubuntu Linux. Se http://www." "ubuntu.com (engalsk) for mere informaiton om opgradering." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Det er kun tilladt at have et softwarestyringsværktøj kørende ad gangen." - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Luk venligst det andet program (f.eks. 'Aptitude eller 'Synaptic') først." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Software indexet er i stykker" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -850,7 +883,7 @@ msgstr "" "pakkehåndteringsprogrammet \"Synaptic\" eller kør \"sudo apt-get install -f" "\" i en terminal for at ordne dette problem først." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" @@ -864,7 +897,7 @@ msgstr "" "kan indstille denne adfærd i \"System\" -> \"Administration\" -> \"Software " "Properties\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -872,47 +905,51 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Hold dit system opdateret</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 #, fuzzy msgid "Cancel _Download" msgstr "Afbryd _Hentning" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Ændringer" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 #, fuzzy msgid "Chec_k" msgstr "_Tjek" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 #, fuzzy msgid "Check the software channels for new updates" msgstr "Undersøg softwarekanalerne for nye opdateringer" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Beskrivelse" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 #, fuzzy msgid "Release Notes" msgstr "Udgivelsesnoter" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Vis fremgang for enkelte filer" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Opdateringer" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -920,67 +957,87 @@ msgstr "" "Softwareopdateringer retter fejl, lukker sikkerhedshuller og gør nye " "funktioner tilgængelige." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Opgrader" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Opgrader til seneste version af Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Tjek" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Skjul denne information for fremtiden" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installer Opdateringer" -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Kanaler</b>" +msgid "changes" +msgstr "Ændringer" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internetopdateringer</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Nøgler</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -#, fuzzy -msgid "Add _Cdrom" -msgstr "Tilføj _CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internetopdateringer</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Godkendelse" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 #, fuzzy msgid "D_elete downloaded software files:" msgstr "_Slet overførte softwarefiler:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Overførsel fuldført" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy msgid "Import the public key from a trusted software provider" msgstr "Importer den offentlige nøgle fra en betroet softwareleverandør" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installationsmedie" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internetopdateringer" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -988,40 +1045,55 @@ msgstr "" "Kun sikkerhedsopdateringer fra de officielle Ubuntu-servere vil blive " "installeret automatisk." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Gendan _standard" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Gendan standardnøglerne for din distribution" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Softwareindstillinger" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Softwareinstillinger" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Kontroller automatisk om der er nye opdateringer" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Hent opdateringer i baggrunden, men installer dem ikke" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Importér nøgle" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhedsopdateringer automatisk uden bekræftelse" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" "<b><big>The channel information is out-of-date</big></b>\n" @@ -1038,56 +1110,41 @@ msgstr "" "\n" "Du skal bruge en aktiv internetforbindelse for at fortsætte." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Komponenter:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Komponenter</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-linje:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -#, fuzzy -msgid "Add Channel" -msgstr "Tilføj kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "Binary\n" @@ -1096,25 +1153,19 @@ msgstr "" "Binær\n" "Kildetekst" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -#, fuzzy -msgid "Edit Channel" -msgstr "Rediger kanal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Skanner CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Tilføj kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Brugerdefineret" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Genindlæs" @@ -1180,120 +1231,319 @@ msgstr "Vinduesstørrelsen" #: ../data/software-properties.desktop.in.h:1 #, fuzzy -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "Konfigurer softwarekanaler og internetopdateringer" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Softwareinstillinger" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS Opdateringer" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Opdateringer" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Sikkerhedsopdateringer" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS Opdateringer" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Vedligeholdt af fællesskabet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Ikke frit programmel (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Ikke frit programmel (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officielt understøttet" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 +#. Description +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy -msgid "Restricted copyright" -msgstr "Begrænset copyright" +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Opdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Opdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Vedligeholdt af fællesskabet (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Ikke frit programmel (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Officielt understøttet" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +#, fuzzy +msgid "Restricted copyright" +msgstr "Begrænset copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Opdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Sikkerhedsopdateringer" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Skjul detaljer" + +#~ msgid "Show details" +#~ msgstr "Vis detaljer" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Det er kun tilladt at have et softwarestyringsværktøj kørende ad gangen." + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Luk venligst det andet program (f.eks. 'Aptitude eller 'Synaptic') først." + +#, fuzzy +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanaler</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Nøgler</b>" + +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "Tilføj _CD-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Installationsmedie" + +#~ msgid "Software Preferences" +#~ msgstr "Softwareindstillinger" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid " " +#~ msgstr " " -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Sikkerhedsopdateringer" +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenter</b>" + +#, fuzzy +#~ msgid "Add Channel" +#~ msgstr "Tilføj kanal" + +#, fuzzy +#~ msgid "Edit Channel" +#~ msgstr "Rediger kanal" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Tilføj kanal" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Opdateringer" +#~ msgid "_Custom" +#~ msgstr "_Brugerdefineret" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS Opdateringer" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS Sikkerhedsopdateringer" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS Opdateringer" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 10:58+0000\n" "Last-Translator: Sebastian Heinlein <glatzor@gmx.de>\n" "Language-Team: German GNOME Translations <gnome-de@gnome.org>\n" @@ -18,69 +18,115 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Täglich" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Alle zwei Tage" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Wöchentlich" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Alle zwei Wochen" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Alle %s Tage" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Nach einer Woche" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Nach zwei Wochen" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Nach einem Monat" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Nach %s Tagen" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Aktualisierungen werden installiert" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Software-Aktualisierungen" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Quellen" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Quellen" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Schlüssel importieren" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die ausgewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der ausgewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -91,11 +137,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Geben Sie einen Namen für das Medium ein" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Bitte legen Sie ein Medium in das Laufwerk:" @@ -112,20 +158,20 @@ msgstr "" "werden können. Bitte reparieren Sie diese mit Synaptic oder apt-get, bevor " "Sie fortfahren." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Die erforderlichen Metapakete können nicht aktualisiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ein grundlegendes Paket müsste entfernt werden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Die Aktualisierung konnte nicht berechnet werden" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -134,11 +180,11 @@ msgstr "" "erstellen Sie hierfür einen Fehlerbericht. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Fehler bei der Echtheitsbestätigung einiger Pakete" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -149,12 +195,12 @@ msgstr "" "später noch einmal. Die unten stehenden Pakete konnten nicht auf ihre " "Echtheit hin bestätigt werden:" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "›%s‹ kann nicht installiert werden" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -163,11 +209,11 @@ msgstr "" "Sie hierfür einen Fehlerbericht. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Metapaket konnte nicht bestimmt werden" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -181,15 +227,15 @@ msgstr "" " Bitte installieren Sie eines der obigen Pakete über Synaptic oder apt-get, " "bevor Sie fortfahren." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Zwischenspeicher wird ausgelesen" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Kein gültiger Mirror gefunden" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -209,11 +255,11 @@ msgstr "" "Wenn Sie 'Nein' wählen, wird das Update abgebrochen." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Standardquellen generieren?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -227,11 +273,11 @@ msgstr "" "Sollen Standardeinträge für '%s' hinzugefügt werden? Wenn Sie 'Nein' " "auswählen, wird das Update abgebrochen." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Ungültige Kanalinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -239,11 +285,11 @@ msgstr "" "Die Aktualisierung der Quellen-Information ergab eine ungültige Datei. Bitte " "erstellen Sie einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Quellen von Drittanbietern deaktiviert" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -253,11 +299,11 @@ msgstr "" "Sie können diese nach dem Upgrade mit dem 'software-properties'-Werkzeug " "oder mit Synaptic reaktivieren." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Fehler während der Aktualisierung" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -266,11 +312,11 @@ msgstr "" "Netzwerkprobleme zurückzuführen. Bitte überprüfen Sie Ihre " "Netzwerkverbindung und versuchen Sie es noch einmal." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Unzureichender freier Festplattenspeicher" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -282,15 +328,15 @@ msgstr "" "temporäre Pakete von frühreren Installation mit 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Möchten Sie die Aktualisierung starten?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Die Aktualisierungen konnten nicht installiert werden" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -299,11 +345,11 @@ msgstr "" "unbenutzbaren Zustand befinden. Eine Wiederherstellung wurde durchgeführt " "(dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Die Aktualisierungen konnten nicht heruntergeladen werden" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -312,11 +358,11 @@ msgstr "" "Internet-Verbindung oder Ihr Installationsmedium und versuchen Sie es noch " "einmal. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Einige Programme werden nicht mehr länger offiziell unterstützt" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -330,23 +376,23 @@ msgstr "" "Wenn sie 'universe' nicht aktiviert haben, werden diese Pakete im nächsten " "Schritt zum Entfernen vorgeschlagen. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Veraltete Pakete entfernen?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "Ü_berspringen" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Entfernen" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Fehler beim Anwenden" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -355,26 +401,26 @@ msgstr "" "Nachricht für nähere Informationen. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Wiederherstellen des alten Systemzustandes" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Paketverwaltung wird überprüft" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Aktualisiere Quellen-Information" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Ungültige Paketinformationen" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -386,19 +432,19 @@ msgstr "" "Dies deutet auf einen gravierenden Fehler hin, bitte erstellen Sie hierfür " "einen Fehlerbericht." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Nach Bestätigung fragen" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Aktualisiere" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Nach veralteter Software wird gesucht" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Aktualisierung ist abgeschlossen." @@ -474,11 +520,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Das 'diff'-Kommando konnte nicht gefunden werden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Ein fataler Fehler ist aufgetreten" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -490,65 +536,67 @@ msgstr "" "Ihre ursprüngliche sources.list wurde in /etc/apt/sources.list.distUpgrade " "gespeichert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s Paket wird entfernt." msgstr[1] "%s Pakete werden entfernt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s neues Paket wird installiert." msgstr[1] "%s neue Pakete werden installiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s Paket wird aktualisiert." msgstr[1] "%s Pakete werden aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Insgesamt müssen %s heruntergeladen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Die Aktualisierung kann mehrere Stunden dauern und zu keiner Zeit mehr " "abgebrochen werden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Um Datenverlust zu vermeiden, schließen Sie alle offenen Anwendungen und " "Dokumente." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Es liegen keine Aktualisierungen vor" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Ihr System wurde bereits aktualisiert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s wird entfernt</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s wird installiert" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s wird aktualisiert" @@ -569,7 +617,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -595,8 +643,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Mit der Aktualisierung beginnen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Auf Ubuntu 6.06 LTS aktualisieren</" "span>" @@ -759,13 +807,20 @@ msgstr "Datei %li von %li wird mit %s/s heruntergeladen" msgid "Downloading file %li of %li with unknown speed" msgstr "Datei %li von %li wird mit unbekannter Geschwindigkeit heruntergeladen" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " +"Sie es zu einem späteren Zeitpunkt erneut." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Die Liste mit Aktualisierungen ist momentan nicht verfügbar. Bitte versuchen " "Sie es zu einem späteren Zeitpunkt erneut." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -774,11 +829,11 @@ msgstr "" "überprüfen Sie Ihre Internet-Verbindung." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Nicht alle verfügbaren Aktualisierungen können installiert werden" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -789,62 +844,54 @@ msgstr "" "Paketverwaltung oder führen Sie den Befehl »sudo apt-get dist-upgrade« in " "einem Terminal aus, um Ihr System vollständig zu aktualisieren." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Die folgenden Aktualisierungen werden ausgelassen:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Liste mit Änderungen wird heruntergeladen..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Download-Größe: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Ihr System ist auf dem aktuellen Stand" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sie können %s Aktualisierung installieren" msgstr[1] "Sie können %s Aktualisierungen installieren" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Details verbergen" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Details anzeigen" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Bitte warten Sie, dieser Vorgang kann etwas Zeit in Anspruch nehmen." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Aktualisierung ist abgeschlossen" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Neue Version: %s (Größe: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Ihre Distribution wird nicht länger unterstützt" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -855,28 +902,17 @@ msgstr "" "System auf eine neuere Version von Ubuntu Linux. Auf http://www.ubuntuusers." "de oder http://www.ubuntu.com finden Sie weitere Informationen hierzu." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Neue Version '%s' der Distribution ist freigegeben</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Nur eine Anwendung zur Software-Verwaltung kann zur selben Zeit genutzt " -"werden" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Bitte schließen Sie zuerst andere Anwendungen wie 'aptitude' oder 'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Der Software-Index ist beschädigt" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -886,7 +922,7 @@ msgstr "" "verwenden Sie zuerst die Synaptic Paketverwaltung oder führen Sie »sudo apt-" "get install -f« im Terminal aus, um dieses Problem zu beheben." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -899,7 +935,7 @@ msgstr "" "können dieses Verhalten über die Menüpunkte \"System\" -> \"Systemverwaltung" "\" -> \"Software Eigenschaften\" ändern." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -911,43 +947,47 @@ msgstr "" "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " "stellen neue Funktionen bereit." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Halten Sie Ihr System aktuell</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "_Herunterladen abbrechen" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Änderungen" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Prüfen" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Software-Kanäle auf Aktualisierungen prüfen" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Beschreibung" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Freigabemitteilung" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Fortschritt der einzelnen Dateien anzeigen" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software-Aktualisierungen" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -955,65 +995,87 @@ msgstr "" "Software-Aktualisierungen beheben Fehler, schließen Sicherheitslücken und " "stellen neue Funktionen bereit." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Aktualisieren" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aus die neueste Version von Ubuntu aktualisieren" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Prüfen" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Diese Information in Zukunft _nicht mehr anzeigen" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Aktualisierungen _installieren" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanäle</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Änderungen" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet-Aktualisierungen</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Schlüssel</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "CD-Rom _hinzufügen" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet-Aktualisierungen</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Echtheitsbestätigung" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Heruntergeladene Paketdateien _löschen:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Herunterladen abgeschlossen" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "" "Den öffentlichen Schlüssel eines vertrauenswürdigen Software-Anbieters " "importieren" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installationsmedien" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet-Aktualisierungen" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1021,40 +1083,56 @@ msgstr "" "Nur Sicherheitsaktualisierungen von den offiziellen Ubuntu-Servern werden " "automatisch installiert" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_Vorgabeschlüssel wiederherstellen" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Die Vorgabeschlüssel Ihrer Distribution wiederherstellen" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Software-Einstellungen" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Software-Eigenschaften" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Quellen" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Automatisch auf Aktualisierungen prüfen:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "" "Aktualisierungen im _Hintergrund herunterladen, aber nicht installieren" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Schlüsseldatei _importieren" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "Sicherheitsaktualisierungen _ohne Bestätigung installieren" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1070,40 +1148,33 @@ msgstr "" "\n" "Sie benötigen hierfür eine bestehende Internet-Verbindung." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponenten:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponenten</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Geben Sie die vollständige APT-Zeile für den Kanal ein, den sie " @@ -1112,15 +1183,11 @@ msgstr "" "Die APT-Zeile enthält den Typ, den Ort und die Komponenten des Software-" "Kanals, z.B. <i>»deb http://ftp.debian.org sarge main«</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-Zeile:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Kanal hinzufügen" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1128,24 +1195,21 @@ msgstr "" "Binär\n" "Quellcode" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Kanal bearbeiten" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Quellen" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "CD wird eingelesen" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "Kanal _hinzufügen" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Benutzerdefiniert" +msgid "_Add Source" +msgstr "Quellen" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Neu laden" @@ -1204,119 +1268,314 @@ msgid "The window size" msgstr "Die Fenstergröße" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Software-Kanäle und Aktualisierungen konfigurieren" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software-Eigenschaften" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Aktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Von der Gemeinschaft betreut (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Unfrei (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Unfrei (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Sicherheitsaktualisierungen" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS Aktualisierungen" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offiziell unterstützt" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Urheberrechtlich eingeschränkt" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Aktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Sicherheitsaktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Aktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Von der Gemeinschaft betreut (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Unfrei (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Offiziell unterstützt" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Urheberrechtlich eingeschränkt" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Aktualisierungen" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Sicherheitsaktualisierungen" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatible Software mit unfreien Abhängigkeiten" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nicht DFSG-kompatible Software" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Details verbergen" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "Show details" +#~ msgstr "Details anzeigen" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Sicherheitsaktualisierungen" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Nur eine Anwendung zur Software-Verwaltung kann zur selben Zeit genutzt " +#~ "werden" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Aktualisierungen" +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Bitte schließen Sie zuerst andere Anwendungen wie 'aptitude' oder " +#~ "'Synaptic'." -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanäle</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Schlüssel</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "CD-Rom _hinzufügen" + +#~ msgid "Installation Media" +#~ msgstr "Installationsmedien" + +#~ msgid "Software Preferences" +#~ msgstr "Software-Einstellungen" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenten</b>" + +#~ msgid "Add Channel" +#~ msgstr "Kanal hinzufügen" + +#~ msgid "Edit Channel" +#~ msgstr "Kanal bearbeiten" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "Kanal _hinzufügen" + +#~ msgid "_Custom" +#~ msgstr "_Benutzerdefiniert" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS Sicherheitsaktualisierungen" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS Aktualisierungen" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -1383,12 +1642,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sparten:</b>" -#~ msgid "Oficially supported" -#~ msgstr "Offiziell unterstützt" - -#~ msgid "Installing updates" -#~ msgstr "Aktualisierungen werden installiert" - #~ msgid "Check for available updates" #~ msgstr "Nach verfügbaren Aktualisierungen suchen" @@ -1398,10 +1651,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Reload the latest information about updates" #~ msgstr "Aktuelle Paketinformationen vom Server beziehen" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Software-Aktualisierungen" - #~ msgid "Add the following software channel?" #~ msgid_plural "Add the following software channels?" #~ msgstr[0] "Die folgenden Software-Kanäle hinzufügen?" @@ -1422,10 +1671,6 @@ msgstr "Nicht DFSG-kompatible Software" #~ "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" @@ -1628,15 +1873,9 @@ msgstr "Nicht DFSG-kompatible Software" #~ msgid "Binary" #~ msgstr "Binär" -#~ msgid "Source" -#~ msgstr "Quellen" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Sicherheitsaktualisierungen" - #~ msgid "Contributed software" #~ msgstr "Contributed Software" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 15:39+0000\n" "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n" "Language-Team: Greek <team@gnome.gr>\n" @@ -16,69 +16,112 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Ημερησίως" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Κάθε δύο ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Εβδομαδιαίως" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Κάθε δύο εβδομάδες" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Κάθε %s ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Μετά από μια εβδομάδα" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Μετά από δύο εβδομάδες" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Μετά από ένα μήνα" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Μετά από %s ημέρες" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Εγκατάσταση ενημερώσεων" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "Κανάλι λογισμικού" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "Ενεργό" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Εισαγωγή κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Σφάλμα εισαγωγής επιλεγμένου αρχείου" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Το επιλεγμένο αρχείο μπορεί να μην είναι ένα αρχείο κλειδιού GPG ή μπορεί να " "είναι κατεστραμμένο." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Σφάλμα απομάκρυνσης του κλειδιού" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Το επιλεγμένο κλειδί δεν μπορεί να απομακρυνθεί. Παρακαλώ αναφέρετε το ως " "σφάλμα." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -89,11 +132,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Παρακαλώ εισάγετε ένα όνομα για το δίσκο" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Παρακαλώ εισάγετε ένα δίσκο στον οδηγό:" @@ -110,20 +153,20 @@ msgstr "" "διορθωθούν με αυτό το λογισμικό. Παρακαλώ διορθώστε τα μέσω synaptic ή apt-" "get για να συνεχίσετε." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Αδυναμία αναβάθμισης απαιτούμενων μετα-πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ένα απαραίτητο πακέτα θα πρέπει να απομακρυνθεί" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Αδυναμία υπολογισμού της αναβάθμισης" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -132,11 +175,11 @@ msgstr "" "Παρακαλώ αναφέρετε το ως σφάλμα. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Σφάλμα πιστοποίησης κάποιων πακέτων" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -146,12 +189,12 @@ msgstr "" "σε ένα πρόβλημα δικτύου. Προσπαθήστε αργότερα. Δείτε παρακάτω τη λίστα των " "μη πιστοποιημένων πακέτων." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Αδυναμία εγκατάστασης '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -160,11 +203,11 @@ msgstr "" "ως σφάλμα. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Αδυναμία εύρεσης μετα-πακέτου" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -178,15 +221,15 @@ msgstr "" "Εγκαταστήστε ένα από αυτά τα πακέτα πρώτα μέσω synaptic ή apt-get πριν να " "συνεχίσετε." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Ανάγνωση λανθάνουσας μνήμης" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Δεν βρέθηκε έγκυρη εναλλακτική τοποθεσία αρχείων" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -207,11 +250,11 @@ msgstr "" " Αν επιλέξετε 'Όχι' η ενημέρωση θα ακυρωθεί." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Δημιουργία προεπιλεγμένων πηγών;" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -225,11 +268,11 @@ msgstr "" "Να προστεθούν οι προεπιλεγμένες καταχωρίσεις για το '%s'; Αν απαντήσετε " "'Όχι' η ενημέρωση θα ακυρωθεί." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Μη έγκυρες πληροφορίες repository" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -237,11 +280,11 @@ msgstr "" "Η αναβάθμιση των πληροφοριών repository είχε σαν αποτέλεσμα ένα άκυρο " "αρχείο. Παρακαλώ αναφέρετε το ως σφάλμα." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Απενεργοποιήθηκαν πηγές τρίτων" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -251,11 +294,11 @@ msgstr "" "Μπορείτε να τις ενεργοποιήσετε μετά την αναβάθμιση με το εργαλείο 'software-" "properties' ή με το synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Σφάλμα κατά την ενημέρωση" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -263,11 +306,11 @@ msgstr "" "Δημιουργήθηκε ένα πρόβλημα κατά την αναβάθμιση. Αυτό συνήθως σημαίνει " "πρόβλημα δικτύου. Ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Δεν υπάρχει αρκετός χώρος στο δίσκο" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -279,15 +322,15 @@ msgstr "" "προηγούμενων εγκαταστάσεων με την εντολή 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Θέλετε να ξεκινήσετε την αναβάθμιση;" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Αδυναμία εγκατάστασης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -295,11 +338,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Το σύστημα σας μπορεί να γίνει ασταθές. " "Εκτελείται μια διεργασία ανάκτησης (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Αδυναμία λήψης των αναβαθμίσεων" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -307,11 +350,11 @@ msgstr "" "Η αναβάθμιση τώρα θα τερματιστεί. Παρακαλώ ελέγξτε τη σύνδεση σας στο " "διαδίκτυο ή το μέσο εγκατάστασης και προσπαθήστε ξανά. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Μερικά πακέτα λογισμικού δεν υποστηρίζονται πια επίσημα" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -325,23 +368,23 @@ msgstr "" "Αν δεν έχετε ενεργοποιημένο το 'universe' , θα γίνει πρόταση για απομάκρυνση " "αυτών των πακέτων στο επόμενο βήμα. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Αφαίρεση παρωχημένων πακέτων;" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "Παράκα_μψη αυτου του βήματος" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Απομάκρυνση" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Σφάλμα κατά την υποβολή" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -350,26 +393,26 @@ msgstr "" "παρακάτω μήνυμα για περισσότερες πληροφορίες. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Γίνεται επαναφορά αρχικής κατάστασης συστήματος" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Έλεγχος διαχειριστή πακέτων" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Ενημέρωση πληροφοριών repository" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Μη έγκυρες πληροφορίες πακέτου" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -380,19 +423,19 @@ msgstr "" "απαραίτητο πακέτο '%s'.\n" " Αυτό σημαίνει ότι πρόκειται για σημαντικό σφάλμα, παρακαλώ αναφέρετε το." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Ερώτηση για επιβεβαίωση" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Γίνεται αναβάθμιση" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Γίνεται αναζήτηση για παρωχημένο λογισμικό" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Η αναβάθμιση συστήματος ολοκληρώθηκε." @@ -466,11 +509,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Η εντολή 'diff' δεν βρέθηκε" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Προέκυψε μοιραίο σφάλμα" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -482,65 +525,67 @@ msgstr "" "\"τερματιστεί. Το αρχικό αρχείο sources.list αποθηκεύτηκε στο /etc/apt/" "sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s πακέτο πρόκειται να απομακρυνθεί." msgstr[1] "%s πακέτα πρόκειται να απομακρυνθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s νέο πακέτο πρόκειται να εγκατασταθεί." msgstr[1] "%s νέο πακέτα πρόκειται να εγκατασταθούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s πακέτο πρόκειται να αναβαθμιστεί." msgstr[1] "%s πακέτα πρόκειται να αναβαθμιστούν." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Θα πρέπει να μεταφορτώσετε συνολικά %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Η αναβάθμιση μπορεί να διαρκέσει αρκετές ώρες και δεν είναι δυνατή η ακύρωση " "της αργότερα." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Για να αποφύγετε απώλεια δεδομένων, κλείστε όλες τις ανοικτές εφαρμογές και " "έγγραφα." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Δεν βρέθηκαν αναβαθμίσεις" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Το σύστημα σας έχει ήδη αναβαθμιστεί." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Απομάκρυνση %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Εγκατάσταση %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Αναβάθμιση %s" @@ -561,7 +606,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -587,8 +632,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Έναρξη της αναβάθμισης;</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Αναβάθμιση σε Ubuntu 6.06 LTS</span>" @@ -746,12 +791,18 @@ msgstr "Λήψη αρχείου %li από %li με %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Λήψη αρχείου %li από %li με άγνωστη ταχύτητα" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Η λίστα των αλλαγών δεν είναι ακόμα διαθέσιμη. Προσπαθήστε ξανά αργότερα." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -760,11 +811,11 @@ msgstr "" "διαδίκτυο." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Αδυναμία εγκατάστασης όλων των διαθέσιμων ενημερώσεων" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -775,62 +826,54 @@ msgstr "" "διαχειριστή πακέτων ή την εντολή \"sudo apt-get dist-upgrade\" σε ένα " "τερματικό για να αναβαθμίσετε πλήρως το σύστημα σας." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Οι παρακάτω ενημερώσεις θα παρακαμφθούν:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Έκδοση%s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Λήψη της λίστας των αλλαγών..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Μέγεθος λήψης: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Το σύστημα σας είναι ενημερωμένο" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Μπορείτε να εγκαταστήσετε %s ενημέρωση" msgstr[1] "Μπορείτε να εγκαταστήσετε %s ενημερώσεις" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Απόκρυψη λεπτομερειών" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Εμφάνιση λεπτομερειών" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Παρακαλώ περιμένετε, αυτό μπορεί να διαρκέσει λίγο χρόνο." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Η ενημέρωση ολοκληρώθηκε" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Νέα έκδοση: %s (Μέγεθος: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Η διανομή σας δεν υποστηρίζεται πια" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -841,26 +884,17 @@ msgstr "" "Ubuntu Linux. Δείτε το http://www.ubuntu.com για περισσότερες πληροφορίες " "για την αναβάθμιση." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Είναι διαθέσιμη νέα έκδοση διανομής '%s'</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Μόνο ένα εργαλείο διαχείρισης λογισμικού μπορεί να εκτελείται." - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το 'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Ο κατάλογος λογισμικού είναι κατεστραμμένος" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -870,7 +904,7 @@ msgstr "" "το διαχειριστή πακέτων \"Synaptic\" η εκτελέστε την εντολή \"sudo apt-get " "install -f\" σε ένα τερματικό για να διορθώσετε το πρόβλημα πρώτα." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -883,7 +917,7 @@ msgstr "" "ρυθμίσετε αυτή τη συμπεριφορά μέσω του μενού \"Σύστημα\" -> \"Διαχείριση " "συστήματος\" -> \"Ιδιότητες λογισμικού\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -895,43 +929,47 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Διατηρήστε το σύστημα σας ενημερωμένο</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Ακύρωση _λήψης αρχείων" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Αλλαγές" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Ελε_γχος" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Έλεγχος των καναλιών λογισμικού για ενημερώσεις" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Περιγραφή" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Σημειώσεις έκδοσης" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Εμφάνιση προόδου μοναδικών αρχείων" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Αναβαθμίσεις λογισμικού" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -939,63 +977,85 @@ msgstr "" "Οι ενημερώσεις λογισμικού μπορούν να διορθώνουν σφάλματα, κενά ασφαλείας και " "να παρέχουν νέες λειτουργίες." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Ανα_βάθμιση" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Αναβάθμιση στη τελευταία έκδοση του Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "Έλε_γχος" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Απόκρυ_ψη αυτής της πληροφορίας στο μέλλον" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Ε_γκατάσταση ενημερώσεων" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Κανάλια</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Αλλαγές" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Αναβαθμίσεις διαδικτύου</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Κλειδιά</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Προσθήκη _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Αναβαθμίσεις διαδικτύου</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Πιστοποίηση" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Δια_γραφή αρχείων ληφθέντων πακέτων" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Η λήψη ολοκληρώθηκε" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Αναβαθμίσεις διαδικτύου" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1003,39 +1063,54 @@ msgstr "" "Μόνο οι ενημερώσεις ασφαλείας που προέρχονται από τους επίσημους " "εξυπηρετητές του Ubuntu θα εγκαθίστανται αυτόματα." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Επαναφορά π_ροεπιλογών" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Επαναφορά των προεπιλεγμένων κλειδιών της διανομής σας" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Προτιμήσεις λογισμικού" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Ιδιότητες λογισμικού" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "Αυτόματος έλεγ_χος για ενημερώσεις κάθε:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "Λή_ψη ενημερώσεων στο παρασκήνιο χωρίς να εγκατασταθούν" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Ε_ισαγωγή αρχείου κλειδιού" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "Ε_γκατάσταση ενημερώσεων ασφαλείας χωρίς επιβεβαίωση" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1052,40 +1127,33 @@ msgstr "" "\n" "Χρειάζεστε μια ενεργή σύνδεση στο διαδίκτυο για να συνεχίσετε." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Κανάλι</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Σχόλιο:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Στοιχεία:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Στοιχεία</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Διανομή:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Τύπος:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Εισάγετε την πλήρη γραμμή APT του καναλιού που θέλετε να " @@ -1094,15 +1162,11 @@ msgstr "" "Η γραμμή APT περιέχει τον τύπο, τοποθεσία και το περιεχόμενο ενός καναλιού, " "για παράδειγμα <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Γραμμή APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Προσθήκη Καναλιού" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1110,24 +1174,19 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Επεξεργασία καναλιού" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Σάρωση CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "Προσ_θήκη καναλιού" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Προσαρμοσμένο" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "Ανα_νέωση" @@ -1185,119 +1244,312 @@ msgid "The window size" msgstr "Το μέγεθος του παραθύρου" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Ρύθμιση των καναλιών λογισμικού για ενημερώσεις" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Ιδιότητες λογισμικού" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Αναβαθμίσεις Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ενημερώσεις ασφαλείας Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ενημερώσεις Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Όχι-ελεύθερα (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Όχι-ελεύθερα (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Με επίσημη υποστήριξη" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Περιορισμένα πνευματικά δικαιώματα" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Αναβαθμίσεις Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Αναβαθμίσεις Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Όχι-ελεύθερα (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Oficially supported" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Περιορισμένα πνευματικά δικαιώματα" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Αναβαθμίσεις Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Αναβαθμίσεις ασφαλείας Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Λογισμικό συμβατό με DFSG με μη Ελεύθερες Εξαρτήσεις" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Λογισμικό μη συμβατό με DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Απόκρυψη λεπτομερειών" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Show details" +#~ msgstr "Εμφάνιση λεπτομερειών" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.10" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Μόνο ένα εργαλείο διαχείρισης λογισμικού μπορεί να εκτελείται." -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Αναβαθμίσεις Ubuntu 5.10" +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Παρακαλώ κλείστε την άλλη εφαρμογή πρώτα π.χ. το 'aptitude' ή το " +#~ "'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Κανάλια</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Κλειδιά</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Προσθήκη _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Μέσα εγκατάστασης" + +#~ msgid "Software Preferences" +#~ msgstr "Προτιμήσεις λογισμικού" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Κανάλι</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Στοιχεία</b>" + +#~ msgid "Add Channel" +#~ msgstr "Προσθήκη Καναλιού" + +#~ msgid "Edit Channel" +#~ msgstr "Επεξεργασία καναλιού" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "Προσ_θήκη καναλιού" + +#~ msgid "_Custom" +#~ msgstr "_Προσαρμοσμένο" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ενημερώσεις ασφαλείας Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ενημερώσεις Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" #~ msgid "Inavlid package information" #~ msgstr "Μη έγκυρες πληροφορίες πακέτου" @@ -1318,24 +1570,12 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Ενότητες</b>" -#~ msgid "Oficially supported" -#~ msgstr "Oficially supported" - -#~ msgid "Installing updates" -#~ msgstr "Εγκατάσταση ενημερώσεων" - #~ msgid "Check for available updates" #~ msgstr "Έλεγχος για διαθέσιμες ενημερώσεις" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Ενότητες:</b>" -#~ msgid "Software Channel" -#~ msgstr "Κανάλι λογισμικού" - -#~ msgid "Active" -#~ msgstr "Ενεργό" - #~ msgid "Add Software Channels" #~ msgstr "Προσθήκη καναλιών λογισμικού" @@ -1397,9 +1637,3 @@ msgstr "Λογισμικό μη συμβατό με DFSG" #~ msgid "Ubuntu 5.10 \"Breezy Badger\"" #~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" - -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" - -#~ msgid "Ubuntu 5.04 Security Updates" -#~ msgstr "Αναβαθμίσεις ασφαλείας Ubuntu 5.04" diff --git a/po/en_AU.po b/po/en_AU.po index 24018891..b2fce2b8 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:06+0000\n" "Last-Translator: David Symons <david.symons@liberatedcomputing.net>\n" "Language-Team: English (Australia) <en_AU@li.org>\n" @@ -17,66 +17,110 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Daily" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Every two days" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Weekly" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Every two weeks" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Every %s days" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "After one week" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "After two weeks" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "After one month" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "After %s days" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Install Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Software Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Import key" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Please enter a name for the disc" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Please insert a disc in the drive:" @@ -107,20 +151,20 @@ msgstr "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Can't upgrade required meta-packages" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "An essential package would have to be removed" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Could not calculate the upgrade" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -129,11 +173,11 @@ msgstr "" "this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Error authenticating some packages" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -143,12 +187,12 @@ msgstr "" "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Can't install '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -157,11 +201,11 @@ msgstr "" "bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Can't guess meta-packag" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,15 +219,15 @@ msgstr "" " Please install one of the packages above first using synaptic or apt-get " "before proceeding." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Reading cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "No valid mirror found" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -203,11 +247,11 @@ msgstr "" "If you select 'no' the update will cancel." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Generate default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -220,11 +264,11 @@ msgstr "" "Should default entries for '%s' be added? If you select 'No' the update will " "cancel." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Repository information invalid" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -232,11 +276,11 @@ msgstr "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Third party sources disabled" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -246,11 +290,11 @@ msgstr "" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Error during update" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -258,11 +302,11 @@ msgstr "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Not enough free disk space" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -274,15 +318,15 @@ msgstr "" "'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Do you want to start the upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Could not install the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -290,11 +334,11 @@ msgstr "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Could not download the upgrades" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -302,11 +346,11 @@ msgstr "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Some software no longer officially supported" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -320,23 +364,23 @@ msgstr "" "If you don't have 'universe' enabled these packages will be suggested for " "removal in the next step. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Remove obsolete packages?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Skip This Step" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Remove" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Error during commit" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -345,26 +389,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Restoring original system state" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Checking package manager" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Updating repository information" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Invalid package information" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -375,19 +419,19 @@ msgstr "" "not be found anymore.\n" "This indicates a serious error, please report this as a bug." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Asking for confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Upgrading" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Searching for obsolete software" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "System upgrade is complete." @@ -462,11 +506,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "The 'diff' command was not found" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "A fatal error occured" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -477,62 +521,64 @@ msgstr "" "\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s package is going to be removed." msgstr[1] "%s packages are going to be removed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s new package is going to be installed." msgstr[1] "%s new packages are going to be installed." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s package is going to be upgraded." msgstr[1] "%s packages are going to be upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "You have to download a total of %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "The upgrade can take several hours and cannot be canceled at any time later." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "To prevent data loss close all open applications and documents." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Could not find any upgrades" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Your system has already been upgraded." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remove %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Install %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -553,7 +599,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -578,8 +624,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Start the upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" @@ -736,11 +782,16 @@ msgstr "Downloading file %li of %li with %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloading file %li of %li with unknown speed" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "The list of changes is not available yet. Please try again later." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "The list of changes is not available yet. Please try again later." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -749,11 +800,11 @@ msgstr "" "connection." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Cannot install all available updates" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -763,62 +814,54 @@ msgstr "" "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "The following updates will be skipped:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Downloading the list of changes..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Download size: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Your system is up-to-date" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "You can install %s update" msgstr[1] "You can install %s updates" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Hide details" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Show details" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Please wait, this can take some time." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Update is complete" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "New version: %s (Size: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Your distribution is not supported anymore" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -828,26 +871,17 @@ msgstr "" "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>New distribution release '%s' is available</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Only one software management tool is allowed to run at the same time" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Please close the other application e.g. 'aptitude' or 'Synaptic' first." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Software index is broken" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -857,7 +891,7 @@ msgstr "" "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -870,7 +904,7 @@ msgstr "" "Your system does not check for updates automatically. You can configure this " "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -883,43 +917,47 @@ msgstr "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Keep your system up-to-date</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Cancel _Download" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Changes" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Chec_k" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Check the software channels for new updates" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Release Notes" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Show progress of single files" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software Updates" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -927,63 +965,85 @@ msgstr "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade to the latest version of Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Check" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Hide this information in the future" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Install Updates" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Changes" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet updates</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet updates</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Authentication" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "D_elete downloaded software files:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Download is complete" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Import the public key from a trusted software provider" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installation Media" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet Updates" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -991,39 +1051,54 @@ msgstr "" "Only security updates from the official Ubuntu servers will be installed " "automatically" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Restore _Defaults" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Restore the default keys of your distribution" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Software Properties" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Check for updates automatically:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Download updates in the background, but do not install them" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Import Key File" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Install security updates without confirmation" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1041,40 +1116,33 @@ msgstr "" "\n" "You need a working internet connection to continue." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Channel</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Components:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Components</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Enter the complete APT line of the channel that you want to add</b></" @@ -1083,15 +1151,11 @@ msgstr "" "The APT line includes the type, location and components of a channel, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Add Channel" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1099,24 +1163,19 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Scanning CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Add Channel" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Reload" @@ -1175,116 +1234,310 @@ msgid "The window size" msgstr "The window size" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configure software channels and internet updates" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software Properties" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Security Updates" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officially supported" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Restricted copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Security Updates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-compatible Software with Non-Free Dependencies" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Non-DFSG-compatible Software" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Hide details" + +#~ msgid "Show details" +#~ msgstr "Show details" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Only one software management tool is allowed to run at the same time" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Channels</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Keys</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Add _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Installation Media" + +#~ msgid "Software Preferences" +#~ msgstr "Software Preferences" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Channel</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" + +#~ msgid "Add Channel" +#~ msgstr "Add Channel" + +#~ msgid "Edit Channel" +#~ msgstr "Edit Channel" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Add Channel" + +#~ msgid "_Custom" +#~ msgstr "_Custom" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Security Updates" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS Security Updates" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Updates" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS Updates" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" diff --git a/po/en_CA.po b/po/en_CA.po index c17b98c2..4a369995 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Adam Weinberger <adamw@gnome.org>\n" "Language-Team: Canadian English <adamw@gnome.org>\n" @@ -17,67 +17,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Details</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Install" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Software Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -85,11 +131,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -103,20 +149,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -125,23 +171,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -150,11 +196,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -163,15 +209,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -184,11 +230,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -197,43 +243,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -242,35 +288,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -279,50 +325,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -330,20 +376,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -418,73 +464,75 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -503,7 +551,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -524,8 +572,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -681,11 +728,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "There is a new release of Ubuntu available!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -695,110 +747,93 @@ msgstr "" "connection." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 #, fuzzy msgid "The following updates will be skipped:" msgstr "The following packages are not upgraded:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Cancel downloading the ChangeLog" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Details</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -806,7 +841,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -814,154 +849,190 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Changes" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software Updates" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Upgrade finished" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Install" -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Details</b>" +msgid "changes" +msgstr "Changes" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Internet Updates</b>" -#: ../data/SoftwareProperties.glade.h:3 -#, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>Details</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "Add _Cdrom" -msgstr "Add _CD" +msgid "<b>Internet updates</b>" +msgstr "<b>Internet Updates</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy msgid "Authentication" msgstr "A_uthentication" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Internet Updates</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Software Properties" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Source" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -971,44 +1042,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Details</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Components</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Components</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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</" @@ -1018,15 +1079,11 @@ msgstr "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " "detailed description of the syntax in the documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1034,23 +1091,21 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Reload" @@ -1103,129 +1158,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software Properties" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.04 Updates" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 Security Updates" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 5.04 Security Updates" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:97 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 5.04 Updates" +msgid "Important security updates" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:117 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 5.04 Updates" +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.04 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.04 Security Updates" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Restricted copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.04 Updates" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 5.04 Security Updates" +#~ msgid "Hide details" +#~ msgstr "<b>Details</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.04 Security Updates" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "Add _CD" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "Installing updates..." + +#~ msgid "Software Preferences" +#~ msgstr "Software Preferences" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" + +#~ msgid "_Custom" +#~ msgstr "_Custom" #, fuzzy -#~ msgid "Ubuntu 5.10 Security Updates" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 5.04 Updates" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Security Updates" #~ msgstr "Ubuntu 5.04 Security Updates" #, fuzzy -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Ubuntu 5.04 Updates" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" #~ msgstr "Ubuntu 5.04 Updates" #~ msgid "Repositories changed" @@ -1246,10 +1478,6 @@ msgstr "" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sections:</b>" -#, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Officially supported" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sections:</b>" @@ -1257,10 +1485,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Reload the package information from the server." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Software Updates" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1274,10 +1498,6 @@ msgstr "" #~ 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" @@ -1431,9 +1651,6 @@ msgstr "" #~ "running will no longer get security fixes or other critical updates. " #~ "Please see http://www.ubuntulinux.org for upgrade information." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "There is a new release of Ubuntu available!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -1467,15 +1684,9 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binary" -#~ msgid "Source" -#~ msgstr "Source" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Security Updates" - #~ msgid "Contributed software" #~ msgstr "Contributed software" diff --git a/po/en_GB.po b/po/en_GB.po index c5234a64..c52c6360 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:41+0000\n" "Last-Translator: Abigail Brady <morwen@evilmagic.org>\n" "Language-Team: \n" @@ -16,67 +16,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Details</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Installing updates..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Software Updates" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "The key you selected could not be removed. Please report this as a bug." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +130,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,20 +148,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -124,23 +170,23 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -149,11 +195,11 @@ msgstr "" "The key you selected could not be removed. Please report this as a bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -162,15 +208,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -183,11 +229,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -196,43 +242,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Error removing the key" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -241,35 +287,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -278,50 +324,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Another package manager is running" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -329,21 +375,21 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 #, fuzzy msgid "Asking for confirmation" msgstr "Checking system configuration" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Upgrade finished" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -418,73 +464,75 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, fuzzy msgid "Your system has already been upgraded." msgstr "Your system has broken packages!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -503,7 +551,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -524,8 +572,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -680,11 +727,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "There is a new release of Ubuntu available!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -694,110 +746,93 @@ msgstr "" "connection." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 #, fuzzy msgid "The following updates will be skipped:" msgstr "The following packages are not upgraded:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Downloading Changes" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Your system is up-to-date!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installing updates..." msgstr[1] "Installing updates..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Details</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Your distribution is no longer supported" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -805,7 +840,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -813,155 +848,191 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Changes" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software Updates" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installing updates..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Details</b>" +msgid "changes" +msgstr "Changes" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Internet Updates</b>" -#: ../data/SoftwareProperties.glade.h:3 -#, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>Details</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "Add _Cdrom" -msgstr "Add _CD" +msgid "<b>Internet updates</b>" +msgstr "<b>Internet Updates</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy msgid "Authentication" msgstr "A_uthentication" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Internet Updates</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, 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/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Software Properties" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Source" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installing updates..." -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -971,44 +1042,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Details</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Components</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Components</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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</" @@ -1018,15 +1079,11 @@ msgstr "" "example <i>\"deb http://ftp.debian.org sarge main\"</i>. You can find a " "detailed description of the syntax in the documentation." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1034,23 +1091,21 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Reload" @@ -1103,129 +1158,307 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software Properties" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 5.04 Security Updates" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 5.10 Updates" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 Updates" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Community maintained (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 5.10 Updates" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Officially supported" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Community maintained (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Officially supported" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Restricted copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Updates" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 5.04 Updates" +#~ msgid "Hide details" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "Add _CD" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "Installing updates..." + +#~ msgid "Software Preferences" +#~ msgstr "Software Preferences" + +#~ msgid " " +#~ msgstr " " #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "CD disk with Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Details</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" + +#~ msgid "_Custom" +#~ msgstr "_Custom" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 5.10 Updates" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Security Updates" +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 5.04 Security Updates" -#~ msgid "Ubuntu 5.10 Updates" +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Ubuntu 5.10 Updates" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" #~ msgstr "Ubuntu 5.10 Updates" #~ msgid "Repositories changed" @@ -1246,10 +1479,6 @@ msgstr "" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sections:</b>" -#, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Officially supported" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sections:</b>" @@ -1257,10 +1486,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Reload the package information from the server." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Software Updates" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1274,10 +1499,6 @@ msgstr "" #~ 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" @@ -1411,18 +1632,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binary" -#~ msgid "Source" -#~ msgstr "Source" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD disk with Ubuntu 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Security Updates" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 Updates" - #~ msgid "Contributed software" #~ msgstr "Contributed software" @@ -1511,9 +1720,6 @@ msgstr "" #~ "running will no longer get security fixes or other critical updates. " #~ "Please see http://www.ubuntulinux.org for upgrade information." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "There is a new release of Ubuntu available!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 09:38+0000\n" "Last-Translator: Ricardo Pérez López <ricardo@iesdonana.org>\n" "Language-Team: Spanish <traductores@gnome.org>\n" @@ -19,69 +19,115 @@ msgstr "" "X-Generator: KBabel 1.10\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Una vez al día" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Cada dos días" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Una vez a la semana" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Cada dos semanas" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Cada %s días" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Después de una semana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Después de dos semanas" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Después de un mes" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Después de %s días" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Instalando actualizaciones" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizaciones de software" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Fuente" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Fuente" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importar clave" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Hubo un error al importar el archivo seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Puede que el archivo seleccionado no sea un archivo de clave GPG o que esté " "corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "No se puede quitar la clave que ha seleccionado. Por favor, avise de esto " "como un fallo." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -92,11 +138,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Por favor, introduzca un nombre para el disco" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Por favor, inserte un disco en la unidad:" @@ -113,20 +159,20 @@ msgstr "" "software. Por favor, arréglelos primero usando Synaptic o apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "No se han podido actualizar los meta-paquetes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Se ha tenido que desinstalar un paquete esencial" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "No se ha podido calcular la actualización" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -135,11 +181,11 @@ msgstr "" "actualización. Por favor, informe de ésto como un fallo. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Error autenticando algunos paquetes" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -149,12 +195,12 @@ msgstr "" "problema transitorio en la red. Pruebe de nuevo más tarde. Vea abajo una " "lista de los paquetes no autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "No se ha podido instalar «%s»" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -163,11 +209,11 @@ msgstr "" "como un fallo. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "No se ha podido determinar el meta-paquete" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -181,15 +227,15 @@ msgstr "" " Por favor, instale uno de los paquetes anteriores usando Synaptic o apt-get " "antes de proceder." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Leyendo caché" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "No se ha encontrado un servidor espejo válido" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -210,11 +256,11 @@ msgstr "" "Si selecciona «No» se cancelará la actualización." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "¿Generar orígenes predeterminados?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -228,11 +274,11 @@ msgstr "" "¿Deben añadirse entradas predeterminadas para «%s»? Si selecciona «No» se " "cancelará la actualización." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Información de repositorio no válida" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -240,11 +286,11 @@ msgstr "" "La actualización de la información del repositorio generó un archivo " "incorrecto. Por favor, informe de ésto como un error." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Orígenes de terceros desactivados" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -254,11 +300,11 @@ msgstr "" "volver a activarlas tras la actualización con la herramienta «Propiedades " "del software», o con Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Error durante la actualización" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -267,11 +313,11 @@ msgstr "" "tipo de problema en la red, por lo que le recomendamos que compruebe su " "conexión de red y vuelva a intentarlo." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "No hay espacio suficiente en el disco" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -283,15 +329,15 @@ msgstr "" "de instalaciones anteriores tecleando «sudo apt-get clean» en una terminal." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "¿Desea comenzar la actualización?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "No se han podido instalar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -300,11 +346,11 @@ msgstr "" "estado inutilizable. Se está llevando a cabo una recuperación (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "No se han podido descargar las actualizaciones" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -312,11 +358,11 @@ msgstr "" "La actualización se interrumpirá ahora. Por favor, compruebe su conexión a " "Internet (o su soporte de instalación) y vuelva a intentarlo. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Algunos programas ya no están soportados oficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -330,23 +376,23 @@ msgstr "" "Si no tiene activado el «universe», se le sugerirá que desinstale estos " "paquetes en el siguiente paso. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "¿Desinstalar los paquetes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Saltar este paso" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Quitar" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Error durante la confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -355,26 +401,26 @@ msgstr "" "inferior para más información. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Restaurando el estado original del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Comprobando gestor de paquetes" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Actualizando la información del repositorio" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Información de paquete no válida" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -385,19 +431,19 @@ msgstr "" "posible encontrar el paquete esencial «%s».\n" "Esto indica un problema serio; por favor, informe de esto como un fallo." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Solicitando confirmación" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Actualizando" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Buscando paquetes obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "La actualización del sistema se ha completado." @@ -473,11 +519,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "No se ha encontrado el comando «diff»" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Ha ocurrido un error fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -489,65 +535,67 @@ msgstr "" "Su archivo «sources.list» original se guardó en /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Se va a desinstalar %s paquete." msgstr[1] "Se van a desinstalar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Se va a instalar %s paquete nuevo." msgstr[1] "Se van a instalar %s paquetes nuevos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Se va a actualizar %s paquete." msgstr[1] "Se van a actualizar %s paquetes." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Debe descargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "La actualización puede durar varias horas, y no podrá ser cancelada después " "en ningún momento." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir la pérdida de datos, cierre todas las aplicaciones y " "documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "No se ha podido encontrar ninguna actualización" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Su sistema ya ha sido actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Desinstalar %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -568,7 +616,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -593,8 +641,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>¿Comenzar la actualización?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Actualizando a Ubuntu 6.06 LTS</span>" @@ -756,13 +804,20 @@ msgstr "Descargando archivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Descargando archivo %li de %li a velocidad desconocida" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " +"más tarde." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La lista de cambios no está disponible aún. Por favor, inténtelo de nuevo " "más tarde." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -771,11 +826,11 @@ msgstr "" "conexión a Internet." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "No se han podido instalar todas las actualizaciones disponibles" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -786,62 +841,54 @@ msgstr "" "«Synaptic», o ejecute «sudo apt-get dist-upgrade» en una terminal, para " "actualizar completamente su sistema." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Se pasarán por alto las siguientes actualizaciones:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Descargando la lista de cambios..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Tamaño de descarga: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Su sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Puede instalar %s actualización" msgstr[1] "Puede instalar %s actualizaciones" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Ocultar detalles" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Mostrar detalles" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Por favor, espere; esto puede tardar un poco." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "La actualización se ha completado" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nueva versión: %s (Tamaño: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Su distribución ya no está soportada" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -851,28 +898,17 @@ msgstr "" "críticas. Actualícese a una versión posterior de Ubuntu Linux. Visite http://" "www.ubuntu.com para más información sobre la actualización." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Está disponible la nueva versión «%s» de la distribución</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Sólo se permite la ejecución simultánea de una única herramienta de gestión " -"de software" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Por favor, cierre primero la otra aplicación (ej: «aptitude» o «Synaptic»)." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "El índice de software está dañado" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -882,7 +918,7 @@ msgstr "" "gestor de paquetes «Synaptic», o ejecute «sudo apt-get install -f» en una " "terminal, para corregir este problema primero." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -895,7 +931,7 @@ msgstr "" "este comportamiento en «Sistema» -> «Administración» -> «Propiedades del " "software»." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -907,43 +943,47 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan fallos de " "seguridad y proporcionan nuevas funcionalidades." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Mantenga su sistema actualizado</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Cancelar _descarga" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Cambios" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Comprobar" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Comprobar si hay nuevas actualizaciones en los canales de software" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descripción" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Notas de publicación" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostrar el progreso de cada archivo individual" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizaciones de software" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -951,63 +991,85 @@ msgstr "" "Las actualizaciones de software corrigen errores, eliminan fallos de " "seguridad y proporcionan nuevas funcionalidades." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ctualizar" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualizar a la última versión de Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Comprobar" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta información en el futuro" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar actualizaciones" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Canales</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Cambios" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Actualizaciones por Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Claves</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Añadir _CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Actualizaciones por Internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticación" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Borrar archivos de software descargados:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "La descarga se ha completado" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importar la clave pública desde un proveedor de confianza" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Soporte de la instalación" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Actualizaciones por Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1015,39 +1077,55 @@ msgstr "" "Sólo se instalarán automáticamente las actualizaciones de seguridad que " "provengan de los servidores oficiales de Ubuntu." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Restaurar valores predeterminados" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Restaurar las claves predeterminadas de su distribución" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Preferencias del software" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Propiedades del software" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Fuente" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Comprobar actualizaciones automáticamente:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Descargar actualizaciones en segundo plano, pero sin instalarlas" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importar clave" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instalar actualizaciones de seguridad sin requerir confirmación" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1064,40 +1142,33 @@ msgstr "" "\n" "Necesita una conexión a internet para continuar." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Canales</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componentes:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componentes</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribución:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduzca la línea de APT completa del canal que quiera añadir</b></" @@ -1106,15 +1177,11 @@ msgstr "" "La línea de APT contiene el tipo, la ubicación y los componentes de un " "canal, por ejemplo «<i>deb http://ftp.debian.org sarge main</i>»." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Línea de APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Añadir un canal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1122,24 +1189,21 @@ msgstr "" "Binario\n" "Fuente" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Cambiar un canal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Fuente" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Analizando el CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Añadir un canal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalizado" +msgid "_Add Source" +msgstr "Fuente" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Recargar" @@ -1198,119 +1262,314 @@ msgid "The window size" msgstr "El tamaño de la ventana" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configura canales de software y actualizaciones por Internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Propiedades del software" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Actualizaciones de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 «Dapper Drake»" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Mantenido por la comunidad (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Software no libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Software no libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 «Dapper Drake»" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Actualizaciones de seguridad de Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Actualizaciones de seguridad de Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Actualizaciones de Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "«Backports» de Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Soportado oficialmente" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Copyright restringido" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 «Breezy Badger»" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Actualizaciones de seguridad de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Actualizaciones de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "«Backports» de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Actualizaciones de seguridad de Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Actualizaciones de seguridad de Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Actualizaciones de seguridad de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Actualizaciones de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "«Backports» de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Mantenido por la comunidad (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Software no libre (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Soportado oficialmente" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Copyright restringido" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Actualizaciones de seguridad" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Actualizaciones de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "«Backports» de Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizaciones de seguridad de Debian 3.1 «Sarge»" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian «Etch» (pruebas)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian «Sid» (inestable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatible con la DFSG con dependencias no libres" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software no compatible con la DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 «Dapper Drake»" +#~ msgid "Hide details" +#~ msgstr "Ocultar detalles" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 «Breezy Badger»" +#~ msgid "Show details" +#~ msgstr "Mostrar detalles" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Actualizaciones de seguridad de Ubuntu 5.10" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Sólo se permite la ejecución simultánea de una única herramienta de " +#~ "gestión de software" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Actualizaciones de Ubuntu 5.10" +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Por favor, cierre primero la otra aplicación (ej: «aptitude» o " +#~ "«Synaptic»)." -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "«Backports» de Ubuntu 5.10" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Canales</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Claves</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Añadir _CD-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Soporte de la instalación" + +#~ msgid "Software Preferences" +#~ msgstr "Preferencias del software" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Canales</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componentes</b>" + +#~ msgid "Add Channel" +#~ msgstr "Añadir un canal" + +#~ msgid "Edit Channel" +#~ msgstr "Cambiar un canal" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Añadir un canal" + +#~ msgid "_Custom" +#~ msgstr "_Personalizado" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Actualizaciones de seguridad de Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Actualizaciones de Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "«Backports» de Ubuntu 6.06 LTS" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1332,12 +1591,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Secciones</b>" -#~ msgid "Oficially supported" -#~ msgstr "Soportado oficialmente" - -#~ msgid "Installing updates" -#~ msgstr "Instalando actualizaciones" - #~ msgid "Check for available updates" #~ msgstr "Comprobar las actualizaciones disponibles" @@ -1347,10 +1600,6 @@ msgstr "Software no compatible con la DFSG" #~ msgid "Reload the latest information about updates" #~ msgstr "Recargar la última información sobre actualizaciones" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Actualizaciones de software" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1365,10 +1614,6 @@ msgstr "Software no compatible con la DFSG" #~ 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" @@ -1567,15 +1812,9 @@ msgstr "Software no compatible con la DFSG" #~ msgid "Binary" #~ msgstr "Binario" -#~ msgid "Source" -#~ msgstr "Fuente" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Actualizaciones de seguridad" - #~ msgid "Contributed software" #~ msgstr "Software contribuido" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 18:26+0000\n" "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n" "Language-Team: Finnish <ubuntu-fi@lists.ubuntu.com>\n" @@ -16,68 +16,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Päivittäin" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Joka toinen päivä" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Viikottain" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Joka toinen viikko" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "%s päivän välein" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Viikon jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Kahden viikon jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Kuukauden jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s päivän jälkeen" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Asennetaan päivityksiä" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "Ohjelmistokanava" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "Aktiivinen" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Lähdekoodi" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Lähdekoodi" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Tuo avain" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Valittu tiedosto ei ole kelvollinen GPG-avaintiedosto, tai se on " "vahingoittunut." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Valitsemaasi avainta ei voitu poistaa. Ole hyvä ja luo tästä virheilmoitus." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +133,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Syötä nimi levylle" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Aseta levy asemaan:" @@ -109,20 +154,20 @@ msgstr "" "ohjelmalla. Korjaa ne käyttämällä synapticia tai apt-get-komentoa ennen " "jatkamista." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ei voida päivittää tarvittavia metapaketteja" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Välttämätön paketti jouduttaisiin poistamaan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Ei voitu tehdä tarvittavia päivitykseen liittyviä tarkistuksia" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -131,11 +176,11 @@ msgstr "" "korjata. Ilmoita tästä virheraportilla. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Joitain paketteja todennettaessa tapahtui virhe" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -145,12 +190,12 @@ msgstr "" "Voit yrittää myöhemmin uudelleen. Alla on luettelo todentamattomista " "paketeista." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Ei voitu asentaa pakettia \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -158,11 +203,11 @@ msgstr "" "Pyydettyä pakettia ei voitu asentaa. Ole hyvä ja luo tästä virheraportti. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Ei voitu arvata metapakettia" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -176,15 +221,15 @@ msgstr "" "Asenna jokin luetelluista paketeista synapticilla tai apt-get-ohjelmalla " "ennen jatkamista." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Luetaan kätköä" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Ei löytynyt sopivaa palvelinta" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -205,11 +250,11 @@ msgstr "" "Jos valitset \"Ei\", päivitys keskeytyy." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Luo ja ota käyttöön oletusohjelmalähteet?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -222,11 +267,11 @@ msgstr "" "Otetaanko käyttöön \"%s\":n oletuslähteet? Jos valitset \"Ei\", päivitys " "keskeytyy." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Virhe ohjelmavarastotiedoissa" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -234,11 +279,11 @@ msgstr "" "Ohjelmavarastotietojen päivittäminen johti epäkelpoon tiedostoon. Ilmoita " "tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Kolmannen osapuolet ohjelmalähteet poissa käytöstä" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -248,11 +293,11 @@ msgstr "" "käytöstä. Voit ottaa ne uudelleen käyttöön päivityksen jälkeen \"ohjelma-" "asetukset\"-työkalulla tai Synaptic-ohjelmalla." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Virhe päivitettäessä" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -260,11 +305,11 @@ msgstr "" "Päivitettäessä tapahtui virhe. Tämä on yleensä jonkinlainen verkko-ongelma. " "Tarkista verkkoyhteytesi toiminta ja yritä uudelleen." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Levytilaa ei ole riittävästi" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -276,15 +321,15 @@ msgstr "" "komentoa 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Haluatko aloittaaa päivityksen?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Ei voitu asentaa päivityksiä" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -292,11 +337,11 @@ msgstr "" "Päivitys keskeytyy. Järjestelmäsi voi olla käyttökelvottomassa tilassa. " "Korjaustoimenpiteet suoritettiin (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Päivityksiä ei voitu noutaa" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -304,11 +349,11 @@ msgstr "" "Päivitys keskeytyy. Tarkista Internet-yhteytesi tai asennuslähteesi (esim. " "CD) toiminta ja yritä uudelleen. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Jotkin ohjelmat eivät ole enää virallisesti tuettuja" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -322,23 +367,23 @@ msgstr "" "Jos sinulla ei ole 'universe'-ohjelmakanavaa otettuna käyttöön, nämä paketit " "suositellaan poistettaviksi seuraavassa kohdassa. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Poista vanhentuneet paketit?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Ohita tämä kohta" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Poista" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Virhe suoritettaesa" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -347,26 +392,26 @@ msgstr "" "lisätietoja. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Palautetaan alkuperäistä järjestelmän tilaa" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Tarkistetaan pakettienhallintaa" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Päivitetään ohjelmavarastotietoja" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Pakettitiedot viallisia" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -377,19 +422,19 @@ msgstr "" "enää löydetty.\n" "Tämä merkitsee vakavaa virhettä, ilmoita tästä virheraportilla." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Pyydetään vahvistusta" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Päivitetään" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Etsitään vanhetuneita ohjelmia" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Järjestelmän päivitys on valmis." @@ -463,11 +508,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Komentoa 'diff' ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Vakava virhe tapahtui" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -476,63 +521,65 @@ msgstr "" "Ilmoita tästä virheraportilla ja sisällytä siihen tiedostot /var/log/dist-" "upgrade.log ja /var/log/dist-upgrade-apt.log. Päivitys keskeytyy nyt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paketti poistetaan" msgstr[1] "%s pakettia poistetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s uusi paketti asennetaan" msgstr[1] "%s uutta pakettia asennetaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paketti päivitetään" msgstr[1] "%s pakettia päivitetään" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Noudettavaa yhteensä %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Päivitys voi kestää useita tunteja, eikä sitä voi keskeyttää enää myöhemmin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Jottei tietoja häviäisi, sulje kaikki avoinna olevat ohjelmat ja dokumentit." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Päivityksiä ei löytynyt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Järjestelmäsi on jo päivitetty." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Poista %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Asenna %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Päivitä %s" @@ -552,7 +599,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -579,8 +626,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Aloita päivitys?</big/</b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Päivitetään jakeluun: Ubuntu 6.06 " "LTS</span>" @@ -740,11 +787,16 @@ msgstr "Noudetaan tiedostoa %li/%li nopeudella %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Noudetaan tiedostoa %li/%li tuntemattomalla nopeudella" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Muutosluettelo ei ole vielä saatavilla. Yritä myöhemmin uudelleen." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -752,11 +804,11 @@ msgstr "" "Muutosluettelon nouto epäonnistui. Tarkista Internet-yhteytesi toimivuus." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Ei voida asentaa kaikkia saatavilla olevia päivityksiä" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -766,62 +818,54 @@ msgstr "" "kaikki päivitykset\"-toimintoa Synaptic-pakettienhallintaojhelmassa, tai " "suorita päätteessä komento \"sudo apt-get dist-upgrade\"." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Seuraavat päivitykset ohitetaan:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versio: %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Noudetaan muutosluetteloa..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "%s täytyy noutaa" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Järjestelmäsi on ajan tasalla" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Voit asentaa %s päivityksen" msgstr[1] "Voit asentaa %s päivitystä" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Piilota yksityiskohdat" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Näytä yksityiskohdat" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Odota, tämä voi kestää jonkun aikaa." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Päivitys on valmis" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Uusi versio: %s (koko: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Jakeluasi ei enää tueta" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -831,25 +875,17 @@ msgstr "" "Päivitä uudempaan versioon Ubuntu Linuxista. Katso lisätietoja " "päivittämisestä osoitteesta http://www.ubuntu.com/" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Uusi jakelujulkaisu \"%s\" on saatavilla</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Vain yksi pakettienhallintatyökalu voi olla kerralla käytössä" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "Sulje ensin toinen ohjelma, kuten \"aptitude\" tai \"Synaptic\"." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Ohjelmaluettelo on rikkinäinen" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -859,7 +895,7 @@ msgstr "" "Synaptic-pakettienhallintaa tai komentoa \"sudo apt-get install -f\" " "päätteessä." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -871,7 +907,7 @@ msgstr "" "asetuksia kohdasta \"Järjestelmä\" -> \"Ylläpito\" -> \"Ohjelmien asetukset" "\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -883,43 +919,47 @@ msgstr "" "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " "ominaisuuksia." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Pidä järjestelmäsi ajan tasalla</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Peruuta _nouto" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Muutokset" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Tarkista" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Tarkista onko ohjelmakanavissa uusia päivityksiä" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Kuvaus" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Julkaisutiedot" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Näytä edistyminen yksittäisten tiedostojen osalta" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -927,63 +967,85 @@ msgstr "" "Ohjelmapäivitykset korjaavat virheitä ja turva-aukkoja sekä tarjoavat uusia " "ominaisuuksia." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Päivitä" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Päivitä Ubuntun viimeisimpään versioon" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Tarkista" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "P_iilota tämä tieto jatkossa" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Asenna päivitykset" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanavat</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Muutokset" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet-päivitykset</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Avaimet</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet-päivitykset</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Lisää _CD" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Todennus" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Poista noudetut ohjelmatiedostot:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Lataus on valmis" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Asenna julkinen avain luotetulta ohjelmistotoimittajalta" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Asennuslähteet" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet-päivitykset" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -991,39 +1053,55 @@ msgstr "" "Vain turvallisuuspäivitykset virallisilta Ubuntu-palvelimilta asennetaan " "automaattisesti." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Palauta _oletukset" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Palauta jakelusi oletusavaimet" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Ohjelma-asetukset" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "<b>Ohjelmalähteet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Lähdekoodi" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Tarkista päivitykset automaattisesti:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" -msgstr "_Nouda päivitykset taustalla, mutta älä asenna niitä" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" +msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Tuo avaintiedosto" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Asenna turvallisuuspäivitykset kysymättä" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1039,40 +1117,33 @@ msgstr "" "\n" "Tarvitset toiminnassa olevan Internet-yhteyden jatkaaksesi." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanava</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentti:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponentit:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponentit</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Jakelu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tyyppi:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Kirjoita haluamasi kanavan koko APT-rivi</b></big>\n" @@ -1080,15 +1151,11 @@ msgstr "" "APT-rivi sisältää kanavan tyypin, sijainnin ja sisällön, esimerkiksi <i>" "\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-rivi:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Lisää kanava" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1096,24 +1163,21 @@ msgstr "" "Binääri\n" "Lähdekoodi" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Muokkaa kanavaa" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Lähdekoodi" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Luetaan CD-levyä" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Lisää kanava" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Muu" +msgid "_Add Source" +msgstr "Lähdekoodi" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Lataa uudelleen" @@ -1171,120 +1235,317 @@ msgid "The window size" msgstr "Ikkunan koko" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Muokkaa ohjelmakanavia ja Internet-päivitysten asetuksia" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Ohjelma-asetukset" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 päivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Yhteisön ylläpitämät (universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Ei-vapaat ohjelmat (multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Ei-vapaat ohjelmat (multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 turvallisuuspäivitykset" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS turvallisuuspäivitykset" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS päivitykset" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS takaisinsovitukset" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Virallisesti tuettu" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Rajoitettu tekijänoikeus" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 turvallisuuspäivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 päivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 takaisinsovitukset" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 turvallisuuspäivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 päivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 takaisinsovitukset" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Yhteisön ylläpitämät (universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Ei-vapaat ohjelmat (multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Virallisesti tuettu" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Rajoitettu tekijänoikeus" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 turvallisuuspäivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 päivitykset" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 takaisinsovitukset" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" turvallisuuspäivitykset" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testattava)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (epävakaa)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "DFSG-yhteensopivat ohjelmat joilla riippuvuuksia epävapaisiin ohjelmiin" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG-epäyhteensopivat ohjelmat" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Piilota yksityiskohdat" + +#~ msgid "Show details" +#~ msgstr "Näytä yksityiskohdat" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Vain yksi pakettienhallintatyökalu voi olla kerralla käytössä" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "Sulje ensin toinen ohjelma, kuten \"aptitude\" tai \"Synaptic\"." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanavat</b>" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Avaimet</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 turvallisuuspäivitykset" +#~ msgid "Add _Cdrom" +#~ msgstr "Lisää _CD" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 päivitykset" +#~ msgid "Installation Media" +#~ msgstr "Asennuslähteet" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 takaisinsovitukset" +#~ msgid "Software Preferences" +#~ msgstr "Ohjelma-asetukset" + +#~ msgid "_Download updates in the background, but do not install them" +#~ msgstr "_Nouda päivitykset taustalla, mutta älä asenna niitä" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanava</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponentit</b>" + +#~ msgid "Add Channel" +#~ msgstr "Lisää kanava" + +#~ msgid "Edit Channel" +#~ msgstr "Muokkaa kanavaa" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Lisää kanava" + +#~ msgid "_Custom" +#~ msgstr "_Muu" + +#~ msgid "Software Properties" +#~ msgstr "Ohjelma-asetukset" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS turvallisuuspäivitykset" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS päivitykset" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS takaisinsovitukset" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1306,30 +1567,15 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Osastot</b>" -#~ msgid "Oficially supported" -#~ msgstr "Virallisesti tuettu" - #~ msgid "Remove obsolete Packages?" #~ msgstr "Poista vanhentuneet paketit?" -#~ msgid "Installing updates" -#~ msgstr "Asennetaan päivityksiä" - #~ msgid "Check for available updates" #~ msgstr "Tarkista saatavilla olevat päivitykset" -#~ msgid "_Download updates in the backgound, but do not install them" -#~ msgstr "_Lataa päivitykset taustalla, mutta älä asenna niitä" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Osastot:</b>" -#~ msgid "Software Channel" -#~ msgstr "Ohjelmistokanava" - -#~ msgid "Active" -#~ msgstr "Aktiivinen" - #~ msgid "" #~ "<big><b>Error scanning the CD</b></big>\n" #~ "\n" @@ -1384,12 +1630,6 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "Show available updates and choose which to install" #~ msgstr "Näytä saatavilla olevat päivitykset ja valitse asennettavat" -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" - -#~ msgid "<b>Software Sources</b>" -#~ msgstr "<b>Ohjelmalähteet</b>" - #~ msgid "<b>Temporary files</b>" #~ msgstr "<b>Väliaikaistiedostot</b>" @@ -1513,15 +1753,9 @@ msgstr "DFSG-epäyhteensopivat ohjelmat" #~ msgid "Binary" #~ msgstr "Binääri" -#~ msgid "Source" -#~ msgstr "Lähdekoodi" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 turvallisuuspäivitykset" - #~ msgid "Contributed software" #~ msgstr "Muiden tarjoamat ohjelmat" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 21:09+0000\n" "Last-Translator: Claude Paroz <paroz@email.ch>\n" "Language-Team: French <gnomefr@traduc.org>\n" @@ -17,69 +17,115 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Quotidiennement" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Tous les deux jours" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Hebdomadaire" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Toutes les deux semaines" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Tous les %s jours" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Après une semaine" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Après deux semaines" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Après un mois" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Après %s jours" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Installation des mises à jour" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Mises à jour des logiciels" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importer la clé" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Erreur lors de l'importation du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas une clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionnée ne peut être supprimée. Veuillez rapporter " "ce bogue." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -90,11 +136,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Veuillez saisir un nom pour le disque" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Veuillez insérer un disque dans le lecteur :" @@ -111,20 +157,20 @@ msgstr "" "ce logiciel. Veuillez d'abord les réparer à l'aide de Synaptic ou d'apt-get " "avant de continuer." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Les meta-paquets désirés n'ont pu être mis à jour" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Un paquet essentiel devrait être enlevé" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible de calculer la mise à jour" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -133,11 +179,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Erreur lors de l'authentification de certains paquets" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -147,12 +193,12 @@ msgstr "" "problème temporaire du réseau. Vous voudrez sans doute réessayer plus tard. " "Vous trouverez ci-dessous une liste des paquets non authentifiés." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Impossible d'installer « %s »" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -161,11 +207,11 @@ msgstr "" "rapporter ce bogue. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Impossible de déterminer le méta-paquet" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -179,15 +225,15 @@ msgstr "" " Veuillez d'abord installer l'un des paquets ci-dessus, en utilisant " "Synaptic ou apt-get, avant de continuer." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Lecture du cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Aucun mirroir valide n'a pu être trouvé" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -208,11 +254,11 @@ msgstr "" "Sinon, la mise à jour sera annulée." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Générer les sources par défaut ?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -226,11 +272,11 @@ msgstr "" "Les entrées par défaut pour « %s » doivent-elles être ajoutées ? Si vous " "sélectionnez « Non », la mise à jour sera annulée." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Informations sur le dépôt invalides" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -238,11 +284,11 @@ msgstr "" "La mise à jour des informations du dépôt a créé un fichier invalide. Merci " "de rapporter ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Sources provenant de tiers désactivées" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -252,11 +298,11 @@ msgstr "" "désactivées. Vous pouvez les réactiver après la mise à jour avec l'outil « " "Gestionnaire de canaux logiciels » ou avec Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Erreur lors de la mise à jour" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -265,11 +311,11 @@ msgstr "" "un problème de réseau. Veuillez vérifier votre connexion au réseau et " "réessayer." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Il n'y a pas assez d'espace libre sur le disque" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -282,15 +328,15 @@ msgstr "" "get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Voulez-vous commencer la mise à jour ?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Les mises à jour n'ont pu être installées" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -298,11 +344,11 @@ msgstr "" "Abandon de la mise à jour. Votre système est peut-être inutilisable. Une " "recupération a été lancée (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Les mises à jour n'ont pu être téléchargées" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -310,11 +356,11 @@ msgstr "" "Abandon de la mise à jour. Veuillez vérifier votre connexion Internet ou " "votre médium d'installation puis réessayez. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Certains logiciels ne sont plus supportés officiellement" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -328,23 +374,23 @@ msgstr "" "Si vous n'avez pas activé le dépot 'universe', la suppression de ces paquets " "vous sera suggérée lors de la prochaine étape. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Enlever les paquets obsolètes ?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Passer cette étape" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Supprimer" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Erreur pendant la soumission" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -353,26 +399,26 @@ msgstr "" "ci-dessous pour plus d'informations. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Restaurer le système dans son état d'origine" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Vérification du gestionnaire de paquets" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Mise à jour des informations sur les dépôts en cours" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Information sur les paquet invalides" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -384,19 +430,19 @@ msgstr "" "Ceci est indique qu'une erreur important s'est produite, veuillez rapporter " "ce bogue." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Demande de confirmation" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Mise à jour en cours" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Recherche de logiciels obsolètes" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "La mise à jour du système est terminée." @@ -470,11 +516,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "La commande « diff » n'a pu être trouvée" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Une erreur fatale est survenue" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -486,65 +532,67 @@ msgstr "" "Votre sources.list d'origine a été sauvé dans /etc/apt/source.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Le paquet %s va être supprimé." msgstr[1] "Les paquets %s vont être supprimés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Le paquet %s va être installé." msgstr[1] "Les paquets %s vont être installés." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "Le paquet %s va être mis à jour." msgstr[1] "Les paquets %s vont être mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Vous devez télécharger un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "La mise à jour peut prendre plusieurs heures et ne peut être annulée " "ultérieurement." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pour éviter toute perte de données accidentelle, veuillez fermer toutes les " "applications et documents ouverts." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Aucune mise à jour n'est disponible" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Votre système a déjà été mis à jour." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Supprimer %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installer %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Mettre à jour %s" @@ -565,7 +613,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -591,8 +639,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Démarrer la mise à jour ?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Mise à jour vers Ubuntu 6.06 LTS</" "span>" @@ -753,13 +801,20 @@ msgstr "Téléchargement du fichier %li sur %li à %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Téléchargement du fichier %li sur %li à une vitesse inconnue" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"La liste des modifications n'est pas encore disponible. Veuillez réessayer " +"plus tard." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "La liste des modifications n'est pas encore disponible. Veuillez réessayer " "plus tard." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -768,11 +823,11 @@ msgstr "" "votre connexion Internet est activée." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Impossible d'installer toutes les mises à jour disponibles" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -783,62 +838,54 @@ msgstr "" "jour » du « Gestionnaire de paquets Synaptic » ou lancez « sudo apt-get dist-" "upgrade » dans un terminal pour mettre votre système complètement à jour." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Les paquets suivants ne seront pas mis à jour :" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Téléchargement de la liste des nouveautés…" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Taille du téléchargement : %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Votre système est à jour" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Vous pouvez installer %s mise à jour" msgstr[1] "Vous pouvez installer %s mises à jour" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Masquer les détails" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Montrer les détails" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Veuillez patienter, cela peut prendre du temps." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "La mise à jour est terminée" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nouvelle version : %s (taille : %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Votre distribution n'est plus supportée" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -848,26 +895,17 @@ msgstr "" "devez passer à une version plus récente d'Ubuntu Linux. Rendez-vous sur " "http://www.ubuntu.com pour de plus amples informations à ce sujet." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Une nouvelle version « %s » est disponible</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Vous ne pouvez utilisez qu'un seul gestionnaire de logiciels à la fois" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Veuillez fermer l'autre application, par ex. « Aptitude » ou « Synaptic »." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "La liste des logiciels est corrompue" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -877,7 +915,7 @@ msgstr "" "utiliser d'abord le « Gestionnaire de paquets Synaptic » ou lancez « sudo " "apt-get install -f » dans un terminal pour réparer ce problème." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -891,7 +929,7 @@ msgstr "" "configurer ce comportement dans « Système » -> « Administration » -> « " "Gestionnaire de canaux logiciels »" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -903,43 +941,47 @@ msgstr "" "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " "problèmes de sécurité et apporter de nouvelles fonctionalités." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Maintenir votre système à jour</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "_Annuler le téléchargement" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Changements" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Vérifier" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Vérifier les canaux logiciels pour de nouvelles mises à jour" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Description" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Notes de publication" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Afficher l'avancement des fichiers individuels" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -947,64 +989,86 @@ msgstr "" "Les mises à jour de logiciels peuvent corriger des erreurs, éliminer des " "problèmes de sécurité et apporter de nouvelles fonctionalités." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Mettre à _jour" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Mettre à jour vers la version la plus récente d'Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Vérifier" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Masquer ces informations à l'avenir" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installer les mises à jour" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Dépôts</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Changements" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Mises à jour par Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Clés</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Mises à jour par Internet</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Ajouter un _CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Authentification" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Effacer les fichiers des logiciels téléchargés :" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Le téléchargement est terminé" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "" "Importer la clé publique d'un fournisseur de logiciels digne de confiance" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Médium d'installation" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Mises à jour par Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1012,40 +1076,56 @@ msgstr "" "Seules les mises à jour de sécurité des serveurs officiels d'Ubuntu seront " "automatiquement installées." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Restaurer les clés par _défaut" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Restaurer les clés par défaut de votre distribution" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Gestionnaire de canaux logiciels" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Source" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Rechercher des mises à jour automatiquement :" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "" "Télécharger les mises à jour en arrière-plan, mais ne pas les installer" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importer la clé" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Installer les mises à jour de sécurité sans confirmation" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1063,40 +1143,33 @@ msgstr "" "Vous devez disposer d'une connexion fonctionnelle à Internet avant de " "continuer." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Canal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Commentaire :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Composants :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Composants</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Saisissez la ligne APT complète du canal logiciel que vous souhaitez " @@ -1105,15 +1178,11 @@ msgstr "" "La ligne APT contient le type, la source et le contenu d'un canal logiciel, " "par exemple <i> « deb http://ftp.debian.org sarge main »</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Ligne APT :" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Ajouter un canal logiciel" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1121,24 +1190,21 @@ msgstr "" "Binaire\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Modifier un canal logiciel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Examen du CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Ajouter un canal logiciel" +msgid "_Add Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personnaliser" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "A_ctualiser" @@ -1197,121 +1263,314 @@ msgid "The window size" msgstr "La taille de la fenêtre" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configurer les canaux logiciels et les mises à jour via Internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Gestionnaire de canaux logiciels" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Mises à jour pour Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Mises à jour de sécurité pour Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Mises à jour pour Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu Dapper Drake 6.06" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Maintenu par la communauté (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu Dapper Drake 6.06" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Mises à jour de sécurité pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "« Backports » pour Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportés officiellement" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Copyright restreint" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu Breezy Badger 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Mises à jour de sécurité pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Mises à jour pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "« Backports » pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Mises à jour de sécurité" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 Mises à jour de sécurité" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Mises à jour de sécurité pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Mises à jour pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "« Backports » pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu Breezy Badger 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Maintenu par la communauté (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-libre (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Supporté officiellement" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Copyright restreint" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Mises à jour de sécurité" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Mises à jour pour Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "« Backports » pour Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian « Sarge » 3.1" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Mises à jour de sécurité pour Debian « Sarge » 3.1" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian « Etch » (en test)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian « Sid » (instable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Logiciel libre (selon les lignes directrices du projet Debian) dont les " "dépendances ne sont pas libres" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu Dapper Drake 6.06" +#~ msgid "Hide details" +#~ msgstr "Masquer les détails" + +#~ msgid "Show details" +#~ msgstr "Montrer les détails" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Vous ne pouvez utilisez qu'un seul gestionnaire de logiciels à la fois" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Veuillez fermer l'autre application, par ex. « Aptitude » ou « Synaptic »." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Dépôts</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Clés</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Ajouter un _CD-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Médium d'installation" + +#~ msgid "Software Preferences" +#~ msgstr "Gestionnaire de canaux logiciels" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Canal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Composants</b>" + +#~ msgid "Add Channel" +#~ msgstr "Ajouter un canal logiciel" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu Breezy Badger 5.10" +#~ msgid "Edit Channel" +#~ msgstr "Modifier un canal logiciel" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Mises à jour de sécurité pour Ubuntu 5.10" +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Ajouter un canal logiciel" + +#~ msgid "_Custom" +#~ msgstr "_Personnaliser" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Mises à jour pour Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Mises à jour de sécurité pour Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "« Backports » pour Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Mises à jour pour Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "« Backports » pour Ubuntu 6.06 LTS" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1333,12 +1592,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Catégories :</b>" -#~ msgid "Oficially supported" -#~ msgstr "Supporté officiellement" - -#~ msgid "Installing updates" -#~ msgstr "Installation des mises à jour" - #~ msgid "Check for available updates" #~ msgstr "Rechercher les mises à jour disponibles" @@ -1349,10 +1602,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "Reload the latest information about updates" #~ msgstr "Recharger les informations des paquets depuis le serveur" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Mises à jour des logiciels" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1367,10 +1616,6 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ 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é" @@ -1570,15 +1815,9 @@ msgstr "Logiciel non libre (selon les lignes directrices du projet Debian)" #~ msgid "Binary" #~ msgstr "Binaire" -#~ msgid "Source" -#~ msgstr "Source" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Mises à jour de sécurité" - #~ msgid "Contributed software" #~ msgstr "Logiciel contribué" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:41+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:37+0000\n" "Last-Translator: marcuz <marcuz@linux.it>\n" "Language-Team: Friulian <fur@li.org>\n" @@ -17,65 +17,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Ogni dì" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Ogni dòi dîs" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Ogni setemàne" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Ogni dôs setemànis" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Ogni %s dîs" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Dòpo une setemàne" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Dòpo dôs setemànis" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Dopo un mèis" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Dopo %s dîs" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Impuarte la clâf" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -101,54 +144,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +200,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +221,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +234,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +278,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +315,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +365,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -406,72 +449,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:451 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:457 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:467 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:470 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:477 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -490,7 +535,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -511,8 +556,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -661,116 +705,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -778,7 +810,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -786,143 +818,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -932,74 +1000,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1051,101 +1103,228 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:42+0000\n" "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n" "Language-Team: Galego\n" @@ -17,70 +17,116 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Detalles</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Instalando actualizacións..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizacións de software" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Fonte" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Fonte" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que " "esté corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Non se pode quitar a clave que seleccionou. Por favor, reporte isto coma un " "erro." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -106,20 +152,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -129,23 +175,23 @@ msgstr "" "erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -155,11 +201,11 @@ msgstr "" "erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -168,15 +214,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -189,11 +235,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -202,43 +248,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Erro ao quitar a clave" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -247,35 +293,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -284,50 +330,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Xa hai outro xestor de paquetes en execución" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -335,20 +381,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Actualización rematada" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -424,72 +470,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -508,7 +556,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -529,8 +577,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -686,11 +733,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Hai unha versión nova de Ubuntu dispoñible!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -700,110 +752,93 @@ msgstr "" "activa." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 #, fuzzy msgid "Cannot install all available updates" msgstr "Comprobando se hai actualizacións..." -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versión %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Descargando cambios" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Instalando actualizacións..." msgstr[1] "Instalando actualizacións..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Detalles</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "A súa distribución xa non está soportada" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -811,7 +846,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -819,151 +854,190 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Cambios" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descrición" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizacións de software" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Instalando actualizacións..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Claves</b>" +msgid "changes" +msgstr "Cambios" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Actualizacións por Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Claves</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>Actualizacións por Internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticación" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Actualizacións por Internet</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurar predeterminados" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, 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/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Propiedades de software" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Fonte" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "Comprobar se hai actualizacións cada" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -973,44 +1047,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Claves</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentario:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Compoñentes</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Compoñentes</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribución:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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></" @@ -1020,15 +1084,11 @@ msgstr "" "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>. Pode atopar unha " "descrición detallada da sintase na documentación." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Liña de APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1036,23 +1096,21 @@ msgstr "" "Binario\n" "Fonte" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Fonte" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalizar" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Fonte" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Recargar" @@ -1105,138 +1163,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Propiedades de software" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Actualizacións de Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Actualizacións de seguranza de Ubuntu 5.04" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Actualizacións de Ubuntu 5.10" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Actualizacións de Ubuntu 5.04" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Mantido pola comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non libre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Actualizacións de Ubuntu 5.10" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Actualizacións de Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Actualizacións de seguranza de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Soporte oficial" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Dereito de copia restrinxido" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Actualizacións de seguranza de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Actualizacións de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Actualizacións de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD con Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Actualizacións de seguranza de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Actualizacións de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Actualizacións de Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Mantido pola comunidade (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non libre (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Soporte oficial" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Dereito de copia restrinxido" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Actualizacións de seguranza de Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Actualizacións de Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Actualizacións de Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizacións de seguranza de Debian estable" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian de probas" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Inestable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Actualizacións de Ubuntu 5.04" +#~ msgid "Hide details" +#~ msgstr "<b>Detalles</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "CD con Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Claves</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Actualizacións de seguranza de Ubuntu 5.10" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Claves</b>" -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Installation Media" +#~ msgstr "Soportes de instalación" + +#~ msgid "Software Preferences" +#~ msgstr "Preferencias de software" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Claves</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Compoñentes</b>" + +#~ msgid "_Custom" +#~ msgstr "_Personalizar" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Actualizacións de Ubuntu 5.10" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Actualizacións de seguranza de Ubuntu 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Actualizacións de Ubuntu 5.10" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>Seccións:</b>" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Actualizacións de Ubuntu 5.10" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Soporte oficial" +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>Seccións:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Seccións:</b>" @@ -1245,10 +1471,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Recargar a información do paquete desde o servidor." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Actualizacións de software" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1263,10 +1485,6 @@ msgstr "" #~ 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" @@ -1381,18 +1599,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binario" -#~ msgid "Source" -#~ msgstr "Fonte" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD con Ubuntu 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Actualizacións de seguranza de Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Actualizacións de Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Software contribuido" @@ -1483,9 +1689,6 @@ msgstr "" #~ "actualizacións críticas. Visite http://www.ubuntulinux.org para máis " #~ "información acerca de como actualizar." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Hai unha versión nova de Ubuntu dispoñible!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 11:15+0000\n" "Last-Translator: Yaniv Abir <yanivabir@gmail.com>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -20,66 +20,112 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "מידי יום" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "כל יומיים" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "כל שבוע" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "כל שבועים" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "כל %s ימים" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "אחרי שבוע" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "אחרי שבועים" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "אחרי חודש" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "אחרי %s ימים" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "מתקין עדכונים..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "עדכוני תוכנה" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "מקור" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "מקור" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -90,11 +136,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "אנא הכניסו תקליטור לכונן:" @@ -110,54 +156,54 @@ msgstr "" "במערכת שלך נמצאות חבילות פגומות שתוכנה זו לא יכולה לתקן. אנא תקן אותן " "באמצעות synaptic או apt-get לפני שתמשיך." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "חבילה חיונית תוסר בלית ברירה" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "לא ניתן להתקין את \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "לא ניתן להתקין חבילה הכרחית. אנא דווחו על זה כבאג. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -166,15 +212,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -187,11 +233,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -200,32 +246,32 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "שגיאה במהלך העדכון" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -233,11 +279,11 @@ msgstr "" "הייתה בעיה בתהליך העידכון. בדרך כלל זוהי בעיית רשת, אנא בדקו את חיבור הרשת " "שלכם ונסו שנית." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "אין מספיק שטח בדיסק הקשיח" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -246,36 +292,36 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "האם ברצונך להתחיל את השדרוג?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "לא ניתן להתקין את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "לא ניתן להוריד את השדרוג" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" "השדרוג בוטל. אנא בדקו את החיבור לאינטרנט או את מדיית ההתקנה ונסו שנית. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -284,50 +330,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_דלג על השלב" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_הסר" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 #, fuzzy msgid "Restoring original system state" msgstr "מאתחל את המערכת" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -337,19 +383,19 @@ msgstr "" "לאחר שהמידע על החבילות עודכן החבילה ההכרחית \"%s\" לא נמצא.\n" "כנראה שחלה שגיאה חמורה, אנא דווחו על הדבר כבאג." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "משדרג" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "שדרוג המערכת הושלם." @@ -423,72 +469,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "חבילה חדשה %s תותקן." msgstr[1] "%s חבילות חדשות יותקנו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "חבילה %s תשודרג." msgstr[1] "%s חבילות ישודרגו." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "יש להוריד %s בסה\"כ." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "השדרוג עשוי לקחת מספר שעות, ולא ניתן לבטלו בשלב מאוחר יותר." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "כדי למנוע אובדן מידע אנא סגרו על תוכנית או מסמך פתוחים." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "לא ניתן למצוא שדרוג זמין" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "המערכת כבר שודרגה." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>הסר %s </b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "התקן %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "שדרג %s" @@ -507,7 +555,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -528,8 +576,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -681,11 +728,16 @@ msgstr "מוריד קובץ %li מתוך %li ב-%s לשנייה" msgid "Downloading file %li of %li with unknown speed" msgstr "מוריד קובץ %li מתוך %li במהירות לא ידועה" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "גרסה חדשה של אובונטו זמינה!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -693,110 +745,93 @@ msgid "" msgstr "נכשל בהורדת השינויים. אנא בדוק אם החיבור לאינטרנט עובד." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "לא ניתן להתקין את כל העדכונים הזמינים" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "גרסה %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "מוריד שינוייים" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "המערכת שלך מעודכנת!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "מתקין עדכונים..." msgstr[1] "מתקין עדכונים..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>פרטים</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 #, fuzzy msgid "Update is complete" msgstr "ההורדה הושלמה" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "ההפצה שלך כבר לא נתמכת, סליחה." -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -804,7 +839,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -812,151 +847,191 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "שינויים" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "תיאור" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "עדכוני תוכנה" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "מתקין עדכונים..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>מפתחות</b>" +msgid "changes" +msgstr "שינויים" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>עדכוני אינטרנט</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>מפתחות</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>עדכוני אינטרנט</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "אימות" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "ההורדה הושלמה" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>עדכוני אינטרנט</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "שחזר ברירת מחדל" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "שחזר מפתחות ברירת מחדל" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "העדפות תוכנה" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "מאפייני תוכנה" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "מקור" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "בדוק לעדכונים כל" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -966,44 +1041,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>מפתחות</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>הערות:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>רכיבים</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>רכיבים</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>הפצה:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>סוג:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>כתובת:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>הכנס את שורת APT השלמה של המאגר שברצונך להוסיף</b></big>\n" @@ -1012,15 +1077,11 @@ msgstr "" "org sarge main\"</i>\n" "אפשר למצוא הסבר מפורט על זה בתיעוד." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT שורת:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1028,23 +1089,21 @@ msgstr "" "מקור\n" "בינארי" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "מקור" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_התאם אישית" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "מקור" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "טען מחדש" @@ -1097,138 +1156,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "מאפייני תוכנה" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "עדכונים - אובונטו 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "עדכוני אבטחה - אובונטו 5.04" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "עדכונים - אובונטו 5.10" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "עדכונים - אובונטו 5.04" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "מתוחזק ע\"י קהילה (Universe(" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "לא-חופשי (Multiverse(" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "לא-חופשי (Multiverse(" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "עדכונים - אובונטו 5.10" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "עדכונים - אובונטו 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "עדכוני אבטחה - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "נתמך רשמית" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "זכויות יוצרים מגבילות" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "עדכוני אבטחה - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "עדכונים - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "עדכונים - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "עדכוני אבטחה - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "עדכונים - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "עדכונים - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "מתוחזק ע\"י קהילה (Universe(" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "לא-חופשי (Multiverse(" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "נתמך רשמית" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "זכויות יוצרים מגבילות" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "עדכוני אבטחה - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "עדכונים - אובונטו 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "עדכונים - אובונטו 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "דביאן 3.1 \"סארג'\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "עדכוני אבטחה - דביאן יציב" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "דביאן בדיקה" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "דביאן לא ארה\"ב (לא יציב)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "עדכונים - אובונטו 5.04" +#~ msgid "Hide details" +#~ msgstr "<b>פרטים</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "תקליטור עם אובונטו 5.10 \"Breezy Badger\"" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>מפתחות</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>מפתחות</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "עדכוני אבטחה - אובונטו 5.10" +#~ msgid "Installation Media" +#~ msgstr "דיסק התקנה" -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Software Preferences" +#~ msgstr "העדפות תוכנה" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>מפתחות</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>רכיבים</b>" + +#~ msgid "_Custom" +#~ msgstr "_התאם אישית" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "עדכונים - אובונטו 5.10" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "עדכוני אבטחה - אובונטו 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "עדכונים - אובונטו 5.10" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>מחלקה:</b>" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "עדכונים - אובונטו 5.10" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "נתמך רשמית" +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>מחלקה:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>מחלקה:</b>" @@ -1237,10 +1464,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "טען מחדש את המידע על החבילה מהשרת" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "עדכוני תוכנה" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1254,10 +1477,6 @@ msgstr "" #~ msgstr "הראה עדכונים זמינים ובחר את מה להתקין" #, fuzzy -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "תקליטור עם אובונטו 5.04 \"Hoary Hedgehog\"" - -#, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "שגיאה בהסרת המפתח" @@ -1386,18 +1605,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "בינארי" -#~ msgid "Source" -#~ msgstr "מקור" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "תקליטור עם אובונטו 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "עדכוני אבטחה - אובונטו 5.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "עדכונים - אובונטו 5.10" - #~ msgid "Contributed software" #~ msgstr "תוכנה שנתרמה" @@ -1477,9 +1684,6 @@ msgstr "" #~ "עדכוני אבטחה או עדכונים קריטיים אחרים. אנא ראה http://www.ubuntulinux.org " #~ "בשביל מידע אודות שדרוג." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "גרסה חדשה של אובונטו זמינה!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:46+0000\n" "Last-Translator: Rosetta Administrators <rosetta@launchpad.net>\n" "Language-Team: Hindi <hi@li.org>\n" @@ -17,65 +17,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -101,54 +144,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +200,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +221,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +234,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +278,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +315,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +365,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -406,72 +449,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -490,7 +535,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -511,8 +556,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -661,116 +705,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -778,7 +810,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -786,143 +818,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -932,74 +1000,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1051,101 +1103,231 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid " " +#~ msgstr " " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 20:54+0000\n" "Last-Translator: Ante Karamatić <ivoks@ubuntu.com>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -18,66 +18,110 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Dnevno" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Svaki drugi dan" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Tjedno" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Svaki drugi tjedan" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Svakih %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Nakon tjedan dana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Nakon dva tjedna" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Nakon mjesec dana" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Nakon %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Instaliraj nadogradnje" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Nadogradnje programa" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Unos ključa" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Greška prilikom uvoženja odabrane datoteke" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Odabrana datoteka možda nije GPG ključ ili je možda oštećena." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Greška prilikom brisanja ključa" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ključ koji ste odabrali se ne može obrisati. Molimo prijavite ovu grešku." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +132,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Upišite ime za disk" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Ubacite CD u uređaj:" @@ -108,20 +152,20 @@ msgstr "" "Vaš sistem sadrži pokvarene pakete koji nisu mogli biti popravljeni sa ovim " "programom. Popravite ih koristeći synaptic ili apt-get prije nastavljanja." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Ne mogu nadograditi potrebne meta-pakete" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Bitan paket bi morao biti uklonjen" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nisam mogao riješiti nadogradnju" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +174,11 @@ msgstr "" "prijavite ovo kao grešku. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Greška prilikom identificiranja nekih paketa" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -144,12 +188,12 @@ msgstr "" "problem sa mrežom i trebali biste kasnije pokušati ponovo. Pogledajte popis " "neidentificiranih paketa." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Ne mogu instalirati '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -158,11 +202,11 @@ msgstr "" "grešku. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Nisam mogao odrediti meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,15 +219,15 @@ msgstr "" " Prije nastavljanja, molim instalirajte jedan od gore navedenih paketa " "koristeći synaptic ili apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Čitam spremnik" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nisam našao ispravan zrcalni poslužitelj" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -203,11 +247,11 @@ msgstr "" "Ako odaberete 'ne' nadogradnja će se prekinuti." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Kreirati uobičajene izvore?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -220,11 +264,11 @@ msgstr "" "Treba li dodati uobičajene unose za '%s' ? Ako odaberete 'Ne' nadogradnja će " "prekinuti." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Podaci repozitorija neispravni" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -232,11 +276,11 @@ msgstr "" "Nadogradnja podataka repozitorija je rezultirala neispravnom datotekom. " "Molim, prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Izvori trećih strana su isključeni" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -246,11 +290,11 @@ msgstr "" "ih uključiti nakon nadogradnje sa 'software-properties' alatom ili sa " "synapticom." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Greška prilikom nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -258,11 +302,11 @@ msgstr "" "Pojavio se problem prilikom nadogradnje. Obično se radi o mrežnom problemu, " "pa vas molim da provjerite vašu mrežu i pokušate ponovo." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Nema dovoljno praznog mjesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -274,15 +318,15 @@ msgstr "" "koristeći 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Želite li pokrenuti nadogradnju?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Nisam mogao instalirati nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -290,11 +334,11 @@ msgstr "" "Nadogradnja se prekida. Vaš sistem bi mogao biti u neupotrebljivom stanju. " "Obnavljanje je pokrenuto (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Nisam mogao preuzeti nadogradnje" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -302,11 +346,11 @@ msgstr "" "Nadogradnja se prekida. Molim provjerite vašu internet vezu ili " "instalacijski medij i pokušajte ponovo. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Neki paketi više nisu službeno podržani" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -320,23 +364,23 @@ msgstr "" "Ako nemate omogućen 'universe' repozitorij, ovi paketi biti će predloženi za " "uklanjanje. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Ukloniti zastarjele pakete?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Preskoči ovaj korak" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Ukloni" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Greška prilikom čina" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -345,26 +389,26 @@ msgstr "" "više informacija. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Vraćam u početno stanje" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Provjeravam upravitelja paketima" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Nadograđujem podatke repozitorija" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Neispravni podaci paketa" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -375,19 +419,19 @@ msgstr "" "naći.\n" "Ovo upućuje na ozbiljnu grešku, molim prijavite ovo kao bug." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Pitam za potvrdu" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Nadograđujem" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Tražim zastarjele programe" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Nadogradnja sustava je završena." @@ -461,11 +505,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Nisam našao naredbu 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Pojavila se ozbiljna greška" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -477,7 +521,9 @@ msgstr "" "Vaša originalna sources.list datoteka je spremljena u /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -485,7 +531,7 @@ msgstr[0] "%s paket će biti uklonjen." msgstr[1] "%s paketa će biti uklonjena." msgstr[2] "%s paketa će biti uklonjeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -493,7 +539,7 @@ msgstr[0] "%s novi paket će biti instaliran." msgstr[1] "%s nova paketa će biti instalirana." msgstr[2] "%s novih paketa će biti instalirano." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -501,42 +547,42 @@ msgstr[0] "%s paket će biti nadograđen." msgstr[1] "%s paketa će biti nadograđena." msgstr[2] "%s paketa će biti nadograđeno." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Morate preuzeti ukupno %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Nadogradnja može potrajati nekoliko sati i ne može biti prekinuta niti u " "jednom trenutku." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "Da spriječite gubitak podataka zatvorite sve programe i datoteke." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nisam mogao naći niti jednu nadogradnju" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Vaš sustav je već nadograđen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ukloni %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instaliraj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Nadogradi %s" @@ -557,7 +603,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -584,8 +630,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Pokrenuti nadogradnju?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Nadograđujem na Ubuntu 6.06 LTS</span>" @@ -743,12 +789,18 @@ msgstr "Preuzimam datoteku %li od %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Preuzimam datoteku %li od %li nepoznatom brzinom" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Popis promjena trenutačno nije dostupan. Molim, pokušajte ponovno kasnije." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -757,11 +809,11 @@ msgstr "" "vezu." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Ne mogu instalirati sve dostupne nadogradnje" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -772,30 +824,30 @@ msgstr "" "upišite \"sudo apt-get dist-upgrade\" u terminalu za potpunu nadogradnju " "vašeg sistema." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Slijedeći paketi će biti preskočeni:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Verzija %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Preuzimam popis promjena..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Veličina preuzimanja: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Vaš sustav sadrži posljednje nadogradnje" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -803,32 +855,24 @@ msgstr[0] "Možete instalirati %s nadogradnju" msgstr[1] "Možete instalirati %s nadogradnje" msgstr[2] "Možete instalirati %s nadogradnji" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Sakrij detalje" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Prikaži detalje" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Molim pričekajte, ovo može potrajati." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Nadogradnja je gotova" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nova verzija: %s (Veličina: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Vaša distibucija više nije podržana" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -838,25 +882,17 @@ msgstr "" "na noviju verziju Ubuntu Linuxa. Pogledajte na http://www.ubuntu.com za više " "detalja o nadogradnji." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Dozvoljno je pokretanje samo jednog paketnog alata u istom trenutku" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "Molim, prvo zatvorite drugi program npr. 'aptitude' ili 'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Popis programa je oštećen" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -866,7 +902,7 @@ msgstr "" "upravitelja paketima \"Synaptic\" ili upišite \"sudo apt-get install -f\" u " "terminal za ispravljanje ovog problema." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -878,7 +914,7 @@ msgstr "" "Vaš sustav ne provjerava automatski postojanje nadogradnji. Možete podesiti " "ovo ponašanje u \"Sustav\" -> \"Administacija\" -> \"Postavke nadogradnje\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -890,43 +926,47 @@ msgstr "" "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " "donose nove mogućnosti." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Održavajte vaš sustav nadograđenim</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Prekini _preuzimanje" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Promjene" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "P_rovjeri" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Provjeri repozitorije za nove nadogradnje" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Opis" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Bilješke izdanja" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Prikaži napredak pojedinih datoteka" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Nadogradnje programa" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -934,63 +974,85 @@ msgstr "" "Nadogradnje programa popravljaju greške, uklanjaju sigurnosne propuste i " "donose nove mogućnosti." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Na_dogradnja" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Nadogradi na zadnju verziju Ubuntua" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "Pro_vjeri" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Ubuduće _sakrij ovu informaciju" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instaliraj nadogradnje" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Repozitoriji</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Promjene" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet nadogradnje</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Kjučevi</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet nadogradnje</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Dodaj _CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autorizacija" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Obriši dobavljene datoteke programa:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Preuzimanje je završeno" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Uvezi javni ključ od pouzdanog davatelja programa" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Instalacijski medij" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet nadogradnje" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -998,39 +1060,54 @@ msgstr "" "Samo sigrnosne nadogradnje sa službenih Ubuntu poslužitelja biti će " "instalirane automatski" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Vrati _uobičajene postavke" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Vrati uobičajene ključeve vaše distribucije" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Postavke nadogradnje" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Provjeri postojanje nadogradnji automatski:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "P_reuzmi nadogradnje u pozadini, ali ih ne instaliraj" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Unesi datoteku ključa" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instaliraj sigurnosne nadogradnje bez potvrde" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1046,40 +1123,33 @@ msgstr "" "\n" "Trebate funkcionalnu internet vezu za nastavak." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Repozitorij</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponente:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponente</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribucija:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Vrsta:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Unesite kompletnu APT liniju repozitorija koji želite dodati</b></" @@ -1088,15 +1158,11 @@ msgstr "" "APT linija uključuje vstu, lokaciju i komponente kanala, na primjer <i>\"deb " "http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT linija:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Dodaj repozitorij" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1104,24 +1170,19 @@ msgstr "" "Binarni\n" "Izvorni" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Uredi repozitorij" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Pretražujem CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Dodaj repozitorij" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Prilagođeno" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Osvježi" @@ -1178,116 +1239,308 @@ msgid "The window size" msgstr "Veličina prozora" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Podesi repozitorije i internet nadogradnje" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Postavke nadogradnje" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 osvježenja" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Održavani od strane zajednice (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Neslobodni (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Neslobodni (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS sigurnosne nadogradnje" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 sigurnosne nadogradnje" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS osvježenja" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS backporti" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Službeno podržani" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Ograničeno autorsko pravo" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 sigurnosne nadogradnje" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 osvježenja" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 backporti" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 sigurnosne nadogradnje" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 osvježenja" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 backporti" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Održavani od strane zajednice (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Neslobodni (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Službeno podržani" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Ograničeno autorsko pravo" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 sigurnosne nadogradnje" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 osvježenja" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 backporti" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sigurnosne nadogradnje" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testni)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (nestabilni)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilni programi sa neslobodnim ovisnostima" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG-nekompatibilni programi" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Sakrij detalje" + +#~ msgid "Show details" +#~ msgstr "Prikaži detalje" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Dozvoljno je pokretanje samo jednog paketnog alata u istom trenutku" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "Molim, prvo zatvorite drugi program npr. 'aptitude' ili 'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Repozitoriji</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Kjučevi</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Dodaj _CD-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Instalacijski medij" + +#~ msgid "Software Preferences" +#~ msgstr "Postavke nadogradnje" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Repozitorij</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponente</b>" + +#~ msgid "Add Channel" +#~ msgstr "Dodaj repozitorij" + +#~ msgid "Edit Channel" +#~ msgstr "Uredi repozitorij" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Dodaj repozitorij" + +#~ msgid "_Custom" +#~ msgstr "_Prilagođeno" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 sigurnosne nadogradnje" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS sigurnosne nadogradnje" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 osvježenja" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS osvježenja" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 backporti" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS backporti" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 21:22+0000\n" "Last-Translator: Gabor Kelemen <kelemengabor@linuxforum.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" @@ -17,66 +17,110 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Naponta" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Kétnaponta" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Hetente" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Minden két hétben" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "%s naponta" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Egy hét után" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Két hét után" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Egy hónap után" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s nap után" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Telepítés" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Szoftverfrissítések" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Kulcs importálása" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Az Ön által kijelölt kulcs nem távolítható el. Kérem, jelentse ezt hibaként." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Kérem, adja meg a lemez nevét" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Kérem, helyezzen be egy lemezt a meghajtóba:" @@ -108,20 +152,20 @@ msgstr "" "javíthatóak. Kérem, először javítsa ki őket a synaptic vagy az apt-get " "segítségével." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "A szükséges meta-csomagok nem frissíthetőek" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Egy alapvető csomag eltávolításra kerülne" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nem tudom megtervezni a frissítés menetét" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +174,11 @@ msgstr "" "jelentse ezt hibaként. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Hiba történt néhány csomag hitelesítése közben" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -144,23 +188,23 @@ msgstr "" "hálózati probléma okozza, ezért érdemes később újra megpróbálni. Az alábbi " "lista a hitelesíthetetlen csomagokat tartalmazza." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s' nem telepíthető" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Egy szükséges csomag nem telepíthető. Kérem, jelentse ezt hibaként. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Nem tudom megállapítani a meta-csomagot" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -174,15 +218,15 @@ msgstr "" " Kérem, előbb telepítse a fenti csomagok egyikét a synaptic vagy az apt-get " "használatával." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Gyorsítótár beolvasása" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "nem található érvényes tükör" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -203,11 +247,11 @@ msgstr "" "A \"Nem\" kiválasztása megszakítja a frissítést." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Alapértelmezett források ismételt előállítása?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -221,11 +265,11 @@ msgstr "" "Kíván alapértelmezett bejegyzéseket adni a következőhöz: %s? Ha a Nem " "gombott választja, a frissítés félbeszakad." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Érvénytelen csomagtároló információ" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -233,11 +277,11 @@ msgstr "" "A csomagtároló információ frissítése hibás fájlt eredményezett. Kérem, " "jelentse ezt hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "A külső források letiltva" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -247,11 +291,11 @@ msgstr "" "a frissítés után a Szoftvertulajdonságok eszközzel, vagy a Synaptic " "csomagkezelővel." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Hiba történt a frissítés közben" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -259,11 +303,11 @@ msgstr "" "Hiba lépett fel a frissítés közben. Ez többnyire hálózati problémára utal. " "Kérem, ellenőrizze a hálózati kapcsolatot és próbálja újra." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Nincs elég szabad hely a merevlemezen" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -275,15 +319,15 @@ msgstr "" "fájljait a \"sudo apt-get clean\" parancs kiadásával." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Biztosan el szeretné kezdeni a frissítést?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "A frissítések nem telepíthetők" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -291,11 +335,11 @@ msgstr "" "A frissítés most félbeszakad. Előfordulhat, hogy a rendszer használhatatlan " "állapotban van. Egy helyreállítás került futtatásra (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "A frissítések nem tölthetők le" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -303,11 +347,11 @@ msgstr "" "A frissítés most félbeszakad. Kérem, ellenőrizze a hálózati kapcsolatot vagy " "a telepítő médiát és próbálja újra. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Néhány szoftver már nincs hivatalosan támogatva" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -321,23 +365,23 @@ msgstr "" "Ha nincs engedélyezve a \"universe\" tároló, akkor ezek a csomagok a " "következő lépésben ki lesznek jelölve eltávolításra. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Eltávolítja az elavult csomagokat?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "Ezen lé_pés kihagyása" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Eltávolítás" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Hiba a módosítások rögzítése közben" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -346,26 +390,26 @@ msgstr "" "információkat tartalmaz a hibára vonatkozóan. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "A rendszer eredeti állapotának helyreállítása" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Csomagkezelő ellenőrzése" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Csomagtároló információ frissítése" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Érvénytelen csomaginformációk" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -376,19 +420,19 @@ msgstr "" "található többé.\n" "Ez egy komoly problémát jelez, jelentse hibaként." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Megerősítés kérése" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Frissítés folyamatban" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Elavult szoftverek keresése" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "A rendszer frissítése befejeződött." @@ -463,11 +507,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "A 'diff' parancs nem található" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Végzetes hiba történt" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -479,62 +523,64 @@ msgstr "" "Az eredeti sources.list /etc/apt/sources.list.distUpgrade néven került " "mentésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s csomag el lesz távolítva." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s új csomag kerül telepítésre." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s csomag frissítve lesz." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Összes letöltendő adatmennyiség: %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A frissítés több órát is igénybe vehet és a későbbiek során nem lehet " "bármikor megszakítani." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Az esetleges adatvesztés elkerülése érdekében zárjon be minden nyitott " "alkalmazást és dokumentumot." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nincs elérhető frissítés" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Az Ön rendszere már frissítve lett." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s eltávolítása</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s telepítése" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s frissítése" @@ -555,7 +601,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -580,8 +626,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Megkezdi a frissítést?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Frissítés az Ubuntu 6.06 LTS " "változatra</span>" @@ -741,11 +787,16 @@ msgstr "%li. fájl letöltése, összesen: %li, sebesség: %s/mp" msgid "Downloading file %li of %li with unknown speed" msgstr "%li. fájl letöltése, összesen: %li, ismeretlen sebességgel" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "A módosítások listája még nem érhető el. Próbálkozzon később." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -754,11 +805,11 @@ msgstr "" "internetkapcsolatát." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Nem telepíthető minden rendelkezésre álló frissítés" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -769,61 +820,53 @@ msgstr "" "futtassa terminálból a \"sudo apt-get dist-upgrade\" parancsot a rendszer " "teljes frissítéshez." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "A következő frissítések ki lesznek hagyva:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "%s verzió: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Módosítások listájának letöltése..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Letöltés mérete: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "A rendszere naprakész" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s frissítést telepíthet" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Részletek elrejtése" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Részletek megjelenítése" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Kis türelmet, ez eltarthat egy ideig." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "A frissítés befejeződött" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Új verzió: %s (Méret: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "A terjesztés már nem támogatott" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -833,26 +876,17 @@ msgstr "" "Frissítsen az Ubuntu Linux egy újabb változatára. A frissítéssel kapcsolatos " "információkat az http://www.ubuntu.com weboldalon talál." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>A disztribúció új \"%s\" kiadása elérhető</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Csak egy szoftverkezelő eszköz futhat egyidejűleg" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Zárja be a másik alkalmazást, például az aptitude vagy Synaptic programokat." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "A szoftverindex sérült" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -862,7 +896,7 @@ msgstr "" "csomagkezelőt vagy futtassa a \"sudo apt-get install -f\" parancsot egy " "terminálban a probléma megoldása érdekében." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -876,7 +910,7 @@ msgstr "" "viselkedést a \"Rendszer\" -> \"Adminisztráció\" -> \"Szoftverbeállítások\" " "menüpont alatt változtathatja meg." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -888,43 +922,47 @@ msgstr "" "A szoftverfrissítések programhibákat javítanak, megszüntetik a biztonsági " "sebezhetőségeket és új szolgáltatásokat biztosítanak." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Tartsa naprakészen a rendszerét</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Letöltés _megszakítása" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Módosítások" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Ellenőrzés" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Frissítések keresése a szoftvercsatornákon" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Leírás" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Kiadási megjegyzések" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Egyes fájlok állapotának mutatása" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Szoftverfrissítések" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -932,63 +970,85 @@ msgstr "" "A szoftverfrissítések kijavítják a programhibákat, biztonsági " "sebezhetőségeket és új szolgáltatásokat biztosítanak." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Frissítés" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Frissítés az Ubuntu legújabb változatára" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Ellenőrzés" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_A jövőben ne mutassa ezt az információt" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Telepítés" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Csatornák</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Módosítások" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Hálózati frissítések</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Kulcsok</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "_CD hozzáadása" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Hálózati frissítések</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Hitelesítés" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "L_etöltött csomagok törlése:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "A letöltés befejeződött" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Megbízható szoftverszolgáltató publikus kulcsának importálása" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Telepítő média" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Hálózati frissítések" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -996,39 +1056,54 @@ msgstr "" "Csak az Ubuntu kiszolgálóiról származó biztonsági frissítések kerülnek " "automatikusan telepítésre." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_Alapértelmezés visszaállítása" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "A disztribúcióra jellemző alapértelmezett kulcsok visszaállítása" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Szoftver beállításai" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Szoftvertulajdonságok" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Frissítések automatikus keresése:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "Frissítések _letöltése a háttérben, telepítés nélkül" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Kulcsfájl importálása" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Biztonsági frissítések telepítése megerősítés nélkül" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1044,40 +1119,33 @@ msgstr "" "\n" "A folytatáshoz működő hálózati kapcsolatra van szükség." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Csatorna</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Megjegyzés:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Összetevők:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Összetevők</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Disztribúció:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Típus:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Adja meg a felvenni kívánt csatorna teljes APT sorát</b></big>\n" @@ -1085,15 +1153,11 @@ msgstr "" "Az APT sor tartalmazza a csatorna típusát, helyét és összetevőit, például <i>" "\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT sor:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Csatorna hozzáadása" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1101,23 +1165,19 @@ msgstr "" "Bináris\n" "Forrás" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Csatorna szerkesztése" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "CD-ROM átvizsgálása" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "Csatorna hozzá_adása" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Egyéni" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "F_rissítés" @@ -1176,116 +1236,309 @@ msgid "The window size" msgstr "Az ablak mérete" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Szoftvercsatornák és internetes frissítések beállítása" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Szoftvertulajdonságok" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Közösségi karbantartású (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Nem-szabad (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Nem-szabad (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS biztonsági frissítések" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 biztonsági frissítések" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS frissítések" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS visszaportolt csomagok" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Hivatalosan támogatott" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Szerzői jogi korlátozás alatt" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 biztonsági frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 visszaportolt csomagok" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 biztonsági frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 visszaportolt csomagok" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Közösségi karbantartású (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Nem-szabad (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Hivatalosan támogatott" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Szerzői jogi korlátozás alatt" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 biztonsági frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 frissítések" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 visszaportolt csomagok" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" biztonsági frissítések" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (tesztelés alatt)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instabil)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibilis szoftver nem-szabad függőségekkel" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Nem DFSG-kompatibilis szoftver" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Részletek elrejtése" + +#~ msgid "Show details" +#~ msgstr "Részletek megjelenítése" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Csak egy szoftverkezelő eszköz futhat egyidejűleg" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Zárja be a másik alkalmazást, például az aptitude vagy Synaptic " +#~ "programokat." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Csatornák</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Kulcsok</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "_CD hozzáadása" + +#~ msgid "Installation Media" +#~ msgstr "Telepítő média" + +#~ msgid "Software Preferences" +#~ msgstr "Szoftver beállításai" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Csatorna</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Összetevők</b>" + +#~ msgid "Add Channel" +#~ msgstr "Csatorna hozzáadása" + +#~ msgid "Edit Channel" +#~ msgstr "Csatorna szerkesztése" + +#~ msgid "_Add Channel" +#~ msgstr "Csatorna hozzá_adása" + +#~ msgid "_Custom" +#~ msgstr "_Egyéni" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 biztonsági frissítések" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS biztonsági frissítések" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 frissítések" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS frissítések" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 visszaportolt csomagok" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS visszaportolt csomagok" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:41+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 18:46+0000\n" "Last-Translator: Andy Apdhani <imtheface@gmail.com>\n" "Language-Team: Indonesian <id@li.org>\n" @@ -16,67 +16,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Harian" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Setiap dua hari" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Mingguan" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Setiap dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Setiap %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Setelah satu minggu" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Setelah dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Setelah satu bulan" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Setelah %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Instal Update" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Perangkat Lunak Mutakhir" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Impor kunci" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Kesalahan mengimpor berkas terpilih" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Berkas terpilih mungkin bukan berkas kunci GPG atau berkas mungkin korup." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Kesalahan menghapus kunci" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Berkas yang anda pilih tidak dapat dihapus. Silakan laporkan ini sebagai bug." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Silakan masukkan nama untuk cakram" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Silakan masukan cakram ke dalam penggerak" @@ -108,20 +152,20 @@ msgstr "" "perangkat lunak ini. Silakan perbaiki terlebih dahulu dengan menggunakan " "synaptic atau apt-get sebelum melanjutkan hal ini." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat memutakhirkan meta-paket yang dibutuhkan" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Paket esensial akan dihapus" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menghitung pemutakhiran" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +174,11 @@ msgstr "" "bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Kesalahan membuktikan keabsahan beberapa paket" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -144,12 +188,12 @@ msgstr "" "mungkin karena masalah pada jaringan. Anda dapat mencobanya beberapa saat " "lagi. Lihat senarai dari paket yang belum terbukti keabsahnya dibawah ini." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat menginstal '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -158,11 +202,11 @@ msgstr "" "ini sebagai bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Tidak dapat menebak meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -176,15 +220,15 @@ msgstr "" " Silakan instal dahulu salah satu paket di atas dengan menggunakan synaptic " "atau apt-get sebelum melanjutkan." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Membaca cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Tidak menemukan mirror yang valid" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -204,11 +248,11 @@ msgstr "" "Jika anda pilih 'no' pemutakhiran akan dibatalkan." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Membuat sumber baku?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -221,11 +265,11 @@ msgstr "" "Haruskah entri baku untuk '%s' ditambahkan? Jika anda pilih 'No' " "pemutakhiran akan dibatalkan." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Informasi gudang tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -233,11 +277,11 @@ msgstr "" "Meng-upgrade informasi gudang berakhir di dalam berkas yang tidak benar. " "Silakan laporkan ini sebagai bug." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Sumber dari pihak ketiga dilumpukan" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -247,11 +291,11 @@ msgstr "" "dapat mengaktifkan kembali setelah upgrade dengan alat 'software-properties' " "atau dengan synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Kesalahan pada waktu pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -259,11 +303,11 @@ msgstr "" "Terjadi masalah pada waktu pemutakhiran. Ini biasanya karena masalah " "jaringan, silakan periksa koneksi jaringan anda dan ulangi." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Kapasitas cakram tidak mencukupi" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -275,15 +319,15 @@ msgstr "" "instalasi terdahulu dengan menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Apakah anda ingin memulai pemutakhiran?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Tidak dapat menginstal pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -291,11 +335,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Sistem anda dapat menjadi tidak dapat " "digunakan. Perbaikan sedang berjalan (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Tidak dapat mengunduh pemutakhiran" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -303,11 +347,11 @@ msgstr "" "Upgrade dibatalkan sekarang. Silakan periksa koneksi internet anda atau " "media instalasi dan coba lagi nanti. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Beberapa perangkat lunak tidak lagi resmi disokong" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -321,23 +365,23 @@ msgstr "" "Jika anda tidak mengaktifkan komponen 'universe' paket ini akan diajurkan " "untuk penghapusan dalam langkah selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Hapus paket usang?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Lewati Langkah Ini" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Hapus" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Kesalahan pada waktu commit" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -346,26 +390,26 @@ msgstr "" "bawah untuk informasi lebih lanjut. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Sistem dikembalikan ke keadaan awal" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Memeriksa manajer paket" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Memutakhirkan informasi gudang" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Informasi paket tidak valid" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -377,19 +421,19 @@ msgstr "" "Ini mengindikasikan adanya kesalahan serius, silakan laporkan ini sebagai " "bug." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Menanyakan konfigurasi" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Meng-upgrade" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Mencari perangkat lunak usang" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Upgrade sistem telah selesai." @@ -463,11 +507,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Perintah 'diff' tidak dapat ditemukan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Terjadi kesalahan fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -478,61 +522,63 @@ msgstr "" "dibatalkan sekarang. Berkas sources.list anda akan disimpan dalam /etc/apt/" "sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket akan dihapus." -#: ../DistUpgrade/DistUpgradeViewGtk.py:451 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s paket baru akan diinstal." -#: ../DistUpgrade/DistUpgradeViewGtk.py:457 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket akan diupgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Anda harus mengunduh sebanyak %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:467 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Upgrade membutuhkan waktu beberapa jam dan tidak dapat dibatalkan setelah " "itu." -#: ../DistUpgrade/DistUpgradeViewGtk.py:470 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Untuk mencegah kehilangan data silakan tutup seluruh aplikasi dan dokumen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Tidak dapat menemukan upgrade apapun" -#: ../DistUpgrade/DistUpgradeViewGtk.py:477 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Sistem anda telah diupgrade" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Hapus %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instal %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Upgrade %s" @@ -553,7 +599,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -578,8 +624,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Mulai upgrade?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Mengupgrade ke Ubuntu 6.06 LTS</span>" @@ -736,11 +782,16 @@ msgstr "Mengunduh berkas %li dari %li dengan %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Kecepatan mengunduh berkas %li dari %li tidak diketahui" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Senarai dari perubahan belum tersedia. Silakan coba lagi nanti." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -749,11 +800,11 @@ msgstr "" "anda." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Tidak dapat menginstal semua pemutakhiran yang tersedia" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -764,61 +815,53 @@ msgstr "" "jalankan \"sudo apt-get dist-upgrade\"\" dalam terminal untuk memutakhirkan " "sistem anda." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Pemutakhiran berikut akan dilewati:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versi %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Mengunduh senarai dari perubahan..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Ukuran unduh: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Sistem anda telah up-to-date" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Anda dapat instal %s pemutakhiran" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Sembunyikan perincian" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Tampilkan perincian" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Silakan tunggu, hal ini membutuhkan beberapa waktu." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Pemutakhiran selesai" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Versi baru: %s (Ukuran: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Distribusi anda tidak disokong lagi" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -828,29 +871,17 @@ msgstr "" "lebih lanjut. Upgrade ke versi berikut dari Ubuntu Linux. Lihat http://www." "ubuntu.com untuk informasi lebih lanjut." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Luncuran distribusi baru '%s' telah tersedia</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Hanya satu peralatan manajemen perangkat lunak yang dapat berjalan disaat " -"yang bersamaan" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Silakan tutup aplikasi lain terlebih dahulu seperti 'aptitude' atau " -"'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Indeks perangkat lunak telah rusak" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -860,7 +891,7 @@ msgstr "" "Silakan gunakan manajer paket \"Synaptic\" atau jalankan \"sudo apt-get " "install -f\" dalam terminal untuk memperbaiki persoalan ini." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -873,7 +904,7 @@ msgstr "" "mengatur ini di dalam \"System\" -> \"Administration\" -> \"Software " "Properties\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -885,43 +916,47 @@ msgstr "" "Pemutakhiran perangkat lunak memperbaiki kesalahan, melenyapkan kelemahan " "keamanan dan menyediakan fitur baru." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Memelihara sistem anda up-to-date</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Batalkan _Unduh" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Perubahan" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Peri_ksa" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Periksa kanal perangkal lunak untuk pemutakhiran terbaru" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Deskripsi" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Catatan Luncuran" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Tampilkan kemajuan dari berkas tunggal" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Perangkat Lunak Mutakhir" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -929,63 +964,85 @@ msgstr "" "Perangkat lunak nutakhir memperbaiki kesalahan, menyingkirkan kelemahan " "keamanan dan menyediakan fitur baru." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "U_pgrade" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade ke versi Ubuntu terakhir" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Periksa" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Sembunyikan informasi ini di masa depan" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instal Update" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanal</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Perubahan" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet update</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Kunci</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet update</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Tambah _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Otentikasi" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "H_apus berkas perangkat lunak yang telah diunduh:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Unduh telah selesai" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Impor kunci publik dari penyedia perangkal lunak terpercaya" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Media Instalasi" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Pemutakhiran lewat Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -993,39 +1050,54 @@ msgstr "" "Hanya pemutakhiran keamanan dari server resmi Ubuntu yang akan diinstal " "secara otomatis" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Kembali ke _Baku" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Kembalikan kunci baku dari distribusi anda" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Preferensi Perangkat Lunak" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Properti Perangkat Lunak" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Periksa pemutakhiran secara otomatis:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Unduh pemutakhiran di latar belakang, tetapi jangan diinstal" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Impor Berkas Kunci" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instal pemutakhiran keamanan tanpa perlu konfirmasi" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1041,40 +1113,33 @@ msgstr "" "\n" "Anda butuh koneksi internet untuk melanjutkannya." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponen:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponen</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribusi:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipe:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Masukkan baris lengkap APT dari kanal yang ingin anda tambah </b></" @@ -1083,15 +1148,11 @@ msgstr "" "Baris APT menyertakan tipe, lokasi dan komponen dari kanal, sebagai contoh " "<i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Baris APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Tambah Kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1099,23 +1160,19 @@ msgstr "" "Biner\n" "Sumber" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Edit Kanal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Memindai CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "_Tambah Kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_MuatUlang" @@ -1173,103 +1230,302 @@ msgid "The window size" msgstr "Ukuran jendela" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Mengatur kanal perangkat lunak dan pemutakhiran lewat internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Properti Perangkat Lunak" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Updates" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Dikelola oleh komunitas (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Tidak-bebas (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Tidak-bebas (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Pemutakhiran lewat Internet" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi disokong" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Hak cipta terlarang" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 6.06 LTS Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 6.06 LTS Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 6.06 LTS Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 6.06 LTS Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Dikelola oleh komunitas (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Tidak-bebas (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Resmi disokong" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Hak cipta terlarang" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 6.06 LTS Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 6.06 LTS Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 6.06 LTS Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Security Updates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" "Perangkat Lunak yang sesuai dengan DFSG tapi tergantung pada Perangkat Lunak " "Tidak-Bebas" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Perangkat Lunak yang tidak sesuai dengan DFSG" + +#~ msgid "Hide details" +#~ msgstr "Sembunyikan perincian" + +#~ msgid "Show details" +#~ msgstr "Tampilkan perincian" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Hanya satu peralatan manajemen perangkat lunak yang dapat berjalan disaat " +#~ "yang bersamaan" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Silakan tutup aplikasi lain terlebih dahulu seperti 'aptitude' atau " +#~ "'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanal</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Kunci</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Tambah _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Media Instalasi" + +#~ msgid "Software Preferences" +#~ msgstr "Preferensi Perangkat Lunak" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponen</b>" + +#~ msgid "Add Channel" +#~ msgstr "Tambah Kanal" + +#~ msgid "Edit Channel" +#~ msgstr "Edit Kanal" + +#~ msgid "_Add Channel" +#~ msgstr "_Tambah Kanal" + +#~ msgid "_Custom" +#~ msgstr "_Custom" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 14:01+0000\n" "Last-Translator: Luca Ferretti <elle.uca@libero.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -18,69 +18,115 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Ogni giorno" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Ogni due giorni" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Ogni settimana" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Ogni due settimane" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Ogni %s giorni" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Dopo una settimana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Dopo due settimane" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Dopo un mese" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Dopo %s giorni" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Installazione degli aggiornamenti" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Aggiornamenti Software" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Sorgente" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Sorgente" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importa chiave" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Errore nell'importare il file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere corrotto." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Errore nel rimuovere la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Notificare questo evento come " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -91,11 +137,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Inserire un nome per il disco" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Inserire un disco nell'unità:" @@ -112,20 +158,20 @@ msgstr "" "con questo software. Prima di procedere, utilizzare \"synaptic\" o \"apt-get" "\" per risolvere il probelma." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Impossibile aggiornare i meta-pacchetti richiesti" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Un pacchetto essenziale dovrebbe essere rimosso" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossibile calcolare l'aggiornamento" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -134,11 +180,11 @@ msgstr "" "dell'aggiornamento. Notificare questo evento come bug. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Errore nell'autenticare alcuni pacchetti" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -148,12 +194,12 @@ msgstr "" "un problema di rete passeggero, riprovare più tardi. Segue una lista di " "pacchetti non autenticati." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Impossibile installare \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -162,11 +208,11 @@ msgstr "" "evento come bug. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Impossibile indovinare il meta-pacchetto" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -180,15 +226,15 @@ msgstr "" " Prima di procedere, usare synaptic o apt-get per installare uno dei " "pacchetti sopra menzionati." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Lettura della cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Non è stato trovato alcun mirror valido" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -209,11 +255,11 @@ msgstr "" "Scegliendo di no, l'aggiornamento verrà annullato." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Generare le sorgenti predefinite?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -227,11 +273,11 @@ msgstr "" "Aggiungere le voci predefinite per «%s»? Selezionando «No», l'aggiornamento " "verrà annullato." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Informazioni sul repository non valide" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -239,11 +285,11 @@ msgstr "" "L'aggiornamento delle informazioni sul repository ha generato un file non " "valido. Notificare questo evento come bug." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Sorgenti di terze parti disabilitate" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -253,11 +299,11 @@ msgstr "" "list». È possibilie abilitarle di nuovo dopo l'aggiornamento con lo " "strumento «software-properties» o con synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Errore durante l'aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -265,11 +311,11 @@ msgstr "" "Si è verificato un problema durante l'aggiornamento. Solitamente si tratta " "di problemi di rete, controllare la connessione di rete e riprovare." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Spazio libero su disco insufficiente" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -281,15 +327,15 @@ msgstr "" "usando \"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Iniziare l'aggiornamento?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Impossibile installare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -298,11 +344,11 @@ msgstr "" "uno stato inutilizzabile. È stato eseguito un ripristino (dpkg --configure -" "a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Impossibile scaricare gli aggiornamenti" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -310,11 +356,11 @@ msgstr "" "Interruzione immediata dell'aggiornamento. Controllare la connessione a " "internet o il supporto di installazione e riprovare. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Software non più supportato ufficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -329,23 +375,23 @@ msgstr "" "Se non è abilitato il repository «universe», verrà suggerita la rimozione di " "questi pacchetti al prossimo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Rimuovere i pacchetti obsoleti?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Salta questo passo" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Rimuovi" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Errore durante il commit" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -354,26 +400,26 @@ msgstr "" "seguente per maggiori informazioni. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Ripristino stato originale del sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Controllo gestore dei pacchetti" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Aggiornamento delle informazione sui repository" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Informazioni di pacchetto non valide" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -384,19 +430,19 @@ msgstr "" "trovare il pacchetto essenziale «%s».\n" "Ciò indica un errore grave, segnalare questo evento come un bug." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Richiesta di conferma" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Aggiornamento" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Ricerca di software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "L'aggiornamento del sistema è stato completato." @@ -471,11 +517,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Il comando \"diff\" non è stato trovato" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Si è verificato un errore fatale" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -487,65 +533,67 @@ msgstr "" "Il file sorces.list originale è stato salvato in /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacchetto sta per essere rimosso." msgstr[1] "%s pacchetti stanno per essere rimossi." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s nuovo pacchetto sta per essere installato." msgstr[1] "%s nuovi pacchetti stanno per essere installati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacchetto sta per essere aggiornato." msgstr[1] "%s pacchetti stanno per essere aggiornati." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "È necessario scaricare un totale di %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "L'aggiornamento può richiedere diverse ore e non può essere annullato in " "nessun momento successivo." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Chiudere tutte le applicazioni e i documenti aperti per prevenire la perdita " "di dati." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Impossibile trovare aggiornamenti" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Il sistema è già stato aggiornato." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Rimuovere %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installare %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Aggiornare %s" @@ -564,7 +612,7 @@ msgstr "L'aggiornamento è finito ed è richiesto un riavvio. Riavviare ora?" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -589,8 +637,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Avviare l'aggiornamento?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Aggiornamento a Ubuntu 6.06 LTS</span>" @@ -752,12 +800,18 @@ msgstr "Scaricamento del file %li di %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Scaricamento del file %li di %li a velocità sconosciuta" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "L'elenco dei cambiamenti non è ancora disponibile. Riprovare più tardi." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -766,11 +820,11 @@ msgstr "" "connessione ad Internet." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Impossibile installare tutti gli aggiornamenti disponibili" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -781,62 +835,54 @@ msgstr "" "\"Synaptic\" o inserire il comando \"sudo apt-get dist-upgrade\" in un " "terminale per aggiornare completamente il sistema." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "I seguenti aggiornamenti saranno tralasciati:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versione %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Scaricamento dell'elenco dei cambiamenti..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Dati da scaricare: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Il sistema è aggiornato!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "È possibile installare %s aggiornamento" msgstr[1] "È possibile installare %s aggiornamenti" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Nascondi dettagli" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Mostra dettagli" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Attendere, l'operazione potrebbere richiedere del tempo." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Aggiornamento completato" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nuova versione: %s (Dimensione: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "La distribuzione in uso non è più supportata" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -846,29 +892,17 @@ msgstr "" "versione più aggiornata di Ubuntu Linux. Per maggiori informazioni " "consultare http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"È consentita l'esecuzione di un solo strumento di gestione software alla " -"volta" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" prima " -"di continuare." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "L'indice dei programmi è rovinato" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -878,7 +912,7 @@ msgstr "" "dei pacchetti \"Synaptic\" o inserire il comando \"sudo apt-get install -f\" " "in un terminale per risolvere il problema." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -891,7 +925,7 @@ msgstr "" "possibile configurare questo comportamento in \"Sistema\" -> " "\"Amministrazione\" -> \"Proprietà software\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -903,43 +937,47 @@ msgstr "" "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " "sicurezza ed aggiungono nuove funzionalità." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Mantenere aggiornato il sistema</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Annulla _scaricamento" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Cambiamenti" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Verifica" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Verifica la presenza di nuovi aggiornamenti nei canali software" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descrizione" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Note di rilascio" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostra l'avanzamento dei singoli file" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aggiornamenti software" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -947,63 +985,85 @@ msgstr "" "Gli aggiornamenti software correggono errori, eliminano vulnerabilità di " "sicurezza ed aggiungono nuove funzionalità." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ggiorna" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aggiorna all'ultima versione di Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Verifica" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Non mostrare più queste informazioni" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "I_nstalla aggiornamenti" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Canali</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Cambiamenti" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Aggiornamenti internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Chiavi</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Aggiungi C_D-ROM" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Aggiornamenti internet</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticazione" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Elimina i file di software scaricati:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Scaricamento completato" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importa la chiave pubblica da un fornitore di software fidato" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Supporto di installazione" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Aggiornamenti internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1011,39 +1071,55 @@ msgstr "" "Solo gli aggiornamenti di sicurezza dai servers ufficiali di Ubuntu saranno " "installati automaticamente" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Ripristina pre_definite" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Ripristina le chiavi predefinite della distribuzione in uso" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Preferenze software" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Proprietà software" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Sorgente" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Verificare aggiornamenti automaticamente:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Scaricare gli aggiornamenti in background, ma non installarli" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "I_mporta file chiave" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "I_nstallare gli aggiornamenti di sicurezza senza richiedere conferma" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1059,40 +1135,33 @@ msgstr "" "\n" "Per continuare è neccessaria una connessione a internet funzionante." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Canale</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Commento:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componenti:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componenti</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribuzione:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Inserire la riga APT completa del canale che si vuole aggiungere</" @@ -1101,15 +1170,11 @@ msgstr "" "La riga APT include il tipo, la posizione ed i componenti di un canale, per " "esempio <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Riga APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Aggiungi canale" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1117,24 +1182,21 @@ msgstr "" "Binari\n" "Sorgenti" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Modifica canale" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Sorgente" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Scansione CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Aggiungi canale" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalizzato" +msgid "_Add Source" +msgstr "Sorgente" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Ricarica" @@ -1194,119 +1256,315 @@ msgid "The window size" msgstr "Dimensione della finestra" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configura i canali software gli aggiornamenti da internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Proprietà software" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Aggiornamenti di Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS - Aggiornamenti di sicurezza" +#: ../data/channels/Ubuntu.info.in:28 +#, fuzzy +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS - Aggiornamenti" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Mantenuto dalla comunità (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non libero (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non libero (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS - Backport" +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Supportato ufficialmente" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Copyright con restrizioni" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Aggiornamenti di Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Backport di Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD con Ubuntu·5.04·\"Hoary·Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Aggiornamenti di Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Backport di Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Mantenuto dalla comunità (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non libero (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Supportato ufficialmente" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Copyright con restrizioni" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Aggiornamenti di Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Backport di Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aggiornamenti di sicurezza per Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (Unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibile con le DFSG con dipendenze non libere" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software non compatibile con le DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Nascondi dettagli" + +#~ msgid "Show details" +#~ msgstr "Mostra dettagli" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "È consentita l'esecuzione di un solo strumento di gestione software alla " +#~ "volta" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Chiudere tutte le altre applicazioni come \"aptitude\" o \"Synaptic\" " +#~ "prima di continuare." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Canali</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Chiavi</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Aggiungi C_D-ROM" + +#~ msgid "Installation Media" +#~ msgstr "Supporto di installazione" + +#~ msgid "Software Preferences" +#~ msgstr "Preferenze software" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Canale</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componenti</b>" + +#~ msgid "Add Channel" +#~ msgstr "Aggiungi canale" + +#~ msgid "Edit Channel" +#~ msgstr "Modifica canale" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Aggiungi canale" + +#~ msgid "_Custom" +#~ msgstr "_Personalizzato" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Aggiornamenti di sicurezza per Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS - Aggiornamenti di sicurezza" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Aggiornamenti di Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS - Aggiornamenti" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Backport di Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS - Backport" #~ msgid "No valid entry found" #~ msgstr "Nessuna voce valida trovata" @@ -1392,12 +1650,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sezioni</b>" -#~ msgid "Oficially supported" -#~ msgstr "Supportato ufficialmente" - -#~ msgid "Installing updates" -#~ msgstr "Installazione degli aggiornamenti" - #, fuzzy #~ msgid "Check for available updates" #~ msgstr "Verifica degli aggiornamenti..." @@ -1408,10 +1660,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Reload the latest information about updates" #~ msgstr "Ricarica le informazioni sugli aggiornamenti" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Aggiornamenti Software" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1427,10 +1675,6 @@ msgstr "Software non compatibile con le DFSG" #~ "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" @@ -1546,18 +1790,6 @@ msgstr "Software non compatibile con le DFSG" #~ msgid "Binary" #~ msgstr "Binario" -#~ msgid "Source" -#~ msgstr "Sorgente" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD con Ubuntu·4.10·\"Warty·Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Aggiornamenti di sicurezza per Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Aggiornamenti di Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Software contribuito" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.42.4\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 07:06+0000\n" "Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n" "Language-Team: Ubuntu Japanese Team <ubuntu-ja-users@freeml.com>\n" @@ -18,66 +18,112 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "X 日ごとに" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "2日ごと" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "X 週ごとに" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "2週ごと" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "%s 日ごと" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "1週間後" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "2週間後" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "1ヶ月後" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s 日後" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "アップデートをインストール中" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "ソフトウェアのアップデート" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "ソース" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "ソース" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "鍵のインポート" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPG鍵ファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "鍵削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択した鍵を削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +134,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "ディスク名を入力してください" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "ディスクをドライブに挿入してください:" @@ -108,31 +154,31 @@ msgstr "" "システムにはこのソフトウェアでは修復できない壊れたパッケージが含まれていま" "す。 Synaptic や apt-get を使って最初に修正してください。" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "要求されたメタパッケージがアップグレードできません" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "必須パッケージが削除されます" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "アップグレードが算定できません" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "算定中に解決できない問題がおきました。バグとして報告してください。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "いくつかのパッケージが認証されませんでした" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -142,12 +188,12 @@ msgstr "" "クの問題でしょう。あとで再び試してみてください。下に認証できなかったパッケー" "ジが表示されます。" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s' がインストールできません" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -155,11 +201,11 @@ msgstr "" "要求されたパッケージのインストールができません。バグとして報告してください。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "メタパッケージを推測できません" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -173,15 +219,15 @@ msgstr "" "開始前に Synaptic や apt-get を使用して上記のパッケージのうちのひとつをインス" "トールしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "キャッシュを読み込み中" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "正しいミラーが見つかりません" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -200,11 +246,11 @@ msgstr "" "キャンセルします。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "標準のソースを生成しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -217,11 +263,11 @@ msgstr "" "'%s' のデフォルトエントリを追加しますか？ 'いいえ' を選択するとアップデートを" "キャンセルします。" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "リポジトリ情報が無効です" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -229,11 +275,11 @@ msgstr "" "リポジトリ情報をアップグレード中に無効なファイルを生成しました。バグとして報" "告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "公式ではないソースが無効になりました" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -243,11 +289,11 @@ msgstr "" "アップグレード後に 'ソフトウェアのプロパティ' ツールか Synaptic を使用してく" "ださい。" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "アップデート中にエラー発生" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -255,11 +301,11 @@ msgstr "" "アップデート中に問題が発生しました。おそらくある種のネットワークの問題です。" "ネットワーク接続をチェックし、再びアップデートしてください。" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "ディスクの空き領域が足りません" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -271,15 +317,15 @@ msgstr "" "た一時パッケージを削除してください。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "アップグレードを開始しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "アップグレードをインストールできません" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -287,11 +333,11 @@ msgstr "" "アップグレードを中断しました。システムが使用できない状態になっている可能性が" "あります。ただいま修正を実行中です (dpkg --configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "アップグレードをダウンロードできません" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -299,11 +345,11 @@ msgstr "" "アップグレードを中断しました。インターネット接続またはインストールメディア" "(CD-ROMなど)をチェックし。再試行してください。 " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "いくつかのソフトウェアはもう公式にサポートされません" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -317,23 +363,23 @@ msgstr "" "'universe' を有効にしないと、これらのパッケージは次のステップで削除することを" "提案します。 " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "不要なパッケージを削除しますか？" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "このステップをスキップ(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "削除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "コミット中にエラー" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -342,26 +388,26 @@ msgstr "" "ください。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "システムを元に戻し中" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "パッケージマネージャをチェック中" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "リポジトリ情報をアップデート" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "無効なパッケージ情報" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -371,19 +417,19 @@ msgstr "" "パッケージ情報のアップデートのあと、重要パッケージ '%s' が見つかりません。\n" "このメッセージは深刻なエラーです。バグとして報告してください。" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "確認する" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "アップグレード中" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "古いソフトウェアを検索する" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "システムのアップグレードが完了しました。" @@ -457,11 +503,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' コマンドが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "重大なエラーが発生しました" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -472,60 +518,62 @@ msgstr "" "元の sources.list は /etc/apt/sources.list.distUpgrade として保存されていま" "す。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s つのパッケージが削除されます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s·つのパッケージがインストールされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s·つのパッケージがアップグレードされます。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "全部で %s つのパッケージをダウンロードする必要があります。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "アップグレードには数時間かかり、今後一切キャンセルはできません。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "データの損失を避けるため、すべてのアプリケーションとドキュメントを閉じてくだ" "さい。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "アップグレードが見つかりません" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "システムはすでに最新の状態です。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>削除されるパッケージ: %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "インストール %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "アップグレード %s" @@ -544,7 +592,7 @@ msgstr "アップグレードが終了しました。再起動が必要ですが #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -570,8 +618,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>アップグレードを開始しますか？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS にアップデート中</" "span>" @@ -728,11 +776,16 @@ msgstr "ダウンロード中: %li のうち %li 速度 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "ダウンロード中: 速度不明で %li のうち %li" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "変更点がまだ取得できません。あとで試してください。" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "変更点がまだ取得できません。あとで試してください。" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -741,11 +794,11 @@ msgstr "" "い。" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "すべてのアップデートをインストールすることができません" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -756,61 +809,53 @@ msgstr "" "ドににマーク\"機能を使うか。端末から \"sudo apt-get dist-upgrade\" を実行して" "ください。" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "これらのパッケージはアップグレードされません:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "バージョン %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "変更点を取得中..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "ダウンロードサイズ: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "システムは最新の状態です!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 個のアップデートがインストールされます" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "詳細を隠す" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "詳細を表示" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "しばらくお待ちください。少々時間がかかります。" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "アップデートが完了しました" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "新しいバージョン: %s (サイズ: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "このディストリビューションはすでにサポート対象外です" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -820,28 +865,17 @@ msgstr "" "Ubuntu Linux にアップグレードしてください。\r\n" "アップグレードに関する詳細な情報は http://www.ubuntu.com をご覧ください。" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"ソフトウェアマネージメントツールは同時に1つしか実行することができません" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"まず 'aptitude' または 'Synaptic' など、ほかのアプリケーションを終了してくだ" -"さい。" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "ソフトウェアのインデックスが壊れています" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -851,7 +885,7 @@ msgstr "" "ケージマネージャを使用するか、 まずこの問題を解決するために \"sudo apt-get " "install -f\" コマンドをターミナルで実行してください。" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -864,7 +898,7 @@ msgstr "" "(System)\"·->·\"システム管理\"·->·\"ソフトウェアのプロパティ (Software " "Properties)\" で行います。" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -876,43 +910,47 @@ msgstr "" "ソフトウェアアップデートはエラーを修正し、セキュリティホールを修正し、新機能" "を提供します。" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>システムを最新の状態にする</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "ダウンロードをキャンセル(_D)" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "変更点" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "再チェック(_K)" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "新しいアップデートの調査のためにソフトウェアチャンネルをチェックします" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "説明" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "リリースノート" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "個々のファイルの進捗を表示" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "ソフトウェアのアップデート" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -920,63 +958,85 @@ msgstr "" "ソフトウェアアップデートはエラーを訂正し、セキュリティホールを修正し、新機能" "を提供します。" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "アップグレード(_P)" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Ubuntu の最新バージョンにアップグレード" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "チェック(_C)" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "今後この情報を隠す(_H)" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "アップデートをインストール(_I)" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>チャンネル</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "変更点" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>インターネットアップデート</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>鍵</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>インターネットアップデート</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "CD-ROM の追加(_C)" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "認証" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "ダウンロードしたファイルを削除(_E):" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "ダウンロードが完了しました" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "インターネットアップデート" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -984,39 +1044,55 @@ msgstr "" "公式な Ubuntu サーバからのセキュリティアップデートだけ自動的にインストールさ" "れます。" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "デフォルトに戻す(_D)" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "ディストリビューション標準の鍵を元に戻す" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "ソフトウェアの設定" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "ソフトウェアのプロパティ" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "ソース" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "アップデートを自動的にチェックする(_C):" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" -msgstr "アップデートをダウンロードはするが、インストールはしない(_D)" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" +msgstr "アップデートを自動的にダウンロード、ただしインストールはしない(_D)" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "鍵ファイルのインポート(_I)" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "確認せずにセキュリティアップデートをインストール(_I)" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1032,40 +1108,33 @@ msgstr "" "\n" "続けるためには、インターネット接続が有効になっている必要があります。" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>チャンネル</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>コメント:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>コンポーネント:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>コンポーネント</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>ディストリビューション:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>種類:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>追加したい完全な APT line を入力してください。</b></big>\n" @@ -1073,15 +1142,11 @@ msgstr "" "APT lineにはタイプ、場所、チャンネルのセクションなどを含めることができます。" "例:<i>\"deb http://ftp.debian.org sarge main\"</i>" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "チャンネルを追加" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1089,23 +1154,21 @@ msgstr "" "バイナリ\n" "ソース" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "チャンネルを編集" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "ソース" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "CD-ROM を検査中" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "チャンネルを追加(_A)" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "カスタム(_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "ソース" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "再読込(_R)" @@ -1161,119 +1224,315 @@ msgid "The window size" msgstr "ウィンドウのサイズ" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "ソフトウェアチャンネルとインターネットアップデートを設定" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "ソフトウェアのプロパティ" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 アップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "コミュニティによるメンテナンス (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "非フリー (Multiuniverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "非フリー (Multiuniverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 セキュリティアップデート" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS セキュリティアップデート" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS アップデート" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS バックポート" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "公式サポート" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "限定的な著作権(Restricted)" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu·5.10·'Breezy·Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 セキュリティアップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 アップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 バックポート" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu·5.04·\"Hoary·Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 セキュリティアップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 アップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 バックポート" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu·5.10·'Breezy·Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "コミュニティによるメンテナンス (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "非フリー (Multiuniverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "公式サポート" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "限定的な著作権(Restricted)" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 セキュリティアップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 アップデート" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 バックポート" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian·3.1·\"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian·3.1·\"Sarge\"·セキュリティアップデート" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian·\"Etch\"·(testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian·\"Sid\"·(unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "非フリーな依存関係のあるDFSG適合ソフトウェア" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSGに適合しないソフトウェア" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "詳細を隠す" + +#~ msgid "Show details" +#~ msgstr "詳細を表示" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu·5.10·'Breezy·Badger'" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "ソフトウェアマネージメントツールは同時に1つしか実行することができません" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "まず 'aptitude' または 'Synaptic' など、ほかのアプリケーションを終了してく" +#~ "ださい。" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>チャンネル</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>鍵</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "CD-ROM の追加(_C)" + +#~ msgid "Installation Media" +#~ msgstr "インストールメディア" + +#~ msgid "Software Preferences" +#~ msgstr "ソフトウェアの設定" + +#~ msgid "_Download updates in the background, but do not install them" +#~ msgstr "アップデートをダウンロードはするが、インストールはしない(_D)" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>チャンネル</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 セキュリティアップデート" +#~ msgid "<b>Components</b>" +#~ msgstr "<b>コンポーネント</b>" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 アップデート" +#~ msgid "Add Channel" +#~ msgstr "チャンネルを追加" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 バックポート" +#~ msgid "Edit Channel" +#~ msgstr "チャンネルを編集" + +#~ msgid "_Add Channel" +#~ msgstr "チャンネルを追加(_A)" + +#~ msgid "_Custom" +#~ msgstr "カスタム(_C)" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS セキュリティアップデート" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS アップデート" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS バックポート" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1295,9 +1554,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "<b>Sections</b>" #~ msgstr "<b>セクション:</b>" -#~ msgid "Oficially supported" -#~ msgstr "公式サポート" - #~ msgid "" #~ "The upgrade aborts now. Your system can be in an unusable state. Please " #~ "try 'sudo apt-get install -f' or Synaptic to fix your system." @@ -1309,9 +1565,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "Remove obsolete Packages?" #~ msgstr "古いパッケージ削除しますか？" -#~ msgid "Installing updates" -#~ msgstr "アップデートをインストール中" - #~ msgid "" #~ "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu \"Dapper\" " #~ "6.04</span>" @@ -1333,9 +1586,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "Check for available updates" #~ msgstr "インストールできるアップデートをチェック" -#~ msgid "_Download updates in the backgound, but do not install them" -#~ msgstr "アップデートを自動的にダウンロード、ただしインストールはしない(_D)" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>セクション:</b>" @@ -1375,9 +1625,6 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "Show available updates and choose which to install" #~ msgstr "アップデート可能なファイルの表示とインストール" -#~ 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-" @@ -1545,15 +1792,9 @@ msgstr "DFSGに適合しないソフトウェア" #~ msgid "Binary" #~ msgstr "バイナリ" -#~ msgid "Source" -#~ msgstr "ソース" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 セキュリティアップデート" - #~ msgid "Contributed software" #~ msgstr "寄贈ソフトウェア" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:19+0000\n" "Last-Translator: Vladimer Sichinava <alinux@siena.linux.it>\n" "Language-Team: Georgian <geognome@googlegroups.com>\n" @@ -19,68 +19,112 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: KBabel 1.11.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "ყოველ დღიურად" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "ყოველ 2 დღეში" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "კვირეული" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "ყოველ 2 კვირაში" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "ყოველ %s დღეში" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "ერთ კვირაში" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "ორი კვირის შემდგომ" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "ერთი თვის შემდგომ" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s დღის შემდეგ" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "განახლებების _დაყენება" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "პროგრამული განახლებები" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "გასაღების იმპორტი" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "ამორჩეული ფაილის იმპორტი ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "ამორჩეული ფაილი შეიძლება არ იყოს GPG გასაღების ფაილი ან შეიძლება იყოს " "დაზიანებული." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "გასღების წაშლა ვერ მოხერხდა" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "ამორჩეული გასაღების წაშლა ვე რმოხერხდა. გთხოვთ აცნობოთ ეს როგორც ხარვეზი." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -91,11 +135,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "შეიყვანეთ დისკის სახელი" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "მოათავსეთ დისკი დისკწამყვანში:" @@ -112,22 +156,22 @@ msgstr "" "პროგრამით. ჯერ გამართეთ გაფუჭებული პაკეტები synaptic ან apt-get პროგრამით და " "შემდეგ გააგრძელეთ." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "საჭჳრო მეტა-პაკეტების განახლება ვერ მოხერხდა" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 #, fuzzy msgid "A essential package would have to be removed" msgstr "A არსებითი -სკენ" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 #, fuzzy msgid "Could not calculate the upgrade" msgstr "არა" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -136,11 +180,11 @@ msgstr "" "ხარვეზი. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "ზოგიერთი პაკეტის ავთენთიფიკაციის შეცდომა" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -150,23 +194,23 @@ msgstr "" "ბრაკი. იქნებ მოგვიანბით კიდევ ერთხელ სცადოთ. ქვევით იხილეთ არა-" "ავთენთიფიცერული პაკეტების სია." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s' ვერ დაყენდა" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "საჭირო პაკეტის დაყენება ვერ მოხერხდა. შეატყობინეთ ეს როგორხ ხარვეზი. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "მეტა-პაკეტი ვერ გამოვიცანით" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 #, fuzzy msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" @@ -178,15 +222,15 @@ msgstr "" "არა შეიცავს a ან და არა -სკენ ვერსია ის\n" " ის ან." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "მიმდინარეობს ქეშის წაკითხვა" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "არავითარი გამოსადეგი სერვერის ანარეკლი" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -199,12 +243,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 #, fuzzy msgid "Generate default sources?" msgstr "გენერაცია ნაგულისხმევი?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -213,11 +257,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "რეპოზიტორიების ინფორმაცია არასწორეა" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -225,12 +269,12 @@ msgstr "" "რეპოზიტორიების განახლების შედეგად დაზიანდა ფაილი. შეატყობინეთ ეს როგორხ " "ხარვეზი." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 #, fuzzy msgid "Third party sources disabled" msgstr "გამორთული" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 #, fuzzy msgid "" "Some third party entries in your souces.list were disabled. You can re-" @@ -238,11 +282,11 @@ msgid "" "synaptic." msgstr "-ში სია გამორთული თქვენ პარამეტრები ან." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "განახლებისას მოხდა შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -250,11 +294,11 @@ msgstr "" "განახლებისას მოხდა შეცდომა. ეს როგროც წესი არის კავშირის პრობლემა, შეამოწმეთ " "თქვენი კავშირი და ცადეთ კიდევ ერთხელ." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "დისკზე არ არის საკმარისი თავისუფალი ადგილი" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -263,40 +307,40 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "გნებავთ განახლების დაწყება?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 #, fuzzy msgid "Could not install the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 #, fuzzy msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "ახლა -ში A a." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 #, fuzzy msgid "Could not download the upgrades" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 #, fuzzy msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "ახლა ან და " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 #, fuzzy msgid "Some software no longer officially supported" msgstr "არა" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 #, fuzzy msgid "" "These installed packages are no longer officially supported, and are now " @@ -306,24 +350,24 @@ msgid "" "removal in the next step. " msgstr "არა და ახლა n t ჩართული -თვის -ში ნაბიჯი " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "წავშალო მოძველებული პაკეტები?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "ნაბიჯის გა_მოტოვება" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_წაშლა" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 #, fuzzy msgid "Error during commit" msgstr "შეცდომა" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 #, fuzzy msgid "" "Some problem occured during the clean-up. Please see the below message for " @@ -331,26 +375,26 @@ msgid "" msgstr "-თვის ინფორმაცია " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "ვამოწმებ პროგრამულ მენეჯერს" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "რეპოზტორიის ინფორმაციის განახლება" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "გაფუჭებული პაკეტის შესახებ ინფორმაცია" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -358,21 +402,21 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 #, fuzzy msgid "Asking for confirmation" msgstr "-თვის" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "მიმდინარეობს განახლებების ჩაყენება" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 #, fuzzy msgid "Searching for obsolete software" msgstr "ვეძებ -თვის" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 #, fuzzy msgid "System upgrade is complete." msgstr "სისტემა ტოლია სრული." @@ -448,12 +492,12 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "არა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 #, fuzzy msgid "A fatal error occured" msgstr "A შეცდომა" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " @@ -461,60 +505,62 @@ msgid "" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "a და შემცველობა და -ში ახლა თავდაპირველი სია -ში სია." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 #, fuzzy msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "საათი და ნებისმიერი დრო." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 #, fuzzy msgid "To prevent data loss close all open applications and documents." msgstr "ვის დახურვა ყველა გახსნა და დოკუმენტები." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "ვერ ვპოულობ განახლებებს" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "თქვენი სისტემა სულ ახლახანს განახლდა." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b> ამოშლა %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "დაყენება %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "ჩასაყენებელი განახლება %s" @@ -534,7 +580,7 @@ msgstr "ტოლია დასრულდა და a ტოლია -ს #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -559,8 +605,7 @@ msgstr "<b><big> გაშვება</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 #, fuzzy -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "<span weight=\"bold\" size=\"x-large\"> -სკენ</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -722,12 +767,18 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "ცვლილებების სია ჯერ-ჯერობით არ არის ხელმისაწვდომი. გთხოვთ სცადოთ მოგვიანებით." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -735,11 +786,11 @@ msgid "" msgstr "ვერ განხორციელდა -სკენ სია ის ინტერნეტი." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "შეუძლებელია ყველა არსებული განახლების ჩაყენება" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 #, fuzzy msgid "" "Some updates require the removal of further software. Use the function " @@ -749,62 +800,54 @@ msgstr "" "ის გამოყენება მონიშვნა ყველა ის Synaptic ან sudo -ში a ტერმინალი -სკენ " "განახლება." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "ვერსია %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "მიმდინარეობს ჩამოქაჩვა სია ის." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "ჩამოსატვირთის ზომა: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "თქვენი სისტემა განახლებულია" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "თქვენ შეგიძლიათ %s განახლების ჩადგმა" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "დეტალების დამალვა" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "დეტალების ჩვენება" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "გთხოვთ მოითმინოთ, მიმდინარე პროცესს საკმაო დრო ესაჭიორება." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "განახლება გასრულებულია" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "ახალი ვერსია: %s (ზომა: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "თქვენი დისტრიბუტივს აღარ გააჩნია მხარდაჭერა" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 #, fuzzy msgid "" "You will not get any further security fixes or critical updates. Upgrade to " @@ -814,27 +857,17 @@ msgstr "" "თქვენ არა ნებისმიერი ან კრიტიკული განახლება -სკენ a ვერსია ის ლინუქსი " "იხილეთhttp://www.ubuntu.com -თვის ინფორმაცია ჩართულია." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -#, fuzzy -msgid "Only one software management tool is allowed to run at the same time" -msgstr "მხოლოდ ტოლია -სკენ დრო" - -#: ../UpdateManager/UpdateManager.py:679 -#, fuzzy -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "დახურვა სხვა პროგრამა e ან Synaptic." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "პროგრამების სიის ინდექსი დაზიანებულია" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 #, fuzzy msgid "" "It is impossible to install or remove any software. Please use the package " @@ -843,7 +876,7 @@ msgid "" msgstr "" "ტოლია -სკენ ან წაშლა ნებისმიერი Synaptic ან sudo -ში a ტერმინალი -სკენ." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" @@ -854,7 +887,7 @@ msgstr "" "<b><big> თქვენ -თვის</big></b> n არა -თვის თქვენ -ში სისტემა ადმინისტრაცია " "პროგრამა პარამეტრები." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -866,158 +899,196 @@ msgstr "" "მოცემული პროგრამა გიჩვენებთ განახლებებს, გაასწორებს სისტემურ შეცდომებს და " "წარმოგიდგენთ ახალ შესაძლებლობებს." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 #, fuzzy msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b> დატოვება -სკენ თარიღი</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "ჩამოტვირთვის _გაუქმება" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "ცვლილებები" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "შე_მოწმება" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 #, fuzzy msgid "Check the software channels for new updates" msgstr "შემოწმება -თვის ახალი" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "აღწერილობა" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "ვერსიის მონაცემები" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 #, fuzzy msgid "Show progress of single files" msgstr "ჩვენება მიმდინარეობა ის ცალი" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "პროგრამული განახლებები" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "პროგრამა სწორეა და ახალი." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 #, fuzzy msgid "Upgrade to the latest version of Ubuntu" msgstr "განახლება -სკენ ვერსია ის" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "შ_ემოწმება" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_დამალე მომავალში მოცემული ინფორმაცია" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "განახლებების _დაყენება" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>არხები</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "ცვლილებები" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>ინტერნეტ განახლებები</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>გასაღებები</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -#, fuzzy -msgid "Add _Cdrom" -msgstr "დამატება" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>ინტერნეტ განახლებები</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy msgid "Authentication" msgstr "აუთენტიფიკაცია" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "ჩამოტვირთული პაკეტების ფაილების წ_აშლა:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 #, fuzzy -msgid "Import the public key from a trusted software provider" -msgstr "იმპორტი გასაღები a" +msgid "Download from:" +msgstr "ჩამოტვირთვა ტოლია სრული" -#: ../data/SoftwareProperties.glade.h:8 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy -msgid "Installation Media" -msgstr "დაყენება მედია" +msgid "Import the public key from a trusted software provider" +msgstr "იმპორტი გასაღები a" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "ინტერნეტ განახლებები" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "მხოლოდ" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "ნაგულისხმები პარამეტრები" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "ნაგულისხმევი ის დისტრიბუტივი" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "პროგრამების პარამეტრები" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "პროგრამა პარამეტრები" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "განახლებების ავტომატური შ_ემოწმება:" -#: ../data/SoftwareProperties.glade.h:15 +#: ../data/glade/SoftwareProperties.glade.h:23 #, fuzzy -msgid "_Download updates in the background, but do not install them" +msgid "_Download updates automatically, but do not install them" msgstr "ჩამოტვირთვა -ში არა" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "იმპორტი გასაღები ფაილი" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 #, fuzzy msgid "_Install security updates without confirmation" msgstr "დაყენება" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 #, fuzzy msgid "" "<b><big>The channel information is out-of-date</big></b>\n" @@ -1030,81 +1101,63 @@ msgstr "" "<b><big> ინფორმაცია ტოლია ის თარიღი</big></b> n -სკენ ინფორმაცია -სკენ და ან " "შეცვლილი n a -სკენ." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>არხი</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>კომენტარი:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Components:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>კომპონენტები</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>დისტრიბუტივი:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>ტიპი:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b> შეყვანა სრული ის -სკენ დამატება</b></big> n ტიპი მდებარეობა და " "კომპონენტები ის a -თვის მაგალითი<i>http://ftp.debian.org</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -#, fuzzy -msgid "Add Channel" -msgstr "არხის დამატება" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "Binary\n" "Source" msgstr "ორობითი" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "არხის რედაქტორება" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 #, fuzzy msgid "Scanning CD-ROM" msgstr "CD-ROM-ის სკანირება" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "დამატება არხი" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_პირადი" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_გადატვირთვა" @@ -1165,122 +1218,315 @@ msgstr "ფანჯარა ზომა" #: ../data/software-properties.desktop.in.h:1 #, fuzzy -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "კონფიგურირება და" -#: ../data/software-properties.desktop.in.h:2 -#, fuzzy -msgid "Software Properties" -msgstr "პროგრამა პარამეტრები" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, fuzzy, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/ s s s s s" #. Description -#: ../channels/Ubuntu.info.in:6 +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 განახლებები" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "არათავისუფალი (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "არათავისუფალი (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 განახლებები" +msgid "Important security updates" +msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS უსაფრთხოების განახლება" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS განახლებები" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS დამატებითი პროგრამები" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 +#. Description +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy -msgid "Restricted copyright" -msgstr "შეზღუდული" +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 განახლებები" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 დამატებითი პროგრამები" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 განახლებები" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 დამატებითი პროგრამები" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "არათავისუფალი (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +#, fuzzy +msgid "Restricted copyright" +msgstr "შეზღუდული" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 განახლებები" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 დამატებითი პროგრამები" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, fuzzy, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/ s s s s s" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "უსაფრთხოება" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 #, fuzzy msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "პროგრამა თავისუფალი დამოკიდებულებანი" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 #, fuzzy msgid "Non-DFSG-compatible Software" msgstr "პროგრამა" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "დეტალების დამალვა" + +#~ msgid "Show details" +#~ msgstr "დეტალების ჩვენება" + +#, fuzzy +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "მხოლოდ ტოლია -სკენ დრო" + +#, fuzzy +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "დახურვა სხვა პროგრამა e ან Synaptic." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>არხები</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>გასაღებები</b>" + +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "დამატება" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "დაყენება მედია" + +#~ msgid "Software Preferences" +#~ msgstr "პროგრამების პარამეტრები" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>არხი</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>კომპონენტები</b>" + +#, fuzzy +#~ msgid "Add Channel" +#~ msgstr "არხის დამატება" + +#~ msgid "Edit Channel" +#~ msgstr "არხის რედაქტორება" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "დამატება არხი" + +#~ msgid "_Custom" +#~ msgstr "_პირადი" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 განახლებები" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 უსაფრთხოების განახლება" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS უსაფრთხოების განახლება" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 განახლებები" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS განახლებები" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 დამატებითი პროგრამები" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS დამატებითი პროგრამები" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 15:14+0000\n" "Last-Translator: darehanl <darehanl@gmail.com>\n" "Language-Team: Korean <ko@li.org>\n" @@ -17,65 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "매일" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "이틀 마다" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "매주" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "두 주 마다" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "%s 일 마다" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "한 주 후에" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "두 주 후에" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "한 달 후에" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s 일 후에" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "업데이트를 설치(_I)" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "소프트웨어 업데이트" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "키 가져오기" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "선택한 파일 가져오기 오류" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "선택된 파일은 GPG 키 파일이 아니거나 잘못된 것입니다." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "키 삭제 오류" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "선택한 키를 지울 수 없습니다. 버그 리포팅 하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -86,11 +130,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "디스크에 사용할 이름을 입력하십시오." -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "드라이브에 디스크를 넣으십시오:" @@ -106,20 +150,20 @@ msgstr "" "이 소프트웨어로 수정할 수 없는 망가진 꾸러미가 있습니다. 진행 전에 먼저 시냅" "틱이나 apt-get을 사용하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "요청된 메타 꾸러미를 업그레이드 할 수 없습니다" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "필수 꾸러미를 지워야만 합니다." #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "업그레이드에 필요한 의존성을 계산할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -128,11 +172,11 @@ msgstr "" "버그를 보고하여 주십시오. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "꾸러미 인증 오류" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -141,23 +185,23 @@ msgstr "" "인증하는데 실패한 꾸러미가 있습니다. 일시적인 네트워크 문제일 수 있으니 나중" "에 다시 시도하십시오. 인증에 실패한 꾸러미의 목록은 다음과 같습니다." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s'을(를) 설치할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "요청된 꾸러미를 설치할 수 없습니다. 버그로 보고하여 주십시오. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "메타 꾸러미를 추측할 수 없습니다." -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -170,15 +214,15 @@ msgstr "" " 위의 꾸러미 중 하나를 시냅틱이나 apt-get을 이용해서 먼저 설치하시기 바랍니" "다." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "캐시를 읽는 중" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "적합한 미러 서버를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -198,11 +242,11 @@ msgstr "" "'아니오'를 고르면 업데이트가 취소됩니다." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "기본 설정된 소스 목록을 만듭니까?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -215,11 +259,11 @@ msgstr "" "'%s'에 대한 기본 항목을 추가하시겠습니까? '아니오'를 고르면 업데이트가 취소됩" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "저장소 정보가 올바르지 않습니다" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -227,11 +271,11 @@ msgstr "" "저장소 정보를 업그레이드하는 것이 잘못된 파일로 만들어졌습니다. 버그를 보고하" "여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "써드 파티 소스는 이용할 수 없습니다" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -241,11 +285,11 @@ msgstr "" "properties' 도구나 시냅틱으로 업그레이드 한 후에 다시 사용가능하게 할 수 있습" "니다." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "업데이트 중 오류" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -253,11 +297,11 @@ msgstr "" "업데이트를 하는 동안에 문제가 발생했습니다. 보통 네트워크 문제인 경우가 많습" "니다. 네트워크의 연결 상태를 확인하시고 다시 시도하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "디스크 여유 공간이 충분하지 않습니다." -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -269,15 +313,15 @@ msgstr "" "에 사용했던 임시 꾸러미들을 삭제하시기 바랍니다." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "업그레이드를 시작하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "업그레이드를 설치하지 못했습니다." -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -285,11 +329,11 @@ msgstr "" "업그레이드가 중지되었습니다. 시스템을 이용할 수 없는 상태일 수 있습니다. " "(dpkg --configure -a)를 실행하여 복구하십시오." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "업그레이드 파일을 다운로드 할 수 없습니다." -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -297,11 +341,11 @@ msgstr "" "업그레이드가 중지되었습니다. 인터넷 연결과 설치 미디어를 확인하시고 다시 시도" "하십시오. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "더 이상 공식적으로 지원하지 않는 소프트웨어가 있습니다." -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -315,23 +359,23 @@ msgstr "" "'Universe' 저장소를 활성화하지 않았다면 다음 단계에서 이 꾸러미들을 삭제할 " "수 있습니다. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "못쓰게 된 꾸러미를 삭제하시겠습니까?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "이 단계 건너뛰기(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "삭제(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "커밋 도중 오류 발생" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -340,26 +384,26 @@ msgstr "" "보를 얻으실 수 있습니다. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "시스템을 원상태로 복구하는 중" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "꾸러미 관리자 확인 중" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "저장소 정보 업데이트 중" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "잘못된 꾸러미 정보" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -370,19 +414,19 @@ msgstr "" "다.\n" "심각한 오류입니다. 버그를 보고하여 주십시오." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "확인을 요청하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "업그레이드 하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "못 쓰게 된 소프트웨어를 검색하는 중" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "시스템 업그레이드가 끝났습니다." @@ -456,11 +500,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' 명령어를 찾지 못했습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "심각한 오류 발생" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -470,58 +514,60 @@ msgstr "" "upgrade-apt.log 파일을 첨부하여 보고하십시오. 업그레이드가 중지되었습니다.\n" "원래의 sources.list는 /etc/apt/sources.list.distUpgrade에 저장되어 있습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "꾸러미 %s 개가 삭제될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "새로운 꾸러미가 %s 개 설치될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "꾸러미가 %s 개 업그레이드 될 것입니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "총 %s개의 꾸러미를 다운로드 합니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "업그레이드는 여러 시간이 걸릴 수 있고, 어떤 때에도 취소될 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "데이터 손실을 막으려면 열려있는 모든 프로그램과 문서를 닫으십시오." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "어떤 업그레이드 꾸러미도 찾을 수 없습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "이미 시스템이 업그레이드 되어 있습니다." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s 삭제</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s 설치" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s 업그레이드" @@ -541,7 +587,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -566,8 +612,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>업그레이드를 시작하시겠습니까?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">우분투 6.06 LTS로 업그레이드하는 중</" "span>" @@ -726,11 +772,16 @@ msgstr "%li 의 %li 파일 내려 받는 중, 속도 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "%li 의 %li 파일 내려 받는 중, 속도 알 수 없음" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "바뀐 목록을 아직 이용할 수 없습니다. 잠시 후에 다시 해주시기 바랍니다." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -738,11 +789,11 @@ msgstr "" "바뀐 목록을 다운로드하는데 실패했습니다. 인터넷 연결을 확인해 주십시오." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "설치할 수 없는 업데이트가 있습니다" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -752,61 +803,53 @@ msgstr "" "미 관리자의 \"모든 업그레이드 하기\" 기능을 사용하거나 터미널에서 \"sudo apt-" "get dist-upgrade\"를 실행하여 시스템을 완전하게 업데이트 하십시오." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "다음 업데이트는 무시됩니다:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "버전 %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "바뀐 목록을 다운로드 하는 중..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "다운로드 크기: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "시스템이 최신의 상태입니다." -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "%s 개의 업데이트를 설치할 수 있습니다." -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "세부 정보 숨기기" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "자세히 보기" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "잠시만 기다리십시오. 이 작업은 약간의 시간이 걸립니다." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "업데이트가 끝났습니다." -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "새 버전: %s (크기: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "더 이상 지원되지 않는 배포판입니다." -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -816,25 +859,17 @@ msgstr "" "그레이드 하십시오. 업그레이드에 대한 더 많은 정보는 http://www.ubuntu.com에" "서 보실 수 있습니다." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>새 배포판 '%s'를 이용할 수 있습니다</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "동시에 한 가지 소프트웨어 관리 도구만 실행할 수 있습니다." - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "'aptitude'나 '시냅틱'과 같은 다른 프로그램을 먼저 닫으십시오." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "소프트웨어 목록이 망가졌습니다." -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -843,7 +878,7 @@ msgstr "" "어떤 소프트웨어도 설치하거나 삭제할 수 없습니다. \"시냅틱\"이나 터미널에서 " "\"sudo apt-get install -f\"를 실행하여 이 문제를 먼저 해결하십시오." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -855,7 +890,7 @@ msgstr "" "현재 자동으로 업데이트를 확인하지 않습니다. \"시스템\" -> \"관리 도구\" -> " "\"Software Properties\"에서 설정할 수 있습니다." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -867,43 +902,47 @@ msgstr "" "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" "합니다." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>시스템을 최신으로 유지하십시오.</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "다운로드 취소(_D)" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "변경 사항" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "점검(_k)" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "새로운 업데이트를 위해 소프트웨어 채널을 확인합니다." -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "설명" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "릴리즈 정보" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "각 파일의 진행 상황 표시" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "소프트웨어 업데이트" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -911,101 +950,138 @@ msgstr "" "소프트웨어 업데이트는 에러를 고치고, 보안 문제를 제거하며 새로운 기능을 제공" "합니다." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "업그레이드(_p)" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "우분투 최신 버젼으로 업그레이드 합니다." -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "점검(_C)" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "앞으로 이 정보 숨김(_H)" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "업데이트를 설치(_I)" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>채널</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "변경 사항" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>인터넷 업데이트</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>키</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>인터넷 업데이트</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "CD롬 추가(_C)" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "인증" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "다운로드 받은 소프트웨어 파일 삭제(_e):" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "다운로드가 끝났습니다." + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "인터넷 업데이트" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "공식 우분투 서버의 보안 업데이트만 자동으로 설치됩니다." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "기본값 불러오기(_D)" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "배포판의 기본 키 불러오기" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "소프트웨어 설정" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "업데이트를 자동으로 확인(_C):" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "백그라운드에서 업데이트 다운로드하되, 설치는 하지 않음(_D)" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "키 가져오기(_I)" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "확인없이 보안 업데이트 설치(_I)" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1021,40 +1097,33 @@ msgstr "" "\n" "계속하기 위해서는 인터넷 연결이 필요합니다." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>채널</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>참고:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>구성요소:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>구성요소</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>배포판:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>종류:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>추가하고자 하는 채널의 APT 줄을 완전히 입력하십시오.</b></big>\n" @@ -1062,15 +1131,11 @@ msgstr "" "APT 줄은 다음 예와 같이 채널의 종류, 위치, 구성요소를 포함합니다. <i>\"deb " "http://ftp.debian.org sarge main\"</i>" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT 줄:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "채널 추가" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1078,23 +1143,19 @@ msgstr "" "바이너리\n" "소스" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "채널 편집" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "CD-ROM을 읽는 중" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "채널 추가(_A)" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "사용자 정의(_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "새로고침(_R)" @@ -1149,116 +1210,307 @@ msgid "The window size" msgstr "창 크기" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "소프트웨어 채널과 인터넷 업데이트를 설정합니다." -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "소프트웨어 설정" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "우분투 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "우분투 5.10 업데이트" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "우분투 6.06 LTS 보안 업데이트" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "우분투 6.06 LTS 업데이트" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "우분투 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "커뮤니티에서 관리유지함 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "자유소프트웨어 아님 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "자유소프트웨어 아님 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "우분투 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "우분투 5.10 보안 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "우분투 6.06 LTS 백포트" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "공식적으로 지원됨" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "저작권 제한됨" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "우분투 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "우분투 5.10 보안 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "우분투 5.10 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "우분투 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "우분투 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "우분투 5.10 보안 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "우분투 5.10 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "우분투 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "우분투 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "커뮤니티에서 관리유지함 (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "자유소프트웨어 아님 (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "공식적으로 지원됨" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "저작권 제한됨" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "우분투 5.10 보안 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "우분투 5.10 업데이트" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "우분투 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "데비안 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "데비안 3.1 \"Sarge\" 보안 업데이트" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "데비안 \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "데비안 \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG 호환이지만 자유소프트웨어가 아닌 의존성이 있는 소프트웨어" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "DFSG와 호환이 안되는 소프트웨어" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "우분투 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "세부 정보 숨기기" + +#~ msgid "Show details" +#~ msgstr "자세히 보기" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "동시에 한 가지 소프트웨어 관리 도구만 실행할 수 있습니다." + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "'aptitude'나 '시냅틱'과 같은 다른 프로그램을 먼저 닫으십시오." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>채널</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>키</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "CD롬 추가(_C)" + +#~ msgid "Installation Media" +#~ msgstr "설치 미디어" + +#~ msgid "Software Preferences" +#~ msgstr "소프트웨어 설정" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>채널</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>구성요소</b>" + +#~ msgid "Add Channel" +#~ msgstr "채널 추가" + +#~ msgid "Edit Channel" +#~ msgstr "채널 편집" + +#~ msgid "_Add Channel" +#~ msgstr "채널 추가(_A)" + +#~ msgid "_Custom" +#~ msgstr "사용자 정의(_C)" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "우분투 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "우분투 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "우분투 5.10 보안 업데이트" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "우분투 6.06 LTS 보안 업데이트" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "우분투 5.10 업데이트" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "우분투 6.06 LTS 업데이트" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "우분투 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "우분투 6.06 LTS 백포트" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n" "Language-Team: Kurdish <ku@li.org>\n" @@ -17,65 +17,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Rojane" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Her du roj" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Heftane" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Her du hefte" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Her %s roj" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Piştî hefteyekê" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Piştî du hefte" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Piştî mehekê" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Piştî %s roj" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -101,54 +144,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Nikarî '%s' saz bike" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +200,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +221,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +234,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +278,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +315,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Jê bibe" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +365,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Tê bilindkirin" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Bilindkirina sîstemê temam bû." @@ -406,72 +449,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket dê were rakirin." msgstr[1] "%s paket dê werin rakirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s paket dê were sazkirin" msgstr[1] "%s paket dê werin sazkirin" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket dê were bilindkirin." msgstr[1] "%s paket dê werin bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Pêwîst e tu bi tevahî %s daxî." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Sîstema xwe berê hat bilindkirin." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s rake</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s saz bike" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s bilind bike" @@ -490,7 +535,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -511,8 +556,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Dest bi bilindkirinê were kirin?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -661,116 +705,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Guhertoya %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Mezinahiya daxistinê: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Sîstema te rojane ye" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Tu dikarî %s rojanekirinê saz bikî" msgstr[1] "Tu dikarî %s rojanekirinan saz bikî" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Hûragahiyan veşêre" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Hûragahiyan nîşan bide" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Rojanekirin temam bû" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Guhertoya nû: %s (Mezinahî: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -778,7 +810,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -786,143 +818,182 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Daxistinê _betal bike" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Guhartin" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Daxuyanî" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanal</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Guhartin" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" -msgstr "" +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Daxistin hatiye temam kirin" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Taybetmendiyên Nivîsbariyê" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -932,74 +1003,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Şîrove:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Cure:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Rêzika APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1051,102 +1106,253 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Taybetmendiyên Nivîsbariyê" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 'Dapper Drake'" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Neazad (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Neazad (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Bi piştgirtiya fermî" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Neazad (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Bi piştgirtiya fermî" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid "Hide details" +#~ msgstr "Hûragahiyan veşêre" + +#~ msgid "Show details" +#~ msgstr "Hûragahiyan nîşan bide" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanal</b>" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-28 20:07+0000\n" "Last-Translator: Mantas Kriaučiūnas <mantas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -17,66 +17,110 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Kasdien" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Kas dvi dienas" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Kas savaitę" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Kas dvi savaites" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Kas %s dienas" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Po savaitės" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Po dviejų savaičių" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Po mėnesio" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Po %s dienų" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Diegiami atnaujinimai" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Programinės įrangos atnaujinimai" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importuoti raktą" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Importuojant pasirinktą failą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Pasirinktas failas gali būti sugadintas arba ne GPG rakto failas." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Jūsų pasirinkto rakto pašalinti nepavyko. Praneškite apie tai kaip klaidą." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Įveskite disko pavadinimą" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Įdėkite diską į įrenginį:" @@ -108,20 +152,20 @@ msgstr "" "programa. Prieš tęsdami pirmiausia sutaisykite juos naudodamiesi „synaptic“ " "arba „apt-get“." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Negalima atnaujinti reikiamų metapaketų" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Turėtų būti pašalintas esminis paketas" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nepavyko paskaičiuoti atnaujinimo" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +174,11 @@ msgstr "" "tai kaip klaidą. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Klaida autentikuojant keletą paketų" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -143,12 +187,12 @@ msgstr "" "Nepavyko patvirtinti kelių paketų autentiškumo. Tai gali būti laikina tinklo " "problema. Galite bandyti vėliau. Žemiau yra nepatvirtintų paketų sąrašas." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Negalima įdiegti „%s“" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -156,12 +200,12 @@ msgstr "" "Buvo neįmanoma įdiegti reikalingo paketo. Praneškite apie tai, kaip klaidą. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 #, fuzzy msgid "Can't guess meta-package" msgstr "Negalima nuspėti meta paketo" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,16 +219,16 @@ msgstr "" " Prieš tęsdami pirmiausia įdiekite vieną iš šių paketų naudodamiesi " "„synaptic“ arba „apt-get“." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Nuskaitoma talpykla" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 #, fuzzy msgid "No valid mirror found" msgstr "Nerasta tinkamo įrašo" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -197,11 +241,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Ar sukurti numatytųjų šaltinių sąrašą?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -210,11 +254,11 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Saugyklų informacija netinkama" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -222,11 +266,11 @@ msgstr "" "Saugyklos informacijos atnaujinimo rezultatas buvo sugadinta byla. " "Praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Trečiųjų šalių šaltiniai išjungti" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -236,11 +280,11 @@ msgstr "" "Juos galėsite vėl įjungti, kai baigsite atnaujinimą su „programų savybių“ " "įrankiu arba „Synaptic“ paketų tvarkykle." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Klaida atnaujinant" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -248,11 +292,11 @@ msgstr "" "Atnaujinant iškilo problema. Tai greičiausiai kokia nors tinklo problema, " "todėl iš naujo patikrinkite tinklo jungtis ir bandykite dar." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Diske nepakanka laisvos vietos" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -261,15 +305,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "At norite pradėti atnaujinimą?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Nepavyko įdiegti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 #, fuzzy msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " @@ -278,11 +322,11 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Jūsų sistema gali būti netinkama naudoti. " "Dabar bus vykdomas atkūrimas (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Nepavyko atsiųsti atnaujinimų" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -290,11 +334,11 @@ msgstr "" "Atnaujinimas dabar bus nutrauktas. Patikrinkite Interneto ryšį arba įdiegimo " "laikmeną ir bandykite dar. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Kai kuri programinė įranga nebėra oficialiai palaikoma" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -308,23 +352,23 @@ msgstr "" "Jei nesate įjungę „universe“ skyriaus, šie paketai bus siūlomi pašalinimui " "kitame žingsnyje. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Pašalinti pasenusius paketus?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Praleisti šį žingsnį" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "P_ašalinti" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -333,26 +377,26 @@ msgstr "" "pranešime. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Perkraunama sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Tikrinama paketų valdyklė" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Atnaujinama saugyklų informacija" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Netinkama paketo informacija" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -363,19 +407,19 @@ msgstr "" "paketo „%s“.\n" "Tai labai rimta problema, praneškite apie tai kaip klaidą." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Klausiama patvirtinimo" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Atnaujinama" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Ieškoma pasenusios programinės įrangos" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Sistemos atnaujinimas baigtas." @@ -449,11 +493,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Nerasta komanda „diff“" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Įvyko lemtinga klaida" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -465,7 +509,9 @@ msgstr "" "Jūsų originalioji „sources.list“ byla buvo išsaugota „/etc/apt/sources.list." "distUpgrade“ aplanke." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -473,7 +519,7 @@ msgstr[0] "Bus pašalintas %s paketas." msgstr[1] "Bus pašalinti %s paketai." msgstr[2] "Bus pašalinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -481,7 +527,7 @@ msgstr[0] "Bus įdiegtas %s naujas paketas." msgstr[1] "Bus įdiegti %s nauji paketai." msgstr[2] "Bus įdiegta %s naujų paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -489,43 +535,43 @@ msgstr[0] "Bus atnaujintas %s paketas." msgstr[1] "Bus atnaujinti %s paketai." msgstr[2] "Bus atnaujinta %s paketų." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Turite atsisiųsti viso %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Atnaujinimas gali užtrukti keletą valandų ir vėliau jo negalima atšaukti." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Norint išvengti duomenų praradimo turite užverti visas atvertas programas ir " "dokumentus." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nepavyko rasti jokių atnaujinimų" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Jūsų sistema jau buvo atnaujinta." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Pašalinti %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Įdiegti %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Atnaujinti %s" @@ -546,7 +592,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -573,8 +619,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Pradėti atnaujinimą?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Atnaujinama į Ubuntu 6.06 LTS</span>" @@ -733,22 +779,27 @@ msgstr "Atsiunčiamas failas %li iš %li, %s/s greičiu" msgid "Downloading file %li of %li with unknown speed" msgstr "Atsiunčiamas failas %li iš %li, nežinomu greičiu" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Pakeitimų sąrašas kol kas neprieinamas. Pabandykite vėliau." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "Nepavyko atsiųsti pakeitimų sąrašo. Patikrinkite Interneto ryšį." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Negalima įdiegti visų galimų atnaujinimų" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -759,30 +810,30 @@ msgstr "" "terminale įvykdykite komandą „sudo apt-get dist-upgrade“, kad Jūsų sistema " "būtų visiškai atnaujinta." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Šie atnaujinimai nebus įdiegti:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versija %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Atsiunčiamas pakeitimų sąrašas..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Atsiuntimo dydis: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Jūsų sistema atnaujinta" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -790,32 +841,24 @@ msgstr[0] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[1] "Rodyti ir įdiegti galimus atnaujinimus" msgstr[2] "Rodyti ir įdiegti galimus atnaujinimus" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Slėpti detales" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Rodyti detales" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Palaukite, tai gali užtrukti." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Atnaujinimas užbaigtas" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nauja versija: %s (Dydis: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Jūsų distribucija daugiau nebepalaikoma" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -825,25 +868,17 @@ msgstr "" "Atnaujinkite į naujausią „Ubuntu Linux“ versiją. Daugiau informacijos apie " "atnaujinimą rasite http://www.ubuntu.com ." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Tik viena programinės įrangos tvarkymo priemonė gali veikti vienu metu" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "Pirmiausia užverkite kitą programą, pvz., „aptitude“ ar „Synaptic“." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Programinės įrangos turinys sugadintas" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -853,7 +888,7 @@ msgstr "" "pasinaudokite „Synaptic“ arba terminale įvykdykite komandą „sudo apt-get " "install -f“, norėdami ištaisyti šią problemą." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 #, fuzzy msgid "" "<b><big>You must check for updates manually</big></b>\n" @@ -866,7 +901,7 @@ msgstr "" "Jūsų sistema automatiškai neieško atnaujinimų. Šią elgseną galite pakeisti " "naudodamiesi „Sistema“ -> „Administravimas“ -> „Programinės įrangos savybės“." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 #, fuzzy msgid "" "<big><b>Examining your system</b></big>\n" @@ -879,43 +914,47 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Atšaukti _atsiuntimą" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Pakeitimai" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Ti_krinti" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Patikrinti programų kanalus dėl atnaujinimų" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Aprašymas" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Leidimo aprašymas" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Rodyti pavienių failų progresą" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programinės įrangos atnaujinimai" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 #, fuzzy msgid "" "Software updates correct errors, eliminate security vulnerabilities and " @@ -924,63 +963,85 @@ msgstr "" "Programinės įrangos atnaujinimai gali ištaisyti klaidas, pašalinti saugumo " "spragas bei suteikti naujas funkcijas." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "At_naujinti" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atnaujinti iki naujausios Ubuntu versijos" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Patikrinti" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Nerodyti šios informacijos ateityje" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Į_diegti atnaujinimus" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanalai</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Pakeitimai" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internetiniai atnaujinimai</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Raktai</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internetiniai atnaujinimai</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Pridėti _CD" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentikacija" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Iš_trinti atsiųstus programinės įrangos failus:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Atsiųsta" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importuoti viešą raktą iš patikimo programinės įrangos tiekėjo" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Diegimo laikmenos" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internetiniai atnaujinimai" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 #, fuzzy msgid "" "Only security updates from the official Ubuntu servers will be installed " @@ -989,40 +1050,55 @@ msgstr "" "Tik saugumo atnaujinimai iš oficialių „Ubuntu“ serverių bus automatiškai " "įdiegti, todėl turi būti įdiegtas „unattended-upgrades“ programų paketas." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Atkurti _numatytuosius" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Atkurti _numatytuosius Jūsų distributyvui raktus" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Programinės įrangos nustatymai" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Programinės įrangos šaltiniai" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Ieškoti atnaujinimų automatiškai:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Atsiųsti atnaujinimus fone, tačiau jų neįdiegti" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Importuoti raktą" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "Į_diegti saugumo atnaujinimus neklausiant patvirtinimo" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1038,41 +1114,33 @@ msgstr "" "\n" "Tęsimui reikia veikiančio Interneto ryšio." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanalas</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentaras:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponentai:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponentai:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribucija:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipas:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Įveskite visą Jūsų norimo pridėti kanalo APT eilutę</b></big>\n" @@ -1080,15 +1148,11 @@ msgstr "" "APT eilutė nurodo saugyklos tipą, vietą bei kanalo skyrius, pvz., <i>„deb " "http://ftp.debian.org sarge main“</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT eilutė:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Pridėti kanalą" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1096,24 +1160,19 @@ msgstr "" "Dvejetainis\n" "Pradinis kodas" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Keisti kanalą" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Skanuojamas CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Pridėti kanalą" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Kita" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "Į_kelti iš naujo" @@ -1170,121 +1229,313 @@ msgid "The window size" msgstr "Lango dydis" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "" "Nustatykite programinės įrangos įdiegimo šaltinius bei atnaujinimus iš " "interneto" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Programinės įrangos šaltiniai" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 „Dapper Drake“" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Prižiūrima bendruomenės (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Ne Laisva (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Ne Laisva (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 „Dapper Drake“" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS saugumo atnaujinimai" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 saugumo atnaujinimai" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS atnaujinimai" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS atnaujinimai" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficialiai palaikoma" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Apribotos autorinės teisės" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 „Breezy Badger“" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 saugumo atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 „Breezy Badger“" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 saugumo atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 „Breezy Badger“" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Prižiūrima bendruomenės (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Ne Laisva (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Prižiūrima oficialiai" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Apribotos autorinės teisės" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 saugumo atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 atnaujinimai" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 atnaujinimai" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 „Sarge“" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 „Sarge“ saugumo atnaujinimai" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian „Etch“ (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://http.lt.debian.org/debian/" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian „Sid“ (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Su DFSG suderinama programinė įranga su Ne Laisvomis priklausomybėmis" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Su DFSG nesuderinama programinė įranga" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 „Dapper Drake“" +#~ msgid "Hide details" +#~ msgstr "Slėpti detales" + +#~ msgid "Show details" +#~ msgstr "Rodyti detales" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Tik viena programinės įrangos tvarkymo priemonė gali veikti vienu metu" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "Pirmiausia užverkite kitą programą, pvz., „aptitude“ ar „Synaptic“." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanalai</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Raktai</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Pridėti _CD" + +#~ msgid "Installation Media" +#~ msgstr "Diegimo laikmenos" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 „Breezy Badger“" +#~ msgid "Software Preferences" +#~ msgstr "Programinės įrangos nustatymai" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 saugumo atnaujinimai" +#~ msgid " " +#~ msgstr " " -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 atnaujinimai" +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanalas</b>" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 atnaujinimai" +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponentai:</b>" + +#~ msgid "Add Channel" +#~ msgstr "Pridėti kanalą" + +#~ msgid "Edit Channel" +#~ msgstr "Keisti kanalą" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Pridėti kanalą" + +#~ msgid "_Custom" +#~ msgstr "_Kita" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS saugumo atnaujinimai" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS atnaujinimai" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS atnaujinimai" #, fuzzy #~ msgid "" @@ -1297,12 +1548,6 @@ msgstr "Su DFSG nesuderinama programinė įranga" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Skyriai</b>" -#~ msgid "Oficially supported" -#~ msgstr "Prižiūrima oficialiai" - -#~ msgid "Installing updates" -#~ msgstr "Diegiami atnaujinimai" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Skyriai:</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Арангел Ангов <ufo@linux.net.mk>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -17,69 +17,115 @@ msgstr "" "Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Детали</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Инсталирам надградби..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Надградба на софтвер" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Изворен код" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Изворен код" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -105,20 +151,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -128,23 +174,23 @@ msgstr "" "како бубачка. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -154,11 +200,11 @@ msgstr "" "како бубачка. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -167,15 +213,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -188,12 +234,12 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 #, fuzzy msgid "Generate default sources?" msgstr "Врати ги стандардните клучеви" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -202,43 +248,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Грешка при отстранување на клучот" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -247,35 +293,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -284,50 +330,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Веќе работи друг менаџер за пакети" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -335,20 +381,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Надградбата е завршена" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -424,18 +470,20 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -443,7 +491,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -451,7 +499,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -459,40 +507,40 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -511,7 +559,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -532,8 +580,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -689,11 +736,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Достапна е нова верзија на Убунту!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -703,44 +755,44 @@ msgstr "" "врска е активна." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 #, fuzzy msgid "Cannot install all available updates" msgstr "Проверувам за надградби..." -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Верзија %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, fuzzy, python-format msgid "Download size: %s" msgstr "Преземам промени" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Вашиот систем е надграден!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -748,66 +800,49 @@ msgstr[0] "Инсталирам надградби..." msgstr[1] "Инсталирам надградби..." msgstr[2] "Инсталирам надградби..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Детали</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Вашата дистрибуција повеќе не е поддржана" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -815,7 +850,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -823,151 +858,191 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Промени" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Опис" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Надградба на софтвер" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Инсталирам надградби..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Копчиња</b>" +msgid "changes" +msgstr "Промени" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Надградби од интернет</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Копчиња</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>Надградби од интернет</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Проверка" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Преземам промени" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Надградби од интернет</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Врати стандардно" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Врати ги стандардните клучеви" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Софтверски преференци" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Софтверски својства" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Изворен код" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "Проверувај за надградби на секои" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -977,44 +1052,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Копчиња</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Компоненти</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Компоненти</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибуција:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Тип:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>Адреса:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Внесете ја комплетната линија за APT складиштето за да го додадете</" @@ -1024,15 +1089,11 @@ msgstr "" "пример <i>\"deb http://ftp.debian.org sarge main\"</i>. Во документацијата " "можете да најдете детален опис на синтаксата." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT линија:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1040,23 +1101,21 @@ msgstr "" "Бинарни\n" "Изворен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Изворен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Сопствено" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Изворен код" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Освежи" @@ -1109,137 +1168,303 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Софтверски својства" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Надградби за Убунту 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Безбедносни надградби за Убунту 5.04" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Надградби за Убунту 5.10" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Надградби за Убунту 5.04" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Оддржувано од заедницата (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Неслободно (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Неслободно (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Надградби за Убунту 5.10" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Надградби за Убунту 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Безбедносни надградби за Debian Stable" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официјално поддржано" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Безбедносни надградби за Убунту 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Надградби за Убунту 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Надградби за Убунту 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "Безбедносни надградби за Убунту 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "Надградби за Убунту 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Надградби за Убунту 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Оддржувано од заедницата (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Неслободно (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Официјално поддржано" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Restricted copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Безбедносни надградби за Убунту 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Надградби за Убунту 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Надградби за Убунту 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Безбедносни надградби за Debian Stable" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Надградби за Убунту 5.04" +#~ msgid "Hide details" +#~ msgstr "<b>Детали</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Копчиња</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Копчиња</b>" + +#~ msgid "Installation Media" +#~ msgstr "Медиум за инсталација" + +#~ msgid "Software Preferences" +#~ msgstr "Софтверски преференци" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Безбедносни надградби за Убунту 5.10" +#~ msgid " " +#~ msgstr " " -#~ msgid "Ubuntu 5.10 Updates" +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Копчиња</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Компоненти</b>" + +#~ msgid "_Custom" +#~ msgstr "_Сопствено" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Надградби за Убунту 5.10" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Безбедносни надградби за Убунту 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Надградби за Убунту 5.10" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>Оддели:</b>" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Надградби за Убунту 5.10" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Официјално поддржано" +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>Оддели:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Оддели:</b>" @@ -1405,33 +1630,9 @@ msgstr "" #~ msgid "You need to be root to run this program" #~ msgstr "Треба да сте root за да ја извршите оваа програма" -#~ msgid "Ubuntu 5.04 Security Updates" -#~ msgstr "Безбедносни надградби за Убунту 5.04" - -#~ msgid "Ubuntu 5.04 Updates" -#~ msgstr "Надградби за Убунту 5.04" - #~ msgid "Binary" #~ msgstr "Бинарни" -#~ msgid "Source" -#~ msgstr "Изворен код" - -#~ msgid "CD disk with Ubuntu 5.10 \"Breezy Badger\"" -#~ msgstr "CD диск со Убунту 5.10 \"Breezy Badger\"" - -#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "CD диск со Убунту 5.04 \"Hoary Hedgehog\"" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD диск со Убунту 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Безбедносни надградби за Убунту 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Надградби за Убунту 4.10" - #~ msgid "Contributed software" #~ msgstr "Додатен софтвер" @@ -1444,9 +1645,6 @@ msgstr "" #~ msgid "Debian 3.0 \"Woody\"" #~ msgstr "Debian 3.0 \"Woody\"" -#~ msgid "Debian Stable Security Updates" -#~ msgstr "Безбедносни надградби за Debian Stable" - #~ msgid "Debian Stable" #~ msgstr "Debian Stable" @@ -1543,9 +1741,6 @@ msgstr "" #~ "поправки и други технички надградби. Ве молам побарајте информации за " #~ "надградба на http://www.ubuntulinux.org." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Достапна е нова верзија на Убунту!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:41+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 13:49+0000\n" "Last-Translator: azlinux <azlinux@gmail.com>\n" "Language-Team: Malay <ms@li.org>\n" @@ -17,68 +17,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Harian" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Setiap dua hari" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Mingguan" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Setiap dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Setiap %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Selepas satu minggu" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Selepas dua minggu" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Selepas satu bulan" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Selepas %s hari" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Kekunci impot" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Ralat semasa mengimpot fail yang dipilih" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Fail yang dipilih mungkin bukan fail kekunci GPG atau fail mungkin rosak" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Ralat semasa mengeluarkan kekunci" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Kekunci yang anda pilih tidak dapat di keluarkan. Sila laporkan ini sebagai " "ralat pepijat." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -89,11 +132,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Sila masukkan nama untuk cakera padat" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Sila masukkan cakera padat kedalam pemacu" @@ -110,20 +153,20 @@ msgstr "" "menggunakan sofwer ini. Sila baiki dahulu menggunakan synaptic atau apt-get " "sebelum meneruskan." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Tidak dapat menaikkan taraf pakej-meta yang diperlukan" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Satu pakej yang perlu terpaksa dikeluarkan" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Tidak dapat menjangka penaikkan taraf" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -132,23 +175,23 @@ msgstr "" "penaikkan. Sila laporkan ini sebagai ralat pepijat. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Tidak dapat memasang '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -157,11 +200,11 @@ msgstr "" "pepijat. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Pakej meta tidak dapat diduga." -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,15 +218,15 @@ msgstr "" "Sila pasangkan salah satu pakej diatas dahulu menggunakan synaptic ataupun " "apt-get sebelum meneruskan pemasangan." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -196,11 +239,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -209,21 +252,21 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Sumber ketiga tidak diaktifkan." -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -234,11 +277,11 @@ msgstr "" "selepas penaikkan taraf menggunakan alatan 'software-properties' ataupun " "'synaptic'." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Ralat semasa pengemaskinian." -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -247,11 +290,11 @@ msgstr "" "yang berkaitan dengan masaalah rangkaian, sila periksa dan cuba lagi " "sambungan rangkaian anda." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Muatak cakera keras tidak mencukupi." -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -263,15 +306,15 @@ msgstr "" "pemasangan sebelum ini menggunakan 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Anda mahu mulakan penaikkan taraf?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Tidak dapat memasang pakej-pakej penaikkan taraf." -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -279,11 +322,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sistem anda mungkin tidak stabil. " "Sistem 'recovery' telah dijalankan (dpkg --configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Pakej-pakej penaikan taraf tidak dapat dicapai." -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -291,11 +334,11 @@ msgstr "" "Penaikkan taraf tidak dapat diteruskan. Sila semak sambungan 'internet' atau " "media pemasangan anda dan cuba lagi. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Sesetengah sofwer tidak ada sokongan/bantuan rasmi lagi." -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 #, fuzzy msgid "" "These installed packages are no longer officially supported, and are now " @@ -309,49 +352,49 @@ msgstr "" "Jika anda tidak megaktifkan 'universe', pakej-pakej ini akan dicadangkan " "untuk dikeluarkan di peringkat selanjutnya. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Keluarkan pakej-pakej yang sudah luput?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -359,19 +402,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -443,72 +486,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:451 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:457 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:467 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:470 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:477 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -527,7 +572,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -548,8 +593,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -698,116 +742,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -815,7 +847,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -823,143 +855,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -969,74 +1037,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1088,101 +1140,228 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 13:06+0000\n" "Last-Translator: Hans Petter Birkeland <hanspb@bluezone.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -17,66 +17,112 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Daglig" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Annenhver dag" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Ukentlig" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Hver andre uke" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Hver %s dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Etter en uke" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Etter to uker" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Etter en måned" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Etter %s dager" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Installerer oppdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Kilde" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Kilde" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importer nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Feil under importering av valgt fil" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Enten er valgt fil ikke en GPG-nøkkelfil, eller så er den kanskje skadet" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Kunne ikke fjerne nøkkelen" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nøkkelen du valgte kan ikke fjernes. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +133,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Vennligst oppgi et navn for platen" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Vennligst sett inn en plate i CD-spilleren:" @@ -108,20 +154,20 @@ msgstr "" "av dette programmet. Vennligst rett opp i dette ved å bruke Synaptic eller " "apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan ikke oppgradere nødvendige meta-pakker" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "En nødvendig pakke må fjernes" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunne ikke forberede oppgraderingen" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +176,11 @@ msgstr "" "rapporter dette som en feil. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Kunne ikke autentisere noen pakker" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -144,12 +190,12 @@ msgstr "" "nettverksproblem, så du bør prøve igjen senere. Se under for listen over " "pakker som ikke kunne autentiseres." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Kan ikke installere '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -157,11 +203,11 @@ msgstr "" "Kunne ikke installere en nødvendig pakke. Vennligst rapporter denne feilen. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Kan ikke gjette på meta-pakke" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,15 +221,15 @@ msgstr "" " Vennligst installer én av de nevnte pakkene først ved å bruke synaptic " "eller apt-get før du fortsetter." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Leser mellomlager" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Fant ikke noe gyldig speil" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -203,11 +249,11 @@ msgstr "" "Hvis du velger \"Nei\" vil oppgraderingen avbrytes." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Vil du opprette standardkilder?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -221,11 +267,11 @@ msgstr "" "Skal standard linjer for '%s' legges til? Hvis du velger 'Nei' vil " "oppdateringen avbrytes." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Ugyldig informasjon om arkiv" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -233,11 +279,11 @@ msgstr "" "Oppgradering av kanalinformasjon resulterte i en ugyldig fil. Vennligst " "rapporter dette som en feil." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Tredjepartskilder er deaktivert" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -247,11 +293,11 @@ msgstr "" "aktivere dem etter oppgraderingen ved hjelp av verktøyet 'Egenskaper for " "programvare' eller med Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Feil under oppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -260,11 +306,11 @@ msgstr "" "problem med nettverkstilkoblingen. Vennligst sjekk nettverkstilkoblingen din " "og prøv igjen." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Ikke nok ledig diskplass" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -276,15 +322,15 @@ msgstr "" "bruke 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Ønsker du å starte oppgraderingen?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Kunne ikke installere oppgraderingene" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -292,11 +338,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Systemet ditt kan være ubrukelig. En reperasjon " "ble forsøkt kjørt (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Kunne ikke laste ned alle oppgraderingene." -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -304,11 +350,11 @@ msgstr "" "Oppgraderingen avbrytes nå. Vennligst sjekk internet-tilkoblingen eller " "installasjonsmediet og prøv på nytt. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Noe programvare er ikke lenger offisielt støttet" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -322,23 +368,23 @@ msgstr "" "Hvis du ikke har 'universe' aktivert vil disse pakkene bli foreslått fjernet " "i neste steg. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Ønsker du å fjerne utdaterte pakker?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Hopp over dette punktet" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Fjern" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Feil ved commit" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -347,26 +393,26 @@ msgstr "" "informasjon. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Gjenoppretter systemets originale tilstand" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Sjekker pakkehåndterer" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Oppdaterer informasjon om arkivet" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Ugyldig pakkeinformasjon" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -377,19 +423,19 @@ msgstr "" "pakken '%s'.\n" "Dette indikerer en alvorlig feil, vennligst rapportér denne feilen." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Spør om bekreftelse" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Oppgraderer" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Søker etter utdatert programvare" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Systemoppgraderingen er fullført" @@ -463,11 +509,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandoen 'diff' ble ikke funnet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "En uopprettelig feil oppsto" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -477,64 +523,66 @@ msgstr "" "var/log/dist-upgrade-apt.log i din melding. Oppgraderingen avbrytes nå.\n" "Din orginale sources.list ble lagret i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pakke vil bli fjernet." msgstr[1] "%s pakker vil bli fjernet" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s pakke vil bli installert." msgstr[1] "%s pakker vil bli installert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakke vil bli oppgradert." msgstr[1] "%s pakker vil bli oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Du må laste ned totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Oppgraderingen kan ta flere timer og kan ikke avbrytes på noe senere " "tidspunkt." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "For å forhindre tap av data bør du lukke alle åpne programmer og dokumenter." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Kunne ikke finne noen oppgraderinger" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Systemet ditt er allerede oppgradert." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Fjern %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installér %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Oppgradér %s" @@ -555,7 +603,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -581,8 +629,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Vil du starte oppgraderingen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Oppgraderer til Ubuntu 6.06 LTS</span>" @@ -742,11 +790,16 @@ msgstr "Laster ned filen %li av %li med %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Laster ned fil %li av %li ved ukjent hastighet" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Listen over endringer er ikke tilgjengelig ennå. Prøv senere." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -755,11 +808,11 @@ msgstr "" "internettilkoblingen." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Kan ikke installere alle tilgjengelige oppdateringer." -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -770,62 +823,54 @@ msgstr "" "kjør kommandoen \"sudo apt-get dist-upgrade\" i en terminal for å oppgradere " "systemet fullstendig." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Følgende pakker vil ikke bli oppgradert:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Laster ned listen med endringer..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Nedlastingsstørrelse: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Systemet ditt er oppdatert!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installere %s oppdatering" msgstr[1] "Du kan installere %s oppdateringer" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Skjul detaljer" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Vis detaljer" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Vennligst vent, dette kan ta litt tid." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Oppdateringen er fullført" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Ny versjon: %s (Størrelse: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -835,27 +880,17 @@ msgstr "" "oppdateringer. Oppgradér til en nyere utgivelse av Ubuntu. Se http://www." "ubuntu.com for mer informasjon om oppgradering." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Ny versjon \"%s\" er tilgjengelig</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Du kan ikke bruke flere pakkebehandlingsprogrammer samtidig" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Vennligst lukk andre programmer som f.eks \"aptitude\" eller \"Synaptic\" " -"først." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Programvareoversikten er ødelagt." -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -865,7 +900,7 @@ msgstr "" "pakkehåndteringsprogrammet \"Synaptic\" eller kjør kommandoen \"sudo apt-get " "install -f\" i en terminal for å løse denne situasjonen." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -877,7 +912,7 @@ msgstr "" "Systemet ditt sjekker ikke for oppdateringer automatisk. Du kan endre dette " "under \"System\" -> \"Administrasjon\" -> \"Egenskaper for programvare\"" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -889,43 +924,47 @@ msgstr "" "Programvareoppdateringer reparerer feil, eliminerer sikkerhetsproblemer og " "gir deg ny funksjonalitet." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Hold systemet ditt oppdatert</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Avbryt ne_dlasting" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Endringer" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Sjek_k" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Sjekk programvarekanalene for nye oppdateringer" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Beskrivelse" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Utgivelsesinformasjon" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Vis fremdrift for enkeltfiler" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -933,63 +972,85 @@ msgstr "" "Programvareoppdateringer fikser feil, fjerner sikkerhetshull og tilbyr ny " "funksjonalitet." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "O_ppgrader" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Oppgrader til siste versjon av Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "Sjekk" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Skjul denne informasjonen i fremtiden" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installerer oppdateringer" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanaler</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Endringer" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Oppdateringer fra Internett</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Taster</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Legg til _cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Oppdateringer fra Internett</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentisering" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Sl_ett nedlastede filer:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Nedlastingen er fullført" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importer den offentlige nøkkelen fra en tiltrodd programvareutgiver" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installasjonsmedia" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Oppdateringer fra Internett" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -997,39 +1058,55 @@ msgstr "" "Kun sikkerhetsoppdateringer fra de offisielle Ubuntu-tjenerne vil bli " "installert automatisk." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Gjenopprett stan_dardverdier" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Gjenopprett standardnøkler for din distribusjon" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Brukervalg for programvare" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Egenskaper for programvare" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Kilde" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Se etter oppdateringer automatisk:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Last ned oppdateringer i bakgrunnen, men ikke installér dem" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importer fil med nøkler" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Installer sikkerhetsoppdateringer uten bekreftelse" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1045,40 +1122,33 @@ msgstr "" "\n" "Du trenger en fungerende internettilkobling for å kunne fortsette." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponenter:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponenter</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribusjon:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Skriv inn hele APT-linjen for kanalen du vil legge til</b> </big>\n" @@ -1086,15 +1156,11 @@ msgstr "" "APT-linjen inneholder typen, adressen og innholdet til en kanal, for " "eksempel <i>«deb http://ftp.debian.org sarge main»</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-linje:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Legg til kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1102,24 +1168,21 @@ msgstr "" "Binær\n" "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Endre kanal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Søker gjennom CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "Legg til k_anal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Tilpasset" +msgid "_Add Source" +msgstr "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Last på nytt" @@ -1177,119 +1240,313 @@ msgid "The window size" msgstr "Vindusstørrelsen" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Sett opp programvarekanaler og oppdateringer" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Egenskaper for programvare" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Oppdateringer" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Sikkerhetsoppdateringer for Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +#, fuzzy +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Oppdateringer for Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Vedlikeholdt av miljøet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Backports for Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Offisielt støttet" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Begrenset opphavsrett" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Oppdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Oppdateringer" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Offisielt støttet" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Begrenset opphavsrett" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" sikkerhetsoppdateringer" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatiblel programvare med Non-Free avhengigheter" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Ikke-DFSG-kompatibel programvare" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Skjul detaljer" + +#~ msgid "Show details" +#~ msgstr "Vis detaljer" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Du kan ikke bruke flere pakkebehandlingsprogrammer samtidig" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Vennligst lukk andre programmer som f.eks \"aptitude\" eller \"Synaptic\" " +#~ "først." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanaler</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Taster</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Legg til _cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Installasjonsmedia" + +#~ msgid "Software Preferences" +#~ msgstr "Brukervalg for programvare" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenter</b>" + +#~ msgid "Add Channel" +#~ msgstr "Legg til kanal" + +#~ msgid "Edit Channel" +#~ msgstr "Endre kanal" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "Legg til k_anal" + +#~ msgid "_Custom" +#~ msgstr "_Tilpasset" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Sikkerhetsoppdateringer" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Sikkerhetsoppdateringer for Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Oppdateringer" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Oppdateringer for Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Backports for Ubuntu 6.06 LTS" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1311,12 +1568,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Seksjoner</b>" -#~ msgid "Oficially supported" -#~ msgstr "Offisielt støttet" - -#~ msgid "Installing updates" -#~ msgstr "Installerer oppdateringer" - #~ msgid "Check for available updates" #~ msgstr "Sjekker for tilgjengelige oppdateringer" @@ -1327,10 +1578,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "Reload the latest information about updates" #~ msgstr "Oppdater pakkeinformasjonen fra tjeneren." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Programvareoppdateringer" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1344,10 +1591,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ 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" @@ -1476,18 +1719,6 @@ msgstr "Ikke-DFSG-kompatibel programvare" #~ msgid "Binary" #~ msgstr "Binær" -#~ msgid "Source" -#~ msgstr "Kilde" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD med Ubuntu 4.10 «Warty Warthog»" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Security Updates" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 Updates" - #~ msgid "Contributed software" #~ msgstr "Bidratt programvare" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:43+0000\n" "Last-Translator: Jaydeep Bhusal <zaydeep@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -18,66 +18,112 @@ msgstr "" "X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2;plural=(n!=0)\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>विवरणहरु</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "सफ्टवेयर अद्यावधिकहरु" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "स्रोत" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "स्रोत" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -85,11 +131,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -103,20 +149,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -124,23 +170,23 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -148,11 +194,11 @@ msgid "" msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -161,15 +207,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -182,11 +228,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -195,43 +241,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -240,35 +286,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -277,50 +323,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "अर्को प्याकेज व्यवस्थापक चलिरेको छ" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -328,20 +374,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "स्तरवृद्धि समाप्त" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -415,73 +461,75 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, fuzzy msgid "Your system has already been upgraded." msgstr "तपाईंको प्रणालीमा टुटेका प्याकेजहरु छन!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -500,7 +548,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -521,8 +569,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -676,11 +723,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -688,110 +740,93 @@ msgid "" msgstr "परिवर्तनहरु डाउनलोड गर्न असफल. यदि सक्रिय इन्टरनेट जडान छ भने जाँच्नुहोस" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 #, fuzzy msgid "The following updates will be skipped:" msgstr "निम्न प्याकेजहरु स्तरवृद्धि गरिएको छैन" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "संस्करण %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, fuzzy, python-format msgid "Download size: %s" msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "तपाइं को प्रणालि अप-टु-डेट छ!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "स्तरवृद्धिहरु स्थापना गर्दै" msgstr[1] "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>विवरणहरु</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "तपाईंको वितरण समर्थित छैन" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -799,7 +834,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -807,155 +842,192 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "परिवर्तनहरु" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "बर्णन" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "सफ्टवेयर अद्यावधिकहरु" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>विवरणहरु</b>" +msgid "changes" +msgstr "परिवर्तनहरु" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>" -#: ../data/SoftwareProperties.glade.h:3 -#, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>विवरणहरु</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "Add _Cdrom" -msgstr "सिडि थप्नुहोस" +msgid "<b>Internet updates</b>" +msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 #, fuzzy msgid "Authentication" msgstr "प्रमाणिकरण" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 #, fuzzy -msgid "Import the public key from a trusted software provider" -msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस" +msgid "Download from:" +msgstr "परिवर्तनहरु डाउनलोड गर्दै" -#: ../data/SoftwareProperties.glade.h:8 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy -msgid "Installation Media" -msgstr "स्तरवृद्धिहरु स्थापना गर्दै" +msgid "Import the public key from a trusted software provider" +msgstr "विश्वास गरिएको कुञ्जिरिंग बाट चयन गरिएको कुञ्जि हटाउनुहोस" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>इन्टरनेट अद्यावधिकहरु</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "सफ्टवेयर प्राथमिकताहरु" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "सफ्टवेयर गुणहरु" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "स्रोत" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -965,44 +1037,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>विवरणहरु</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>टिप्पणि:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>तत्वहरु</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>तत्वहरु</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>वितरण:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>प्रकार:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>युआरएल:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>तपाईंले थप्न चाहेको कोषको पुर्ण एपिटि हरफ प्रविष्ट गर्नुहोस</b></big>\n" @@ -1011,15 +1073,11 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. तपाईंले मिसिलिकरण मा वाक्य संरचनाको एउटा " "विस्तृत विवरण पाउन सक्नुहुन्छ" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "एपिटि हरफ:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1027,23 +1085,21 @@ msgstr "" "बाइनरी\n" "स्रोत" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "स्रोत" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "अनुकुलन गर्नुहोस" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "स्रोत" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "फेरि लोड गर्नुहोस" @@ -1096,127 +1152,304 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "सफ्टवेयर गुणहरु" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "नन-फ्री (बहुभर्स)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "नन-फ्री (बहुभर्स)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "कार्यालय बाट समर्थित" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "निषेधित प्रतिलिपि अधिकार" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "समुदाय सम्हालिएको (ब्रह्माण्ड)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "नन-फ्री (बहुभर्स)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "कार्यालय बाट समर्थित" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "निषेधित प्रतिलिपि अधिकार" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "डेबियन अचल सुरक्षा अद्यावधिकहरु" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#~ msgid "Hide details" +#~ msgstr "<b>विवरणहरु</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>विवरणहरु</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>विवरणहरु</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" +#~ msgid "Add _Cdrom" +#~ msgstr "सिडि थप्नुहोस" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Installation Media" +#~ msgstr "स्तरवृद्धिहरु स्थापना गर्दै" + +#~ msgid "Software Preferences" +#~ msgstr "सफ्टवेयर प्राथमिकताहरु" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>विवरणहरु</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>तत्वहरु</b>" + +#~ msgid "_Custom" +#~ msgstr "अनुकुलन गर्नुहोस" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" + +#~ msgid "Ubuntu 6.06 LTS Backports" #~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" #~ msgid "Repositories changed" @@ -1237,10 +1470,6 @@ msgstr "" #~ msgid "<b>Sections</b>" #~ msgstr "<b>सेक्सनहरु:</b>" -#, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "कार्यालय बाट समर्थित" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>सेक्सनहरु:</b>" @@ -1248,10 +1477,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "सर्भर बाट प्याकेज जानकारी फेरि लोड गर्नुहोस" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "सफ्टवेयर अद्यावधिकहरु" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1265,10 +1490,6 @@ msgstr "" #~ msgstr "उपलब्ध अद्यावधिकहरु देखाउनुहोस र कुन स्थापना गर्ने रोज्नुहोस" #, fuzzy -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "युबन्टु ५.०४ सुरक्षा अद्यावधिकहरु" - -#, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "कुञ्जि हटाउँदा त्रुटि" @@ -1387,16 +1608,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "बाईनरी" -#~ msgid "Source" -#~ msgstr "स्रोत" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "युबन्टु ४.१० सुरक्षा अद्यावधिकहरु" - -#, fuzzy -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "युबन्टु ५.०४ अद्यावधिकहरु" - #~ msgid "Contributed software" #~ msgstr "योगदान गरिएको सफ्टवेयर" @@ -1460,9 +1671,6 @@ msgstr "" #~ "सुरक्षा स्थिरहरु वा अन्य सूक्ष्म स्तरवृद्धिहरु प्राप्त गर्नेछैन. कृपया स्तरवृद्धि जानकारी को " #~ "लागि http://www.ubuntulinux.org हेर्नुहोस" -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "युबन्टुको एउटा नयाँ विमोचन उपलब्ध छ!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 01:32+0000\n" "Last-Translator: Tino Meinen <a.t.meinen@chello.nl>\n" "Language-Team: Nederlands <vertaling@vrijschrift.org>\n" @@ -16,69 +16,113 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Dagelijks" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Elke twee dagen" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Wekelijks" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Elke twee weken" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Elke %s dagen" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Na één week" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Na twee weken" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Na één maand" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Na %s dagen" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Up_dates installeren" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Software-updates" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Sleutel importeren" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Fout bij het importeren van het geselecteerde bestand." -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Het geselecteerde bestand is misschien geen GPG-sleutel, of het kan " "beschadigd zijn." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Fout bij het verwijderen van de sleutel" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "De door u geselecteerde sleutel kon niet verwijderd worden. Gelieve dit als " "fout te melden." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -89,11 +133,11 @@ msgstr "" "↵\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Geef het cd-schijfje een naam" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Plaats een schijf in de speler:" @@ -110,20 +154,20 @@ msgstr "" "met deze software. Repareer deze eerst met synaptic of apt-get voordat u " "verder gaat." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan de vereiste meta-pakketten niet upgraden." -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Een essentieel pakket zou verwijderd worden" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kan de vereisten voor de upgrade niet berekenen" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -132,11 +176,11 @@ msgstr "" "Gelieve dit als fout te rapporteren. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Fout bij het bepalen van de echtheid van sommige pakketten" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -147,12 +191,12 @@ msgstr "" "proberen. Hieronder vindt u een lijst met pakketten waarvan de echtheid niet " "vastgesteld is." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Kan '%s' niet installeren" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -161,11 +205,11 @@ msgstr "" "fout te rapporteren. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Kan het meta-pakket niet raden" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -180,15 +224,15 @@ msgstr "" "Installeer eerst één van de bovenstaande pakketten met Synaptic of apt-get " "voordat u verder gaat." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Tijdelijke opslag inlezen" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Geen geldige mirror-server gevonden" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -209,11 +253,11 @@ msgstr "" "Wanneer u 'Nee' kiest, zal de update worden geannuleerd." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "De standaard bronnenlijst genereren?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -227,11 +271,11 @@ msgstr "" "Moeten de standaardregels voor '%s' worden toegevoegd? Wanneer u 'Nee' " "kiest, zal de update worden geannuleerd." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "De informatie over de pakketbronnen is ongeldig" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -239,11 +283,11 @@ msgstr "" "Het upgraden van de informatie over de pakketbronnen heeft het bestand " "ongeldig gemaakt. Rapporteer dit als een fout." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Pakketbronnen van derden uitgeschakeld" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -253,11 +297,11 @@ msgstr "" "kunt ze na de upgrade weer inschakelen via het menu Systeem -> Beheer -> " "Software-eigenschappen of met het programma Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Fout tijdens het updaten" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -265,11 +309,11 @@ msgstr "" "Tijdens het updaten is er iets misgegaan. Dit komt meestal door " "netwerkproblemen. Controleer uw netwerkverbinding en probeer opnieuw." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Niet genoeg vrije schijfruimte" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -281,15 +325,15 @@ msgstr "" "vorige installaties via 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Wilt u beginnen met de upgrade?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Kon de upgrades niet installeren" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -298,11 +342,11 @@ msgstr "" "onbruikbare toestand. Er is een hersteloperatie uitgevoerd (dpkg --configure " "-a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Kon de upgrades niet downloaden" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -310,11 +354,11 @@ msgstr "" "De upgrade wordt nu afgebroken. Controleer uw internetverbinding of het " "installatiemedium en probeer opnieuw. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Bepaalde software wordt niet meer officieel ondersteund" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -328,23 +372,23 @@ msgstr "" "Indien 'universe' niet geactiveerd is zal bij de volgende stap gevraagd " "worden om deze pakketten te verwijderen. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Overbodige pakketten verwijderen?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Deze stap overslaan" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Verwijderen" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Fout bij het toepassen" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -353,26 +397,26 @@ msgstr "" "voor meer informatie. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "De oorspronkelijke toestand wordt hersteld" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Pakkettenbeheer controleren" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Updaten van de informatie over de pakketbronnen" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Ongeldige pakketinformatie" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -383,19 +427,19 @@ msgstr "" "meer gevonden worden.\n" "Dit is een ernstige fout, die gerapporteerd moet worden." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Vragen om bevestiging" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Bezig met upgraden" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Zoeken naar overbodige software" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Systeemupgrade is voltooid." @@ -469,11 +513,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "De opdracht 'diff' is niet gevonden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Er is een ernstige fout ontstaan" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -485,65 +529,67 @@ msgstr "" "Uw oorspronkelijke sources.list is opgeslagen in /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "Er zal %s pakket verwijderd worden." msgstr[1] "Er zullen %s pakketten verwijderd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "Er zal %s nieuw pakket geïnstalleerd worden." msgstr[1] "Er zullen %s nieuwe pakketten geïnstalleerd worden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pakket zal een upgrade krijgen" msgstr[1] "%s pakketten zullen een upgrade krijgen." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "U moet in totaal %s downloaden." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Het upgraden kan enkele uren in beslag nemen en kan tussentijds niet worden " "afgebroken." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Sluit alle openstaande toepassingen en documenten om dataverlies te " "voorkomen." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Kon geen upgrades vinden" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Uw systeem heeft al een upgrade gekregen" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>%s verwijderen</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s installeren" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s upgraden" @@ -563,7 +609,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -588,8 +634,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Upgrade starten?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Bezig met upgraden naar Ubuntu 6.06 " "LTS</span>" @@ -749,13 +795,20 @@ msgstr "Downloaden van bestand %li uit %li met %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Downloaden van bestand %li uit %li, snelheid onbekend" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " +"Probeer het later nog eens." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "Een overzicht van de wijzigingen in dit pakket is nog niet beschikbaar. " "Probeer het later nog eens." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -764,11 +817,11 @@ msgstr "" "internetverbinding." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Kan de beschikbare updates niet installeren" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -779,62 +832,54 @@ msgstr "" "\"Synaptic\" of gebruik: \"sudo apt-get dist-upgrade\" in een " "terminalvenster om uw systeem compleet bij te werken met de laatste updates." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "De volgende updates worden overgeslagen:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versie %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Het overzicht van de wijzigingen wordt gedownload..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Downloadgrootte: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Uw systeem is up-to-date" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "U kunt %s update installeren" msgstr[1] "U kunt %s updates installeren" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Details verbergen" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Details tonen" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Een ogenblik geduld, dit kan even duren." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "De update is voltooid" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nieuwe versie: %s (Grootte: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Uw distributie wordt niet langer ondersteund" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -844,25 +889,17 @@ msgstr "" "upgrade uit naar een nieuwere versie van Ubuntu Linux. Zie http://www.ubuntu." "com voor meer informatie over upgraden." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Er kan maar één softwarebeheerprogramma tegelijk actief zijn" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "Sluit eerst het andere programma, bijvoorbeeld 'aptitude' of Synaptic." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Software-index is beschadigd" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -872,7 +909,7 @@ msgstr "" "Gebruik het pakkettenbeheerprogramma \"Synaptic\" of gebruik \"sudo apt-get " "install -f\" in een terminalvenster om eerst dit probleem te verhelpen." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -884,7 +921,7 @@ msgstr "" "Uw systeem controleert niet automatisch of er updates zijn. U kunt dit " "configureren in \"Systeem\" -> \"Beheer\" -> \"Software-eigenschappen\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -896,43 +933,47 @@ msgstr "" "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " "nieuwe mogelijkheden." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Houd uw systeem up-to-date</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Download _annuleren" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Wijzigingen" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Controleren" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Controleer de softwarekanalen op nieuwe updates" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Omschrijving" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Versie-informatie" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Voortgang tonen van individuele pakketten" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Software-updates" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -940,63 +981,85 @@ msgstr "" "Software-updates repareren fouten, verhelpen veiligheidsproblemen en leveren " "nieuwe mogelijkheden." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "U_pgraden" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Upgrade naar de nieuwste versie van Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Controleren" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Deze informatie in het vervolg niet meer tonen" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Up_dates installeren" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanalen</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Wijzigingen" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet-updates</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Sleutels</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet-updates</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "_CD-rom toevoegen" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Echtheidscontrole" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Gedownloade softwarebestanden _verwijderen:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Downloaden is voltooid" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importeer de publieke sleutel van een vertrouwde softwareleverancier" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installatiemedium" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet-updates" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1004,39 +1067,54 @@ msgstr "" "Alleen veiligheidsupdates van de officiële Ubuntu servers zullen automatisch " "geïnstalleerd worden" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_Standaarden herstellen" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Herstel de standaard sleutels van uw distributie" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Software-eigenschappen" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Automatisch controleren op aanwezigheid van updates:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "Up_dates wel in de achtergrond downloaden, maar niet installeren" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Sleutel i_mporteren" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Veiligheids-updates zonder te vragen installeren" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1052,40 +1130,33 @@ msgstr "" "\n" "U heeft een internetverbinding nodig om door te gaan." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanaal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Bijschrift:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componenten:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componenten</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distributie:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Voer de volledige APT-regel in van het kanaal dat u wilt toevoegen</" @@ -1094,15 +1165,11 @@ msgstr "" "De APT-regel bevat het type, de locatie en de componenten van een kanaal, " "bijvoorbeeld: <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-regel:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Kanaal toevoegen" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1110,24 +1177,19 @@ msgstr "" "Binair\n" "Bron" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Kanaal bewerken" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "De cd-rom wordt geanalyseerd" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Kanaal toevoegen" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Aangepast" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "He_rladen" @@ -1186,118 +1248,311 @@ msgid "The window size" msgstr "De venstergrootte" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Software-kanalen en internet-updates configureren" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software-eigenschappen" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Door de gemeenschap beheerd (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Niet-vrij (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Niet-vrij (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" -"Ubuntu 6.06 LTS\r\n" -"Ubuntu 6.06 updates" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS veiligheidsupdates" +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS updates" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 veiligheidsupdates" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS backports" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Officieel ondersteund" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Beperkte auteursrechten" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 veiligheidsupdates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 veiligheidsupdates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Door de gemeenschap beheerd (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Niet-vrij (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Officieel ondersteund" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Beperkte auteursrechten" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 veiligheidsupdates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" veiligheidsupdates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (onstabiel)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Software compatibel met DFSG, maar met niet-vrije afhankelijkheden" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software niet compatibel met DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Details verbergen" + +#~ msgid "Show details" +#~ msgstr "Details tonen" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Er kan maar één softwarebeheerprogramma tegelijk actief zijn" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Sluit eerst het andere programma, bijvoorbeeld 'aptitude' of Synaptic." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanalen</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Sleutels</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "_CD-rom toevoegen" + +#~ msgid "Installation Media" +#~ msgstr "Installatiemedium" + +#~ msgid "Software Preferences" +#~ msgstr "Software-eigenschappen" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanaal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componenten</b>" + +#~ msgid "Add Channel" +#~ msgstr "Kanaal toevoegen" + +#~ msgid "Edit Channel" +#~ msgstr "Kanaal bewerken" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Kanaal toevoegen" + +#~ msgid "_Custom" +#~ msgstr "_Aangepast" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "" +#~ "Ubuntu 6.06 LTS\r\n" +#~ "Ubuntu 6.06 updates" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 veiligheidsupdates" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS veiligheidsupdates" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 updates" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS updates" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS backports" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola <terance@lyse.net>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n" @@ -17,67 +17,113 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Detaljer</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Installerer oppdateringer..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Programvareoppdateringer" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Kilde" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Kilde" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -85,11 +131,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -103,20 +149,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -125,23 +171,23 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -150,11 +196,11 @@ msgstr "" "Nøkkelen du valgte kan ikke bli fjernet. Vennligst rapporter denne feilen." #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -163,15 +209,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -184,11 +230,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -197,43 +243,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Feil under fjerning av nøkkel" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -242,35 +288,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -279,50 +325,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "En annen pakkehåndterer kjører" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -330,21 +376,21 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 #, fuzzy msgid "Asking for confirmation" msgstr "Undersøker systemkonfigurasjon" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Oppgradering fullført" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -419,73 +465,75 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, fuzzy msgid "Your system has already been upgraded." msgstr "Systemet har ødelagte pakker!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Detaljer</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy, python-format msgid "Install %s" msgstr "_Installer" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Oppgradering fullført" @@ -504,7 +552,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -525,8 +573,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -682,11 +729,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -694,110 +746,93 @@ msgid "" msgstr "Feil under nedlasting av endringer. Sjekk tilkoblingen til internett." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 #, fuzzy msgid "The following updates will be skipped:" msgstr "De følgende pakkene er ikke oppgradert:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versjon %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, fuzzy, python-format msgid "Download size: %s" msgstr "Laster ned endringer" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Systemet er helt oppdatert!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Installerer oppdateringer..." msgstr[1] "Installerer oppdateringer..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Detaljer</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Din distribusjon er ikke lenger støttet" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -805,7 +840,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -813,154 +848,191 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Endringer" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Beskrivelse" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programvareoppdateringer" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Installerer oppdateringer..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Detaljer</b>" +msgid "changes" +msgstr "Endringer" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Oppdateringer fra Internett</b>" -#: ../data/SoftwareProperties.glade.h:3 -#, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>Detaljer</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "Add _Cdrom" -msgstr "Legg til _CD" +msgid "<b>Internet updates</b>" +msgstr "<b>Oppdateringer fra Internett</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentisering" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 #, fuzzy -msgid "Import the public key from a trusted software provider" -msgstr "Fjern den valgte nøkkelen fra den sikre nøkkelringen." +msgid "Download from:" +msgstr "Laster ned endringer" -#: ../data/SoftwareProperties.glade.h:8 +#: ../data/glade/SoftwareProperties.glade.h:12 #, fuzzy -msgid "Installation Media" -msgstr "Installerer oppdateringer..." +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:9 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Oppdateringer fra Internett</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, 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/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Egenskaper for programvare" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Kilde" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -970,44 +1042,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Detaljer</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Komponenter</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Komponenter</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribusjon:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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" @@ -1016,15 +1078,11 @@ msgstr "" "eksempel <i>«deb http://ftp.debian.org sarge main»</i>. Du kan finne en " "detaljert beskrivelse av syntaksen i dokumentasjonen." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-linje:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1032,23 +1090,21 @@ msgstr "" "Binær\n" "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Tilpasset" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Kilde" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Oppdater" @@ -1101,129 +1157,304 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Egenskaper for programvare" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 Updates" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 5.04 Security Updates" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 5.10 Updates" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 Updates" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Vedlikeholdt av miljøet (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Non-free (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 5.10 Updates" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD med Ubuntu 5.10 «Breezy Badger»" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Offisielt støttet" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Begrenset opphavsrett" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD med Ubuntu 5.10 «Breezy Badger»" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD med Ubuntu 5.04 «Hoary Hedgedog»" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Vedlikeholdt av miljøet (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Non-free (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD med Ubuntu 4.10 «Warty Warthog»" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Offisielt støttet" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Begrenset opphavsrett" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Updates" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 «Sarge»" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian Stable Security Updates" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian Testing" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (Unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 5.04 Updates" +#~ msgid "Hide details" +#~ msgstr "<b>Detaljer</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "CD med Ubuntu 5.10 «Breezy Badger»" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Detaljer</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Security Updates" +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Detaljer</b>" -#~ msgid "Ubuntu 5.10 Updates" +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "Legg til _CD" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "Installerer oppdateringer..." + +#~ msgid "Software Preferences" +#~ msgstr "Brukervalg for programvare" + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Detaljer</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenter</b>" + +#~ msgid "_Custom" +#~ msgstr "_Tilpasset" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 5.10 Updates" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 5.04 Security Updates" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Ubuntu 5.10 Updates" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" #~ msgstr "Ubuntu 5.10 Updates" #~ msgid "Repositories changed" @@ -1245,20 +1476,12 @@ msgstr "" #~ msgstr "<b>Seksjoner:</b>" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Offisielt støttet" - -#, fuzzy #~ msgid "Reload the latest information about updates" #~ msgstr "Oppdater pakkeinformasjonen fra tjeneren." #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Seksjoner:</b>" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Programvareoppdateringer" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1272,10 +1495,6 @@ msgstr "" #~ 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" @@ -1404,18 +1623,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Binær" -#~ msgid "Source" -#~ msgstr "Kilde" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD med Ubuntu 4.10 «Warty Warthog»" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Security Updates" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 Updates" - #~ msgid "Contributed software" #~ msgstr "Bidratt programvare" @@ -1504,9 +1711,6 @@ msgstr "" #~ "ikke sikkerhetsoppdateringer eller andre kritiske oppdateringer lenger. " #~ "Se http://www.ubuntulinux.org for informasjon om oppgradering." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Det er en ny versjon av Ubuntu tilgjengelig!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-29 08:11+0000\n" "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannick.marchegay@lokanova." "com>\n" @@ -18,68 +18,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Cada jorn" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Cada dos jorns" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Cada setmana" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Cada dos setmanas" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Cada %s jorns" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Après una setmana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Après dos setmanas" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Après un mes" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Après %s jorns" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importar clau" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Error al moment d'importar lo fichièr seleccionat" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Lo fichièr seleccionat es benlèj pas una clau GPG o es possible que siá " "corrumput." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Error al moment de suprimir la clau" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Avem pas poscut suprimir la clau qu'avètz seleccionada. Raportatz l'anomalia." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -90,11 +133,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Picatz un nom pel disc" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Metètz un disc dins lo legidor :" @@ -108,54 +151,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossible calcular la mesa a jorn" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Impossible installar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -164,15 +207,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -185,11 +228,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -198,42 +241,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Error al moment de metre a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Pas pro d'espaci liure" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -242,35 +285,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Volètz començar la mesa a jorn ?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Impossible installar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Impossible descargar las mesas a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -279,49 +322,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Suprimir" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -329,19 +372,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Mesa a jorn" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "La mesa a jorn del sistèma es acabada." @@ -413,72 +456,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Debètz telecargar un total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Suprimir %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Metre a jorn %s" @@ -497,7 +542,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -518,8 +563,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -668,116 +712,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s : \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Talha de la descarga : %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Podètz installar %s mesa a jorn" msgstr[1] "Podètz installar %s mesas a jorn" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -785,7 +817,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -793,143 +825,182 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Cambis" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descripcion" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Cambis" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Mesas a jorn per internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Claus</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Apondre un CD-ROM" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Mesas a jorn per internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" -msgstr "" +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Talha de la descarga : %s" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -939,74 +1010,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentari :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Components</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribucion :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipe :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Linha APT :" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Examèn del CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalisar" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1058,104 +1113,260 @@ msgid "The window size" msgstr "La talha de la fenèstra" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Mesas a jorn per Ubuntu 6.06 LTS" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Pas liure (multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Pas liure (multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Pas liure (multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Mesas a jorn per Ubuntu 6.06 LTS" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Mesas a jorn de securitat per Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (en tèst)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (instable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Claus</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Apondre un CD-ROM" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Components</b>" + +#~ msgid "_Custom" +#~ msgstr "_Personalisar" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-28 23:31+0000\n" "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n" "Language-Team: Punjabi <fedora-transa-pa@redhat.com>\n" @@ -17,66 +17,110 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.9.1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,54 +146,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +202,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +223,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,42 +236,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -236,35 +280,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -273,49 +317,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -323,20 +367,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -408,72 +452,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -492,7 +538,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -513,8 +559,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -667,118 +712,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." msgstr[1] "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>ਵੇਰਵਾ</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -#, fuzzy -msgid "Show details" -msgstr "<b>ਵੇਰਵਾ</b>" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -786,7 +817,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -794,153 +825,187 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 #, fuzzy msgid "Software Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "ਅੱਪਗਰੇਡ ਸਮਾਪਤ" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/SoftwareProperties.glade.h:1 -#, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>ਵੇਰਵਾ</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/SoftwareProperties.glade.h:3 -#, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>ਵੇਰਵਾ</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "Add _Cdrom" -msgstr "_CD ਸ਼ਾਮਲ" +msgid "<b>Internet updates</b>" +msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "ਪ੍ਰਮਾਣਿਕਤਾ" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -#, fuzzy -msgid "Installation Media" -msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" +msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -950,80 +1015,62 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>ਵੇਰਵਾ</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 #, fuzzy msgid "<b>Comment:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>ਵੇਰਵਾ</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Type:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 #, fuzzy msgid "<b>URI:</b>" msgstr "<b>ਵੇਰਵਾ</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1076,114 +1123,275 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -#, fuzzy -msgid "Software Properties" -msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "<b>Sections</b>" +#~ msgid "Hide details" #~ msgstr "<b>ਵੇਰਵਾ</b>" #, fuzzy -#~ msgid "<b>Sections:</b>" +#~ msgid "Show details" #~ msgstr "<b>ਵੇਰਵਾ</b>" #, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "<b>ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ</b>" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy +#~ msgid "Add _Cdrom" +#~ msgstr "_CD ਸ਼ਾਮਲ" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." + +#~ msgid "Software Preferences" +#~ msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" + +#, fuzzy +#~ msgid "<b>Sections:</b>" +#~ msgstr "<b>ਵੇਰਵਾ</b>" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:59+0000\n" "Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n" "Language-Team: Polish <translators@gnomepl.org>\n" @@ -17,65 +17,111 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Codziennie" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Co dwa dni" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Co tydzień" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Co dwa tygodnie" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Co %s dni" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Po tygodniu" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Po dwóch tygodniach" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Po miesiącu" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Po %s dniach" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Instalowanie pakietów" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Aktualizacje oprogramowania" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Źródłowy" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Źródłowy" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Zaimportuj klucz" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Błąd podczas importowania wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -86,11 +132,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Proszę podać nazwę dla płyty" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Proszę włożyć płytę do napędu:" @@ -107,20 +153,20 @@ msgstr "" "kontynuowaniem należy je naprawić używając Synaptic Menedżer Pakietów lub " "apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nie można zaktualizować wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Niezbędny pakiet musiałby zostać usunięty" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nie można przetworzyć aktualizacji" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -129,11 +175,11 @@ msgstr "" "zgłosić to jako błąd. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Błąd podczas uwierzytelniania niektórych pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -143,23 +189,23 @@ msgstr "" "sieci. Można spróbować ponownie później. Poniżej znajduje się lista " "nieuwierzytelnionych pakietów." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Nie można zainstalować \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Nie można było usunąć wybranego klucza. Proszę zgłosić to jako błąd. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Nie można odnaleźć żadnego z wymaganych meta-pakietów" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -171,15 +217,15 @@ msgstr "" "edubuntu-desktop. Nie jest możliwe określenie używanej wersji Ubuntu.\n" " Przed kontynuowaniem proszę zainstalować jeden z powyższych pakietów." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Odczytywanie bufora podręcznego" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nie odnaleziono poprawnego serwera lustrzanego" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -199,11 +245,11 @@ msgstr "" "Jeśli wybierzesz \"Nie\" aktualizacja zostanie anulowana." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Wygenerować domyślne źródła?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -217,11 +263,11 @@ msgstr "" "Czy mam dodać domyślne wpisy dla \"%s\"? Jeśli wybierzesz \"Nie\" " "aktualizacja zostanie anulowana." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Błędne informacje o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -229,11 +275,11 @@ msgstr "" "W wyniku aktualizacji informacji o repozytoriach powstał błędny plik. Proszę " "zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Źródła stron niezależnych zostały wyłączone" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -243,11 +289,11 @@ msgstr "" "włączyć po aktualizacji używając narzędzia \"Właściwości oprogramowania\" " "lub za pomocą Synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Błąd podczas aktualizacji" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -255,11 +301,11 @@ msgstr "" "Wystąpił problem podczas aktualizacji. Zazwyczaj wynika on z problemów z " "siecią, proszę sprawdzić połączenie sieciowe i spróbować ponownie." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Zbyt mało miejsca na dysku" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -271,15 +317,15 @@ msgstr "" "\"sudo apt-get clean\"." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Czy chcesz rozpocząć aktualizację?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Instalacja aktualizacji zakończyła się niepowodzeniem." -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -288,11 +334,11 @@ msgstr "" "nienadającym się do użytku. Uruchamianie naprawiania systemu (dpkg --" "configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Pobranie aktualizacji było niemożliwe" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -300,11 +346,11 @@ msgstr "" "Aktualizacja została przerwana. Proszę sprawdzić połączenie sieciowe oraz " "dysk instalacyjny i spróbować ponownie. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Niektóre programy nie są już oficjalnie wspierane" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -318,23 +364,23 @@ msgstr "" "Jeśli nie masz włączonego \"universe\" w następnym kroku zostanie " "zasugerowane ich usunięcie. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Usunąć niepotrzebne pakiety?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Pomiń ten krok" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Usuń" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Błąd podczas zatwierdzania" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -343,26 +389,26 @@ msgstr "" "poniższych wiadomościach. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Przywracanie pierwotnego stanu systemu" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Sprawdzanie menedżera pakietów" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Aktualizowanie informacji o repozytoriach" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Błędne informacje o pakietach" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -373,19 +419,19 @@ msgstr "" "być odnaleziony.\n" "To wskazuje na poważny problem, proszę zgłosić ten błąd." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Pytanie o potwierdzenie" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Aktualizacja w toku" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Wyszukiwanie zdezaktualizowanego oprogramowania" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Aktualizacja systemu zakończona powodzeniem." @@ -459,11 +505,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Polecenie \"diff\" nie zostało odnalezione" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Wystąpił błąd krytyczny" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -474,7 +520,9 @@ msgstr "" "Pierwotny plik sources.list został zapisany w /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -482,7 +530,7 @@ msgstr[0] "%s pakiet zostanie usunięty." msgstr[1] "%s pakiety zostaną usunięte." msgstr[2] "%s pakietów zostanie usuniętych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -490,7 +538,7 @@ msgstr[0] "%s nowy pakiet zostanie zainstalowany." msgstr[1] "%s nowe pakiety zostaną zainstalowane." msgstr[2] "%s nowy pakietów zostanie zainstalowane." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -498,43 +546,43 @@ msgstr[0] "%s pakiet zostanie zaktualizowany." msgstr[1] "%s pakiety zostaną zaktualizowane." msgstr[2] "%s pakietów zostanie zaktualizowanych." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Konieczne pobranie ogółem %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Aktualizacja może trwać wiele godzin i nie może zostać później anulowana." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Aby zapobiec utracie danych proszę zamknąć wszystkie otwarte aplikacje i " "dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nie odnaleziono żadnych aktualizacji" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "System został już zaktualizowany." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Usuń %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instaluj %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Aktualizuj %s" @@ -555,7 +603,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -581,8 +629,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Rozpocząć aktualizację?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Aktualizacja do Ubuntu 6.06 LTS</span>" @@ -740,11 +788,16 @@ msgstr "Pobieranie pliku %li z %li z prędkością %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Pobieranie pliku %li z %li z nieznaną prędkością" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Lista zmian nie jest jeszcze dostępna. Proszę spróbować później." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -753,11 +806,11 @@ msgstr "" "Internetem." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Nie można zainstalować wszystkich dostępnych aktualizacji" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -768,30 +821,30 @@ msgstr "" "w Mendżerze Pakietów Synaptic albo uruchom \"sudo apt-get dist-upgrade\" w " "terminalu." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Następujące pakiety zostaną pominięte:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Wersja %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Pobieranie informacji o zmianach..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Rozmiar do pobrania: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Twój system jest w pełni zaktualizowany" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -799,32 +852,24 @@ msgstr[0] "Ilość dostępnych aktualizacji: %s" msgstr[1] "Ilość dostępnych aktualizacji: %s" msgstr[2] "Ilość dostępnych aktualizacji: %s" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Ukryj szczegóły" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Wyświetl szczegóły" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Proszę czekać, to może chwilę potrwać." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Aktualizacja została ukończona." -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nowa wersja: %s (Rozmiar: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Twoja dystrybucja nie jest już wspierana" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -834,29 +879,17 @@ msgstr "" "krytycznych aktualizacji. Zaktualizuj do nowszej wersji Ubuntu Linux. " "Odwiedź http://www.ubuntu.com po więcej informacji." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Jednocześnie można uruchomić tylko jedno narzędzie zarządzające " -"oprogramowaniem" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Proszę najpierw zamknąć to narzędzie, np. \"aptitute\" lub \"Synaptic " -"Menedżer Pakietów\"." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Spis oprogramowania jest uszkodzony" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -866,7 +899,7 @@ msgstr "" "Proszę użyć \"Synaptic Menedżer Pakietów\" lub wydać polecenie \"sudo apt-" "get install -f\" w terminalu, aby naprawić ten problem." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -879,7 +912,7 @@ msgstr "" "można to zmienić w \"System\" -> \"Administracja\" -> \"Software Properties" "\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -891,43 +924,47 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Utrzymuj system w pełni zaktualizowany</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "_Przerwij pobieranie" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Zmiany" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Sp_rawdź" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Opis" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Informacje o wydaniu" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Pokaż postęp pobierania poszczególnych plików" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -935,63 +972,85 @@ msgstr "" "Aktualizacje oprogramowania mogą poprawić błędy, wyeliminować słabe punkty " "bezpieczeństwa i dostarczyć nowe funkcje." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Aktualizuj" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Zaktualizuj do najnowszej wersji Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "Sp_rawdź" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ukryj tę informację w przyszłości" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instaluj aktualizacje" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanały</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Zmiany" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Aktualizacje internetowe</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Klucze</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Dodaj płytę _CD" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Aktualizacje internetowe</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Uwierzytelnianie" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Usuń pobrane pliki oprogramowania:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Pobieranie zostało zakończone." + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Zaimportuj publiczny klucz od zaufanego dostawcy oprogramowania" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Nośnik instalacji" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Aktualizacje internetowe" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -999,39 +1058,55 @@ msgstr "" "Aktualizacje zabezpieczeń zostaną zainstalowane automatycznie wyłącznie z " "oficjalnych serwerów Ubuntu" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Przywróć _domyślne klucze" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Przywróć domyślne klucze dystrybucji" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Ustawienia oprogramowania" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Oprogramowanie" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Źródłowy" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Sprawdzaj dostępność aktualizacji automatycznie:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Pobieraj aktualizacje w tle, ale ich nie instaluj" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Za_importuj klucz" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instaluj aktualizacje bezpieczeństwa bez potwierdzania" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1047,40 +1122,33 @@ msgstr "" "\n" "Aby kontynuować potrzebne jest działające połączenie internetowe." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanał</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentarz:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponenty:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponenty</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Dystrybucja:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Wpisz pełny wiersz APT opisujący kanał który chcesz dodać</b></big>\n" @@ -1088,15 +1156,11 @@ msgstr "" "Wiersz APT zawiera typ, lokalizację i zawartość kanału. Dla przykładu <i>" "\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Wiersz APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Dodaj kanał" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1104,24 +1168,21 @@ msgstr "" "Binarne\n" "Źródłowe" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Edytuj kanał" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Źródłowy" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Przeszukiwanie CD-ROMu" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "Dod_aj kanał" +msgid "_Add Source" +msgstr "Źródłowy" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "Zaawansowane" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Wczytaj ponownie" @@ -1179,119 +1240,314 @@ msgid "The window size" msgstr "Rozmiar okna" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Sprawdź kanały oprogramowania w poszukiwaniu nowych aktualizacji" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Oprogramowanie" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Aktualizacje dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Utrzymywane przez społeczność (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Nie-wolnodostępne (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Nie-wolnodostępne (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Aktualizacje dla Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Aktualizacje dla Ubuntu 6.06 LTS (Backporty)" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Wspierane oficjalnie" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "O ograniczonych prawach kopiowania" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Aktualizacje dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Aktualizacje dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Utrzymywane przez społeczność (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Nie-wolnodostępne (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Wspierane oficjalnie" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "O ograniczonych prawach kopiowania" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Aktualizacje dla Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Aktualizacje bezpieczeństwa dla Debiana 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (wersja testowa)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (wersja unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Oprogramowanie kompatybilne z DFSG z zależnościami Non-Free" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Oprogramowanie niekompatybilne z DFSG." -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Ukryj szczegóły" + +#~ msgid "Show details" +#~ msgstr "Wyświetl szczegóły" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Jednocześnie można uruchomić tylko jedno narzędzie zarządzające " +#~ "oprogramowaniem" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Proszę najpierw zamknąć to narzędzie, np. \"aptitute\" lub \"Synaptic " +#~ "Menedżer Pakietów\"." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanały</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Klucze</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Dodaj płytę _CD" + +#~ msgid "Installation Media" +#~ msgstr "Nośnik instalacji" + +#~ msgid "Software Preferences" +#~ msgstr "Ustawienia oprogramowania" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanał</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenty</b>" + +#~ msgid "Add Channel" +#~ msgstr "Dodaj kanał" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "Edit Channel" +#~ msgstr "Edytuj kanał" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 5.10" +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "Dod_aj kanał" + +#~ msgid "_Custom" +#~ msgstr "Zaawansowane" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Aktualizacje dla Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Aktualizacje bezpieczeństwa dla Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Aktualizacje dla Ubuntu 5.10 (backporty)" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Aktualizacje dla Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Aktualizacje dla Ubuntu 6.06 LTS (Backporty)" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1313,12 +1569,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "<b>Sections</b>" #~ msgstr "<b>Sekcje:</b>" -#~ msgid "Oficially supported" -#~ msgstr "Wspierane oficjalnie" - -#~ msgid "Installing updates" -#~ msgstr "Instalowanie pakietów" - #~ msgid "Check for available updates" #~ msgstr "Sprawdź dostępne aktualizacje" @@ -1329,10 +1579,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "Reload the latest information about updates" #~ msgstr "Wczytuje ponownie z serwera informacje o pakietach." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Aktualizacje oprogramowania" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1348,10 +1594,6 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ "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" @@ -1546,15 +1788,9 @@ msgstr "Oprogramowanie niekompatybilne z DFSG." #~ msgid "Binary" #~ msgstr "Binarny" -#~ msgid "Source" -#~ msgstr "Źródłowy" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Uaktualnienia bezpieczeństwa dla Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Inne oprogramowanie (Contributed)" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 10:17+0000\n" "Last-Translator: Joao Carvalhinho <latrine@gmail.com>\n" "Language-Team: Ubuntu Portuguese Team <ubuntu-pt.org>\n" @@ -15,68 +15,112 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Diariamente" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "De 2 em 2 dias" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Semanalmente" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "De 2 em 2 semanas" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Todos os %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Após uma semana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Após duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Após um mês" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Depois de %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "A instalar actualizações" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizações de Software" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importar chave" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Erro ao importar ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 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:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Erro ao remover a chave" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 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:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +131,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Por favor introduza um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Por favor introduza um disco no leitor:" @@ -108,20 +152,20 @@ msgstr "" "este software. Por favor corrija-os usando o synaptic ou apt-get antes de " "continuar." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível actualizar os meta-pacotes necessários" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Impossível de calcular a actualização" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -130,11 +174,11 @@ msgstr "" "reporte este erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Erro ao autenticar alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -144,12 +188,12 @@ msgstr "" "rede transitório. Pode tentar novamente mais tarde. Verifique abaixo uma " "lista de pacotes não autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Impossível de instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -157,11 +201,11 @@ msgstr "" "Foi impossível instalar um pacote essencial. Por favor reporte este erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Impossível de descobrir meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -175,15 +219,15 @@ msgstr "" " Por favor instale um dos pacotes acima mencionados usando o synaptic ou apt-" "get antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "A ler a cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrada" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -204,11 +248,11 @@ msgstr "" "Se escolher \"não\" a actualização irá ser cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Gerar as fontes padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -222,11 +266,11 @@ msgstr "" "Deverão ser adicionadas entradas para '%s'? Se seleccionar 'Não' a " "actualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -234,11 +278,11 @@ msgstr "" "A actualização da informação de repositório resultou num ficheiro inválido. " "Por favor reporte este erro." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Fontes de terceiros desactivadas" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -248,11 +292,11 @@ msgstr "" "reactivá-las depois da actualização com a ferramenta 'propriedades-software' " "ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Erro durante a actualização" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -261,11 +305,11 @@ msgstr "" "tipo de problema na rede, por favor verifique a sua ligação à rede e volte a " "tentar." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Não existe espaço livre em disco suficiente" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -277,15 +321,15 @@ msgstr "" "usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Deseja iniciar a actualização?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Impossível de instalar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -293,11 +337,11 @@ msgstr "" "A actualização abortará agora. O seu sistema poderá estar num estado " "inutilizável. Foi efectuada uma recuperação (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Impossível de descarregar as actualizações" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -305,11 +349,11 @@ msgstr "" "A actualização abortará agora. Por favor verifique a sua ligação à internet " "ou media de instalação e volte a tentar. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Algum software já não é suportado oficialmente" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -323,23 +367,23 @@ msgstr "" "Se não tem o repositório 'universe' activo será sugerida a remoção destes " "pacotes no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Saltar Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Erro ao submeter" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -348,27 +392,27 @@ msgstr "" "abaixo para mais informação. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 #, fuzzy msgid "Restoring original system state" msgstr "A restaurar o estado original do sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "A verificar gestor de pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "A Actualizar informação de repositórios" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Informação de pacotes inválida" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -379,19 +423,19 @@ msgstr "" "pacote essencial '%s'.\n" "Isto indica um erro sério, por favor reporte este problema." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "A pedir confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "A actualizar" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "À procura de software obsoleto" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "A actualização do sistema está completa." @@ -465,11 +509,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -480,65 +524,67 @@ msgstr "" "ficheiro original sources.list foi guardado em /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será actualizado." msgstr[1] "%s pacotes serão actualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Tem de efectuar o download de um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A actualização poderá demorar várias horas e não poderá ser cancelada a " "qualquer instante posteriormente." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Para prevenir a perda de dados feche todas as aplicações e documentos " "abertos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Impossível de encontrar quaisquer actualizações" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "O seu sistema já foi actualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Actualizar %s" @@ -558,7 +604,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -583,8 +629,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a actualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">A actualizar para Ubuntu 6.06 LTS</" "span>" @@ -743,12 +789,18 @@ msgstr "A descarregar ficheiro %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "A descarregar ficheiro %li de %li a velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"A lista de alterações ainda não está disponível. Por favor tente mais tarde." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações ainda não está disponível. Por favor tente mais tarde." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -757,11 +809,11 @@ msgstr "" "à internet." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Impossível de instalar todas as actualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -771,62 +823,54 @@ msgstr "" "\"Marcar Todas as Actualizações\" ou execute \"sudo apt-get dist-upgrade\" " "numa consola para actualizar completamente o seu sistema." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "As seguintes actualizações serão ignoradas:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versão %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "A descarregar lista de alterações..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "O seu sistema está actualizado" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Pode instalar %s actualização" msgstr[1] "Pode instalar %s actualizações" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Esconder detalhes" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Mostrar detalhes" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Por favor aguarde, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "A actualização está completa" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nova versão: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "A sua distribuição já não é suportada" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -836,27 +880,17 @@ msgstr "" "versão mais recente do Ubuntu Linux. Veja http://www.ubuntu.com para mais " "informação em como actualizar." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Uma única ferramenta de gestão de software pode ser executada ao mesmo tempo" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou 'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "O índice de software está quebrado" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -866,7 +900,7 @@ msgstr "" "gestor de pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" numa " "consola para corrigir este problema em primeiro lugar." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -879,7 +913,7 @@ msgstr "" "este comportamento em \"Sistema\" -> \"Administração\" -> \"Propriedades do " "Software\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -891,43 +925,47 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/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 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Cancelar _Descarregamento" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Alterações" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "Verific_ar" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Verificar os repositórios de software por novas actualizações" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descrição" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Notas de lançamento" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Mostrar progresso de ficheiros individuais" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizações de Software" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -935,63 +973,85 @@ msgstr "" "Actualizações de software podem corrigir erros, eliminar problemas de " "segurança, e fornecer novas funcionalidades." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "A_ctualização" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Actualize para a última versão do Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Actualizações" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Repositórios</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Alterações" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Actualizações Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Chaves</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Adicionar _CD" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Actualizações Internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticação" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "A_pagar ficheiros descarregados:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "O Download está completo" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 "Media de Instalação" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Actualizações Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -999,39 +1059,54 @@ msgstr "" "Apenas actualizações de segurança dos servidores oficiais do Ubuntu serão " "instaladas automaticamente." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Restaurar _Definições" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 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" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Preferências de Software" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Procurar por actualizações automaticamente:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Descarregar actualizações silenciosamente, sem as instalar" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importar Chave de Ficheiro" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instalar actualizações de segurança sem confirmação" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1048,40 +1123,33 @@ msgstr "" "\n" "Necessita de uma ligação internet activa para continuar." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Repositórios</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentários:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componentes:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componentes:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribuição:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tipo:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Introduza uma linha completa APT para o repositório que deseja " @@ -1090,15 +1158,11 @@ msgstr "" "A linha APT contém o tipo, localização e componentes de um repositório, por " "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Linha do APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Adicionar Repositório" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1106,24 +1170,19 @@ msgstr "" "Binário\n" "Fonte" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Editar Repositório" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "A pesquisar o CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "_Adicionar Repositório" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Personalizado" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Reler" @@ -1181,119 +1240,315 @@ msgid "The window size" msgstr "Tamanho da Janela" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configurar os repositórios de software e actualizações pela internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Preferências de Software" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Actualizações" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Actualizações de Segurança Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Actualizações Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Mantido pela comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Não-livre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Não-livre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suportado Oficialmente" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Direitos de autor restritos" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Actualizações" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Actualizações" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Mantido pela comunidade (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Direitos de autor restritos" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Actualizações de Segurança" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Actualizações" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/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 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/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 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Software compatível-DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Esconder detalhes" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "Show details" +#~ msgstr "Mostrar detalhes" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Actualizações de Segurança" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Uma única ferramenta de gestão de software pode ser executada ao mesmo " +#~ "tempo" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Por favor feche a outra aplicação primeiro, por ex. 'aptitude' ou " +#~ "'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Repositórios</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Chaves</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Adicionar _CD" + +#~ msgid "Installation Media" +#~ msgstr "Media de Instalação" + +#~ msgid "Software Preferences" +#~ msgstr "Preferências de Software" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Repositórios</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componentes:</b>" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Actualizações" +#~ msgid "Add Channel" +#~ msgstr "Adicionar Repositório" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Edit Channel" +#~ msgstr "Editar Repositório" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Adicionar Repositório" + +#~ msgid "_Custom" +#~ msgstr "_Personalizado" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Actualizações de Segurança Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Actualizações Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1305,12 +1560,6 @@ msgstr "Software compatível-DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Secções</b>" -#~ msgid "Oficially supported" -#~ msgstr "Suportado Oficialmente" - -#~ msgid "Installing updates" -#~ msgstr "A instalar actualizações" - #~ msgid "Check for available updates" #~ msgstr "Verificar por actualizações disponíveis" @@ -1320,10 +1569,6 @@ msgstr "Software compatível-DFSG" #~ msgid "Reload the latest information about updates" #~ msgstr "Reler a última informação sobre actualizações" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Actualizações de Software" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1334,9 +1579,6 @@ msgstr "Software compatível-DFSG" #~ "\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-" diff --git a/po/pt_BR.po b/po/pt_BR.po index 095c21c6..0cd6d801 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-26 22:31+0000\n" "Last-Translator: KurtKraut <ubuntu@kurtkraut.net>\n" "Language-Team: Ubuntu-BR <tradutores@listas.ubuntubrasil.org>\n" @@ -16,69 +16,115 @@ msgstr "" "X-Poedit-Country: BRAZIL\n" "Plural-Forms: nplurals=2; plural=n > 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Diário" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "A cada dois dias" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Semanalmente" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "A cada duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "A cada %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Após uma semana" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Após duas semanas" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Após um mês" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Após %s dias" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Instalando Atualizações" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Modificando os canais de programas" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Source" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importar Chave" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Erro importando o arquivo selecionado" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O arquivo selecionado pode não ser um arquivo de chave GPG ou pode estar " "corrompido." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Erro removendo a chave" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "A chave que você selecionou não pôde se removida. Por favor reporte isto " "como um erro." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -89,11 +135,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Por favor digite um nome para o disco" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Por favor insira um disco no drive:" @@ -110,20 +156,20 @@ msgstr "" "programa. Por favor, arrume-os primeiro usando o Synaptic ou apt-get antes " "de continuar." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Não foi possível atualizar os meta-pacotes requeridos" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Um pacote essencial teria que ser removido" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Não foi possível calcular a atualização" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -132,11 +178,11 @@ msgstr "" "favor reporte isto como um erro. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Erro autenticando alguns pacotes" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -146,12 +192,12 @@ msgstr "" "de rede. Você pode tentar de novo depois. Veja abaixo uma lista dos pacotes " "não-autenticados." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Não foi possível instalar '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -160,11 +206,11 @@ msgstr "" "um erro. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Não foi possível adivinhar o meta-pacote" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -178,15 +224,15 @@ msgstr "" "Por favor instale um desses pacotes primeiro usando o Synaptic ou apt-get " "antes de continuar." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Lendo cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nenhum repositório válido encontrado" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -206,11 +252,11 @@ msgstr "" "Se você selecionar 'não' a atualização será cancelada." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Gerar sources padrão?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -224,11 +270,11 @@ msgstr "" "Entradas padrões para '%s' devem ser adicionadas? Se você escolher 'Não' a " "atualização será cancelada." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Informação de repositório inválida" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -236,11 +282,11 @@ msgstr "" "Atualizando a informações de repositórios resultou em um arquivo inválido. " "Por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Fontes de terceiros desabilitadas" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -250,11 +296,11 @@ msgstr "" "poderá reabilitá-las depois de atualizar com a ferramenta 'propriedades do " "programa' ou com o synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Erro durante a atualização" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -263,11 +309,11 @@ msgstr "" "problemas de rede, por favor verifique a sua conexão de rede e tente " "novamente." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Não há espaço suficiente no disco" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -279,15 +325,15 @@ msgstr "" "instalações anteriores usando 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Você quer iniciar a atualização?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Não foi possível instalar as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -295,11 +341,11 @@ msgstr "" "A atualização será abortada agora. Seu sistema pode estar em um estado " "instável. Uma recuperação é executada (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Não foi possível obter as atualizações" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -307,11 +353,11 @@ msgstr "" "A atualização será abortada agora. Por favor verifique sua conexão à " "Internet ou mídia de instalação e tente de novo. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Alguns softwares não são mais oficialmente suportado." -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -325,23 +371,23 @@ msgstr "" "Se você não tem o repositório 'universe' habilitado, estes pacotes serão " "sugeridos à remoção no próximo passo. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Remover Pacotes obsoletos?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Pular Este Passo" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Remover" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Erro ao aplicar as mudanças" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -350,27 +396,27 @@ msgstr "" "abaixo para maiores informações. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Reiniciando o estado original do sistema" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Verificando o Gerenciador de Pacotes" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Atualizando informação do repositório" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 #, fuzzy msgid "Invalid package information" msgstr "Informação do pacote inválida" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -381,19 +427,19 @@ msgstr "" "não pôde mais ser encontrado.\n" "Isto indica um sério erro, por favor reporte isso como um erro." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Pedindi por confirmação" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Atualizando" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Buscando programas obsoletos" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "A Atualização do Sistema está completa." @@ -467,11 +513,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "O comando 'diff' não foi encontrado" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Ocorreu um erro fatal" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -482,62 +528,64 @@ msgstr "" "abortará agora.\n" "Seu sources.list original foi salvo em /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s pacote será removido." msgstr[1] "%s pacotes serão removidos." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s novo pacote será instalado." msgstr[1] "%s novos pacotes serão instalados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s pacote será atualizado." msgstr[1] "%s pacotes serão atualizados." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Você precisa obter um total de %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "A atualização pode levar diversas horas e não poderá ser cancelada depois." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "Para evitar perda de dados, feche todas as aplicações e documentos." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Não foi possível encontrar nenhuma atualização" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Seu sistema já foi atualizado." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Remover %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Instalar %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Atualizar %s" @@ -558,7 +606,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -583,8 +631,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Iniciar a Atualização?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Atualizando para o Ubuntu 6.06 LTS</" "span>" @@ -744,13 +792,20 @@ msgstr "Obtendo arquivo %li de %li a %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Obtendo arquivo %li de %li a uma velocidade desconhecida" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"A lista de alterações não está disponível ainda. Por favor, tente novamente " +"mais tarde." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "A lista de alterações não está disponível ainda. Por favor, tente novamente " "mais tarde." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -759,11 +814,11 @@ msgstr "" "conexão com a internet." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Não foi possível instalar todas as atualizações disponíveis" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -774,62 +829,54 @@ msgstr "" "\"sudo apt-get dist-upgrade\" em um terminal para atualizar seu sistema " "completamente." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "As seguintes atualizações serão puladas:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Obtendo a lista de alterações" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Tamanho do download: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Seu sistema está atualizado" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Você pode instalar %s atualização" msgstr[1] "Você pode instalar %s atualizações" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Esconder detalhes" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Exibir Detalhes" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Por favor, espere, isto pode levar algum tempo." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Atualização completa" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "New version: %s (Tamanho: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Sua distribuição não é mais suportada" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -839,27 +886,17 @@ msgstr "" "falhas de segurança. Atualize para uma versão mais nova do Ubuntu Linux. " "Veja http://www.ubuntu-br.org" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo tempo" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Por favor, feche a outra aplicação e.g. 'aptitude' ou 'Synaptic' primeiro." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "A índex de software está quebrado" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -869,7 +906,7 @@ msgstr "" "Gerenciador de Pacotes \"Synaptic\" ou execute \"sudo apt-get install -f\" " "em um terminal para resolver esse problema primeiro." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -882,7 +919,7 @@ msgstr "" "configurar essa opção em \"Sistema\" -> \"Administração\" -> \"Propriedades " "de Programas\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -894,43 +931,47 @@ msgstr "" "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " "segurança, e prover novas funcionalidades para você." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 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 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Cancelar _Download" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Mudanças" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Verificar os canais de software por novas atualizações" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descrição" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Notas de Versão" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Exibir progresso de arquivos únicos" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Atualizações de Programas" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -938,64 +979,86 @@ msgstr "" "Atualizações de Programas podem corrigir erros, eliminar vulnerabilidades de " "segurança, e prover novas funcionalidades para você." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "At_ualizar" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Atualizar para a última versão do Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Verificar" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Ocultar esta informação no futuro" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Instalar Atualizações" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Canais</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Mudanças" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Atualizações via Internet</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Chaves</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Adicionar _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Atualizações via Internet</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autenticação" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Apagar arquivos d_e programas obtidos:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "O Download está completo" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Atualizações via Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -1003,40 +1066,56 @@ msgstr "" "Somente atualizações de segurança do servidor oficial do Ubuntu serão " "instaladas automaticamente." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurar Pa_drões" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 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/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Software Properties" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Source" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "Verifi_car por atualizações automaticamente:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Obter atualizações em segundo plano, mas não instalá-las" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_Importar Arquivo Chave" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Instalar novas atualizações de segurança sem confirmação" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1052,40 +1131,33 @@ msgstr "" "\n" "Você necessita uma conexão de internet para continuar." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Canal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comment:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componentes:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componentes:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Type:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Insira a linha completa do APT do canal que você quer adicionar</b></" @@ -1094,15 +1166,11 @@ msgstr "" "A linha do APT contém o tipo, a localização e as seções do canal, por " "exemplo <i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Adicionar Canal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1110,25 +1178,21 @@ msgstr "" "Binary\n" "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Editar Canal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Procurando no CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Adicionar Canal" +msgid "_Add Source" +msgstr "Source" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -#, fuzzy -msgid "_Custom" -msgstr "_Personalizado" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Recarregar" @@ -1186,119 +1250,314 @@ msgid "The window size" msgstr "O tamanho da janela" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Configurar os canais de software e atualizações via internet" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Software Properties" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Atualizações do Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Atualizações de Segurança do Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Atualizações do Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Mantido pela Comunidade (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Não-livre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Não-livre (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Backports do Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Suporte oficial" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Restrito por copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Atualizações do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Backports do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Atualizações de Segurança do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Atualizações do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Backports do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Mantido pela Comunidade (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Não-livre (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Suportado Oficialmente" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Restrito por copyright" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Atualizações do Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Backports do Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Atualizações de Segurança do Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Programa compatível com a DFSG mas com dependências não-livres" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Programas não compatíveis com a DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Esconder detalhes" + +#~ msgid "Show details" +#~ msgstr "Exibir Detalhes" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Apenas uma ferramenta de gerenciamento de pacotes pode rodar ao mesmo " +#~ "tempo" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Atualizações de Segurança do Ubuntu 5.10" +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Por favor, feche a outra aplicação e.g. 'aptitude' ou 'Synaptic' primeiro." -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Atualizações do Ubuntu 5.10" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Canais</b>" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Backports do Ubuntu 5.10" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Chaves</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Adicionar _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Mídia de Instalação" + +#~ msgid "Software Preferences" +#~ msgstr "Preferências de Programas" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Canal</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componentes:</b>" + +#~ msgid "Add Channel" +#~ msgstr "Adicionar Canal" + +#~ msgid "Edit Channel" +#~ msgstr "Editar Canal" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Adicionar Canal" + +#, fuzzy +#~ msgid "_Custom" +#~ msgstr "_Personalizado" + +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Atualizações de Segurança do Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Atualizações do Ubuntu 6.06 LTS" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Backports do Ubuntu 6.06 LTS" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1320,12 +1579,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Seções</b>" -#~ msgid "Oficially supported" -#~ msgstr "Suportado Oficialmente" - -#~ msgid "Installing updates" -#~ msgstr "Instalando Atualizações" - #~ msgid "Check for available updates" #~ msgstr "Procurar updates disponíveis" @@ -1336,10 +1589,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgstr "Recarregar as últimas informações sobre atualizações" #, 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" @@ -1361,9 +1610,6 @@ msgstr "Programas não compatíveis com a DFSG" #~ 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-" @@ -1603,15 +1849,9 @@ msgstr "Programas não compatíveis com a DFSG" #~ msgid "Binary" #~ msgstr "Binary" -#~ msgid "Source" -#~ msgstr "Source" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 Security Updates" - #~ msgid "Contributed software" #~ msgstr "Contributed software" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:39+0000\n" "Last-Translator: Sami POTIRCA <spotirca@gmail.com>\n" "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n" @@ -17,66 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Zilnic" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "La fiecare două zile" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Săptămânal" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "La fiecare 2 săptămâni" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "La fiecare %s zile" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "După o saptămână" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "După două săptămâni" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "După o lună" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "După %s zile" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_Instalează actualizarile" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Actualizări software" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "" +"Binar\n" +"Sursă" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "" +"Binar\n" +"Sursă" + +#: ../SoftwareProperties/SoftwareProperties.py:908 #, fuzzy msgid "Import key" msgstr "Importă cheie" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Eroare la importarea fişierului selectat" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Fişierul selectat nu pare a fi o cheie GPG sau poate fi corupt." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Eroare la ştergerea cheii." -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Cheia selectată nu poate fi ştearsă. Raportaţi această eroare." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -87,11 +137,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Introduceţi un nume pentru disc" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Introduceţi un disc în unitate:" @@ -110,44 +160,44 @@ msgstr "" "program. Înainte de a continua vă rugăm să le remediaţi utilizând synaptic " "sau apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 #, fuzzy msgid "Error authenticating some packages" msgstr "Eroare la autentificarea unor pachete." -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Nu pot instala '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -157,11 +207,11 @@ msgstr "" "(eroare). " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -170,15 +220,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Citire cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -191,11 +241,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -204,42 +254,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Eroare în timpul actualizării" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Spaţiu liber insuficient" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -248,35 +298,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Vrei sa începi upgrade-ul?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Nu s-au putut instalat upgrade-urile" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Nu pot descărca actualizările" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -285,50 +335,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "Şter_ge" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 #, fuzzy msgid "Restoring original system state" msgstr "Se reface starea iniţială a sistemului" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Se verifică managerul de pachete" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -336,19 +386,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Se actualizează" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Actualizarea sistemului este completă" @@ -420,18 +470,20 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -439,7 +491,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -447,7 +499,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -455,40 +507,40 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nu s-au găsit actualizări" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -507,7 +559,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -528,8 +580,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -680,11 +731,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Nu există nici un pachet de actualizat." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -694,42 +750,42 @@ msgstr "" "conexiune internet activă." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Versiunea %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Se descarcă listă schimbărilor..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Sistemul dumneavoastră este actualizat la zi!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -737,65 +793,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Ascunde detaliile" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Versiunea nouă: %s (Mărime: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Distribuţia dvs. nu mai este suportată" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -803,7 +843,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -811,150 +851,190 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Modificări" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Descriere" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Actualizări software" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "_Actualizează" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "_Instalează actualizarile" -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Detalii</b>" +msgid "changes" +msgstr "Modificări" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" -msgstr "<b>Actualizări de pe Internet</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:3 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Keys</b>" -msgstr "<b>Chei</b>" +msgid "<b>Automatic updates</b>" +msgstr "<b>Actualizări de pe Internet</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Actualizări de pe Internet</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentificare" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Actualizări de pe Internet" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurează cheile implicite." -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Preferinţe software" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "" +"Binar\n" +"Sursă" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Importă cheie" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -964,42 +1044,33 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Detalii</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Comentariu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Componente:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Componente</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribuţie:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Tip:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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 " @@ -1009,15 +1080,11 @@ msgstr "" "\"deb http://ftp.debian.org sarge main\"</i>. Puteţi găsi o descriere " "detaliată a sintaxei în documentaţie." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Linie APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1025,23 +1092,25 @@ msgstr "" "Binar\n" "Sursă" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" msgstr "" +"Binar\n" +"Sursă" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" msgstr "" +"Binar\n" +"Sursă" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1094,127 +1163,290 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -#, fuzzy -msgid "Software Properties" -msgstr "Preferinţe software" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Actualizări de securitate Ubuntu 5.04" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Actualizări Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Pachete întreţinute de comunitate (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Pachete non-libere (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Pachete non-libere (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Actualizări de securitate Ubuntu 5.04" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:97 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Actualizări de securitate Ubuntu 6.06" +msgid "Important security updates" +msgstr "Actualizări de Securitate Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Pachete suportate oficial" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Copyright restrictiv" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Actualizări de Securitate Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Actualizări Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Actualizări de securitate Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Actualizări de securitate Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Actualizări de securitate Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Actualizări de Securitate Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Actualizări Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Actualizări de securitate Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Pachete întreţinute de comunitate (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Pachete non-libere (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Pachete suportate oficial" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Copyright restrictiv" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Actualizări de securitate Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Actualizări Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Actualizări de securitate Ubuntu 5.04" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Actualizări de securitate Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" +#~ msgid "Hide details" +#~ msgstr "Ascunde detaliile" + #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Actualizări de securitate Ubuntu 5.04" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Detalii</b>" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Chei</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Actualizări de Securitate Ubuntu 5.10" +#~ msgid "Software Preferences" +#~ msgstr "Preferinţe software" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Actualizări Ubuntu 5.10" +#~ msgid " " +#~ msgstr " " #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Detalii</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Componente</b>" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Actualizări de securitate Ubuntu 5.04" +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Actualizări de securitate Ubuntu 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Actualizări de securitate Ubuntu 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Actualizări de securitate Ubuntu 6.06" + #~ msgid "Repositories changed" #~ msgstr "Locaţiile au fost schimbate" @@ -1233,10 +1465,6 @@ msgstr "" #~ msgid "<b>Sections</b>" #~ msgstr "<b>Secţiuni:</b>" -#, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Pachete suportate oficial" - #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Secţiuni:</b>" @@ -1244,10 +1472,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Reîncarcă informaţiile despre pachete de pe server." -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Actualizări software" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1258,10 +1482,6 @@ msgstr "" #~ "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>" @@ -1365,10 +1585,6 @@ msgstr "" #~ msgstr "Nu există nici un pachet de actualizat." #, fuzzy -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Nu există nici un pachet de actualizat." - -#, fuzzy #~ msgid "" #~ "This usually means that another package management application (like apt-" #~ "get or aptitude) already running. Please close that application first" @@ -1385,18 +1601,9 @@ msgstr "" #~ "Binar\n" #~ "Sursă" -#, fuzzy -#~ msgid "Source" -#~ msgstr "" -#~ "Binar\n" -#~ "Sursă" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Actualizări de securitate Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Software în contribuţie" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-25 19:23+0000\n" "Last-Translator: Igor Zubarev <igor4u@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" @@ -18,66 +18,110 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Ежедневно" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Каждые два дня" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Еженедельно" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Каждые две недели" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Каждые %s дней" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Через неделю" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Через две недели" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Через месяц" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Через %s дней" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Установить обновления" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Обновления программ" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Импортировать ключ" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Ошибка при импортировании выбранного файла" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Возможно выбранный файл не является файлом ключа GPG или поврежден." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Ошибка при удалении ключа" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Выбранный вами ключ нельзя удалить. Пожалуйста, отправьте отчет об ошибке." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +132,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Введите название для диска" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Пожалуйста, вставьте диск в привод:" @@ -109,20 +153,20 @@ msgstr "" "данной программой. Пожалуйста, исправьте их, используя synaptic или apt-get, " "прежде чем продолжить." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Невозможно обновить требуемые мета-пакеты" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Будет удален необходимый пакет" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Невозможно подготовить обновление системы" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -131,11 +175,11 @@ msgstr "" "Пожалуйста, отправьте отчет об ошибке. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Ошибка при проверке подлинности некоторых пакетов" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -145,12 +189,12 @@ msgstr "" "кратковременная проблема с сетью и стоит попробовать позже. Ниже приведен " "список пакетов, не прошедших проверку." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Невозможно установить '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -159,11 +203,11 @@ msgstr "" "ошибке. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Невозможно подобрать мета-пакет" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -176,15 +220,15 @@ msgstr "" " Для продолжения сначала установите один из приведенных выше пакетов с " "помощью synaptic или apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Чтение кэша" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Не найдено действующее зеркало" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -204,11 +248,11 @@ msgstr "" "Ответ 'Нет' отменит обновление." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Сгенерировать источники по умолчанию?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -221,11 +265,11 @@ msgstr "" "\n" "Добавить записи по умолчанию для '%s'? Ответ 'Нет' прервет обновление." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Информация о репозитории неверна" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -233,11 +277,11 @@ msgstr "" "В результате обновления информации о репозиториях образовался неверный файл. " "Пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Источники третьих сторон отключены" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -247,11 +291,11 @@ msgstr "" "обновления вы можете снова включить их с помощью утилиты 'software-" "properties' или synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Ошибка при обновлении" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -259,11 +303,11 @@ msgstr "" "При обновлении возникла проблема. Обычно это бывает вызвано проблемами в " "сети, проверьте сетевые подключения и повторите попытку." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Недостаточно свободного места на диске" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -275,15 +319,15 @@ msgstr "" "предыдущих установок с помощью команды 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Вы хотите начать обновление системы?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Невозможно установить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -291,11 +335,11 @@ msgstr "" "Обновление прервано. Система, возможно, находится в неработоспособном " "состоянии. Запущено восстановление системы (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Невозможно загрузить обновления" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -303,11 +347,11 @@ msgstr "" "Обновление прервано. Проверьте соединение с Интернет или установочный диск и " "попробуйте снова. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Некоторые программы больше не поддерживаются официально" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -321,23 +365,23 @@ msgstr "" "Если у вас не подключен репозиторий 'universe', на следующем шаге вам " "предложат удалить эти пакеты. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Удалить устаревшие пакеты?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Пропустить этот шаг" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Удалить" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Ошибка при фиксировании" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -346,26 +390,26 @@ msgstr "" "ниже. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Восстановление первоначального состояния системы" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Проверка менеджера пакетов" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Обновление информации о репозитории" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Неверная информация о пакете" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -376,19 +420,19 @@ msgstr "" "найден.\n" "Это говорит о серьезной проблеме, пожалуйста отправьте отчет об ошибке." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Запрос подтверждения" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Обновление" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Поиск устаревших программ" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Обновление системы завершено." @@ -462,11 +506,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Не найдена команда 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Произошла неисправимая ошибка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -476,7 +520,9 @@ msgstr "" "upgrade.log и /var/log/dist-upgrade-apt.log. Обновление прервано.\n" "Оригинальный sources.list был сохранен как /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -484,7 +530,7 @@ msgstr[0] "%s пакет будет удален." msgstr[1] "%s пакета будут удалены." msgstr[2] "%s пакетов будут удалены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -492,7 +538,7 @@ msgstr[0] "%s новый пакет будет установлен." msgstr[1] "%s новых пакета будут установлены." msgstr[2] "%s новых пакетов будут установлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -500,43 +546,43 @@ msgstr[0] "%s пакет будет обновлен." msgstr[1] "%s пакета будут обновлены." msgstr[2] "%s пакетов будут обновлены." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Всего требуется загрузить %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Обновление может занять несколько часов и не может быть прервано в любой " "момент." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Чтобы избежать потерь данных, закройте все открытые приложения и документы." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Обновления не найдены" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Система уже обновлена." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Удалить %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Установить %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Обновить %s" @@ -555,7 +601,7 @@ msgstr "Обновление завершено и требуется перез #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -580,8 +626,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Начать обновление?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Обновление до Ubuntu 6.06 LTS</span>" @@ -739,12 +785,18 @@ msgstr "Загрузка файла %li из %li со скоростью %s/с" msgid "Downloading file %li of %li with unknown speed" msgstr "Загрузка файла %li из %li с неизвестной скоростью" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "" +"На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" "На данный момент список изменений недоступен. Пожалуйста, попробуйте позднее." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -753,11 +805,11 @@ msgstr "" "интернет." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Невозможно установить все доступные обновления" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -767,30 +819,30 @@ msgstr "" "обновления системы используйте функцию \"Пометить все обновления\" менеджера " "пакетов \"Synaptic\" или запустите в терминале \"sudo apt-get dist-upgrade\"." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Следующие обновления будут пропущены:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Версия %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Загрузка списка изменений..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Размер загружаемых данных: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Ваша система не требует обновления" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -798,32 +850,24 @@ msgstr[0] "Вы можете установить %s обновление" msgstr[1] "Вы можете установить %s обновления" msgstr[2] "Вы можете установить %s обновлений" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Скрыть подробности" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Показать подробности" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Пожалуйста подождите, это может занять некоторое время." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Обновление завершено" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Новая версия: %s (Размер: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Ваша версия Ubuntu больше не поддерживается" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -833,29 +877,17 @@ msgstr "" "обновления. Обновите систему до более поздней версии Ubuntu Linux. Для " "получения информации об обновлении посетите http://www.ubuntu.com" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>Доступен новый релиз дистрибутива '%s'</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" -"Одновременно может быть запущена только одна программа установки/удаления " -"пакетов" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Пожалуйста, сначала закройте другие приложения, такие как 'aptitude' или " -"'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Индекс программ поврежден" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -865,7 +897,7 @@ msgstr "" "используйте менеджер пакетов \"Synaptic\" или запустите в терминале \"sudo " "apt-get install -f\"." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -877,7 +909,7 @@ msgstr "" "Ваша система не проверяет обновления автоматически. Это настраивается в " "\"Система\" -> \"Администрирование\" -> \"Параметры приложений\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -889,43 +921,47 @@ msgstr "" "Обновления программ исправляют ошибки, уязвимости и добавляют новые " "возможности." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Не забывайте обновлять систему</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Отменить _загрузку" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Изменения" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Проверить" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Проверить каналы приложений на наличие обновлений" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Описание" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Сведения о релизе" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Показывать прогресс для отдельных файлов" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Обновления программ" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -933,63 +969,85 @@ msgstr "" "Обновления программ исправляют ошибки, уязвимости и добавляют новые " "возможности." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "Обновить" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Обновить систему до последней версии Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "Проверить" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "Не показывать эту информацию в дальнейшем" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Установить обновления" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Каналы</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Изменения" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Обновления в Интернет</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Ключи</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Обновления в Интернет</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Добавить _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Авторизация" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "Удалить загруженные файлы программ:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Загрузка завершена" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Обновления в Интернет" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -997,39 +1055,54 @@ msgstr "" "Автоматически будут установлены только обновления безопасности с официальных " "серверов Ubuntu" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "Восстановить начальные" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Восстановить исходные ключи вашего дистрибутива" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" msgstr "Параметры приложений" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "Автоматически проверять наличие обновлений:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "Загружать обновления в фоне, но не устанавливать их" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Импортировать файл ключа" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "Устанавливать обновления безопасности без запроса" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1045,40 +1118,33 @@ msgstr "" "\n" "Для продолжения требуется действующее подключение к Интернет." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Канал</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Комментарий:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Компоненты:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Компоненты</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибутив:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Тип:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Введите полную строку APT канала, который вы хотите добавить</b></" @@ -1087,15 +1153,11 @@ msgstr "" "Строка APT состоит из типа, расположения и компонентов канала, например <i>" "\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Строка APT:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Добавить канал" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1103,24 +1165,19 @@ msgstr "" "Бинарные файлы\n" "Исходные тексты" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Изменить канал" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Просмотр CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "Добавить канал" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Выбрать" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "Обновить" @@ -1177,116 +1234,312 @@ msgid "The window size" msgstr "Размен окна" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Настроить каналы программ и обновления из интернет" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Параметры приложений" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Обновления Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Поддерживается сообществом (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Несвободное (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Несвободное (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Обновления безопасности Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Обновления безопасности Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Обновления Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Официально поддерживается" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Ограниченные авторские права" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Обновления безопасности Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Обновления Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Обновления безопасности Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Обновления Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Поддерживается сообществом (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Несвободное (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Официально поддерживается" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Ограниченные авторские права" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Обновления безопасности Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Обновления Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Обновления безопасности Debian 3.1 \"Sarge\"" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-совместимое ПО с зависимостями от несвободного ПО" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Не-DFSG-совместимое ПО" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Скрыть подробности" + +#~ msgid "Show details" +#~ msgstr "Показать подробности" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "" +#~ "Одновременно может быть запущена только одна программа установки/удаления " +#~ "пакетов" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Пожалуйста, сначала закройте другие приложения, такие как 'aptitude' или " +#~ "'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Каналы</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Ключи</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Добавить _Cdrom" + +#~ msgid "Installation Media" +#~ msgstr "Установочный носитель" + +#~ msgid "Software Preferences" +#~ msgstr "Параметры приложений" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Канал</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Компоненты</b>" + +#~ msgid "Add Channel" +#~ msgstr "Добавить канал" + +#~ msgid "Edit Channel" +#~ msgstr "Изменить канал" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "Добавить канал" + +#~ msgid "_Custom" +#~ msgstr "_Выбрать" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Обновления безопасности Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Обновления безопасности Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Обновления Ubuntu 5.10" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Обновления Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Backports" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:44+0000\n" "Last-Translator: Steve Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" @@ -24,70 +24,114 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<B B" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Kwinjiza porogaramu" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Ibihuzagihe bya porogaramumudasobwa" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 #, fuzzy msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 #, fuzzy msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -95,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -113,20 +157,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -134,23 +178,23 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -158,11 +202,11 @@ msgid "" msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -171,15 +215,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -192,11 +236,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -205,43 +249,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "i Urufunguzo" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -250,35 +294,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -287,50 +331,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Muyobozi ni" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -338,20 +382,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Byarangiye" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -425,70 +469,72 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 #, fuzzy msgid "Your system has already been upgraded." msgstr "Sisitemu" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -507,7 +553,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -528,8 +574,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -683,11 +728,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "ni a Gishya Bya Bihari" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -696,109 +746,92 @@ msgstr "" "Kuri Gufungura Amahinduka Kugenzura... NIBA ni Gikora Interineti Ukwihuza" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 #, fuzzy msgid "The following updates will be skipped:" msgstr "OYA" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, fuzzy, python-format msgid "Version %s: \n" msgstr "Verisiyo \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Iyimura... i" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Sisitemu ni Hejuru Kuri Itariki" -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<B B" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ikwirakwiza... ni Oya" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -806,7 +839,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -814,151 +847,188 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Amahinduka" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Isobanuramiterere" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Ibihuzagihe bya porogaramumudasobwa" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 #, fuzzy msgid "U_pgrade" msgstr "Byarangiye" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Kwinjiza porogaramu" -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<B B" +msgid "changes" +msgstr "Amahinduka" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<B B" -#: ../data/SoftwareProperties.glade.h:3 +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 #, fuzzy -msgid "<b>Keys</b>" +msgid "<b>Internet updates</b>" msgstr "<B B" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<B B" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Mburabuzi Utubuto" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Ibihuzagihe bya porogaramumudasobwa" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -968,88 +1038,69 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<B B" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 #, fuzzy msgid "<b>Comment:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<B B" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 #, fuzzy msgid "<b>Distribution:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 #, fuzzy msgid "<b>Type:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 #, fuzzy msgid "<b>URI:</b>" msgstr "<B B" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 #, fuzzy msgid "APT line:" msgstr "Umurongo" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 #, fuzzy msgid "" "Binary\n" "Source" msgstr "Inkomoko" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -#, fuzzy -msgid "_Custom" -msgstr "Guhanga" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Kongera Gutangiza" @@ -1102,131 +1153,296 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -#, fuzzy -msgid "Software Properties" -msgstr "Ibihuzagihe bya porogaramumudasobwa" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "5" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Kigenga" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Kigenga" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "5" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "5" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 +#. Description +#: ../data/channels/Ubuntu.info.in:134 #, fuzzy -msgid "Restricted copyright" -msgstr "Uburenganzira bw'umuhimbyi" +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +#, fuzzy +msgid "Ubuntu 5.10 Security Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +#, fuzzy +msgid "Ubuntu 5.10 Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "5" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 #, fuzzy msgid "Non-free (Multiverse)" msgstr "Kigenga" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +#, fuzzy +msgid "Restricted copyright" +msgstr "Uburenganzira bw'umuhimbyi" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "5" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "5" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "4. 10" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "5" +#~ msgid "Hide details" +#~ msgstr "<B B" + +#, fuzzy +#~ msgid "<b>Channels</b>" +#~ msgstr "<B B" + +#, fuzzy +#~ msgid "<b>Keys</b>" +#~ msgstr "<B B" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<B B" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "<b>Components</b>" +#~ msgstr "<B B" + +#, fuzzy +#~ msgid "_Custom" +#~ msgstr "Guhanga" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "5" #, fuzzy -#~ msgid "Ubuntu 5.10 Security Updates" +#~ msgid "Ubuntu 6.06 LTS Security Updates" #~ msgstr "5" #, fuzzy -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "5" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" #~ msgstr "5" #, fuzzy @@ -1252,10 +1468,6 @@ msgstr "" #~ msgstr "Kongerakuyitangiza i Ibisobanuro Bivuye i Seriveri" #, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Ibihuzagihe bya porogaramumudasobwa" - -#, fuzzy #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1269,10 +1481,6 @@ msgstr "" #~ 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" @@ -1423,10 +1631,6 @@ msgstr "" #~ "Ibyangombwa HTTP www org kugirango Ibisobanuro" #, fuzzy -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "ni a Gishya Bya Bihari" - -#, fuzzy #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 17:32+0000\n" "Last-Translator: Peter Chabada <ubuntu@chabada.sk>\n" "Language-Team: Slovak <sk-i18n@linux.sk>\n" @@ -17,65 +17,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural= (n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Denne" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Každý druhý deň" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Raz týždenne" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Každý druhý týždeň" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Každých %s dní" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Po jednom týždni" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Po dvoch týždňoch" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Po mesiaci" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Po %s dňoch" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Nainštalovať _aktualizácie" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Aktualizácie softvéru" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Zdrojový" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Zdrojový" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importovať kľúč" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Chyba pri importovaní vybraného súboru" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Vybraný súbor nie je autentifikačným kľúčom GPG alebo je poškodený." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Chyba pri odstraňovaní kľúča" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Vybraný kľúč nebolo možné odstrániť. Nahláste to ako chybu." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -86,11 +132,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Prosím, zadajte názov disku" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Prosím, vložte disk do mechaniky:" @@ -106,20 +152,20 @@ msgstr "" "Váš systém obsahuje poškodené balíky, ktoré nemôžu byť týmto programom " "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Nemôžem aktualizovať požadované meta-balíky" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Musel by byť odstránený dôležitý balík" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Nemôžem vypočítať aktualizáciu" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -128,11 +174,11 @@ msgstr "" "ako chybu. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Chyba pri overovaní niektorých balíkov" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -142,23 +188,23 @@ msgstr "" "problémom v sieti. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam " "neoverených balíčkov." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Nemôžem inštalovať '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Požadovaný balík nebolo možné nainštalovať. Nahláste to ako chybu. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Nemôžem odhadnúť meta balík." -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -171,15 +217,15 @@ msgstr "" "Pred pokračovaním nainštalujte jeden z vyššie uvedených balíkov pomocou " "Synapticu alebo apt-get." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Čítam vyrovnávaciu pamäť cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Nebol nájdený vhodný server" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -199,11 +245,11 @@ msgstr "" "Pokiaľ zvolíte 'Nie', súbor nebude zmenený." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -217,11 +263,11 @@ msgstr "" "Majú byť pridané štandardné záznamy pre '%s'? Pokiaľ zvolíte 'Nie', súbor " "nebude zmenený." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Neplatná informácia o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -229,11 +275,11 @@ msgstr "" "Aktualizácia informácií o zdrojoch softvéru skončila neplatným súborom. " "Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Zdroje tretích strán sú zakázané" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -243,11 +289,11 @@ msgstr "" "Môžete ich povoliť po upgrade pomocou nástroja 'vlastnosti-softwaru' alebo " "pomocou synapticu." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Chyba počas aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -255,11 +301,11 @@ msgstr "" "Počas aktualizácie sa objavil problém, ktorý je zvyčajne spôsobený chybou " "sieťového pripojenia, preto skontrolujte vaše pripojenie a skúste znova." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Nedostatok voľného miesta na disku" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -271,15 +317,15 @@ msgstr "" "súborov z predchádzajúcich inštalácií pomocou príkazu 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Chcete začať s aktualizáciou?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Nebolo možné nainštalovať aktualizácie" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -287,11 +333,11 @@ msgstr "" "Aktualizácia teraz skončí. Váš systém môže byť v nepoužiteľnom stave, preto " "bol spustený príkaz na zotavenie sa z tohto stavu (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Nebolo možné stiahnuť požadované balíky" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -299,11 +345,11 @@ msgstr "" "Aktualizácia bola neočakávane prerušená. Skontrolujte svoje internetové " "pripojenie alebo inštalačné médiá a skúste znova. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Niektoré programy už nie sú viac oficiálne podporované" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -317,23 +363,23 @@ msgstr "" "Pokiaľ nemáte zapnutý komunitou spravovaný zdroj softvéru 'universe', budú " "tieto balíky v ďalšom kroku navrhnuté na odstránenie. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Odstrániť zastarané balíky?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Preskočiť tento krok" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Odstrániť" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Chyba počas potvrdzovania" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -342,26 +388,26 @@ msgstr "" "uvedené správy. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Obnovuje sa pôvodný stav systému" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Kontrola správcu balíkov" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Aktualizácia informácií o zdrojoch softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Neplatná informácia o balíku" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -372,19 +418,19 @@ msgstr "" "s'.\n" "To znamená závažný problém. Nahláste to ako chybu." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Požaduje sa potvrdenie" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Prebieha aktualizácia" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Vyhľadávanie zastaraného softvéru" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Aktualizácia systému je dokončená." @@ -458,11 +504,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Príkaz 'diff' nebol nájdený." -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Nastala závažná chyba" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -474,7 +520,9 @@ msgstr "" "Váš pôvodný súbor 'sources.list' bol uložený ako /etc/apt/sources.list." "distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -482,7 +530,7 @@ msgstr[0] "Bude odstránený %s balík." msgstr[1] "Budú odstránené %s balíky." msgstr[2] "Bude odstránených %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -490,7 +538,7 @@ msgstr[0] "Bude nainštalovaný %s nový balík." msgstr[1] "Budú nainštalované %s nové balíky." msgstr[2] "Bude nainštalovaných %s nových balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -498,41 +546,41 @@ msgstr[0] "Bude aktualizovaný %s balík." msgstr[1] "Budú aktualizované %s balíky." msgstr[2] "Bude aktualizovaných %s balíkov." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Musíte stiahnuť celkom %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "Aktualizácia môže trvať niekoľko hodín a nemôže byť neskôr prerušená." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" "Pre zamedzenie straty dát, zavrite všetky otvorené programy a dokumenty." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Nemôžno nájsť žiadne aktualizácie" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Váš systém už bol aktualizovaný." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Odstrániť %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Inštalovať %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Aktualizovať %s" @@ -553,7 +601,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -578,8 +626,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Spustiť aktualizáciu?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Prebieha aktualizácia na Ubuntu 6.06 " "LTS</span>" @@ -738,11 +786,16 @@ msgstr "Sťahovanie súboru %li z %li pri %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Sťahovanie súboru %li z %li pri nezámej rýchlosti" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Zoznam zmien ešte nie je k dispozícii. Skúste neskôr." -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -751,11 +804,11 @@ msgstr "" "pripojenie." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Nebolo možné nainštalovať všetky dostupné aktualizácie" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -766,30 +819,30 @@ msgstr "" "balíkov \"Synaptic\" alebo spustite \"sudo apt-get dist-upgrade\" v " "termináli." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Nasledujúce balíky nebudú aktualizované:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Verzia %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Získava sa zoznam zmien..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Veľkosť na stiahnutie: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Váš systém je aktuálny" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -797,32 +850,24 @@ msgstr[0] "Môžete nainštalovať %s aktualizáciu" msgstr[1] "Môžete nainštalovať %s aktualizácie" msgstr[2] "Môžete nainštalovať %s aktualizácií" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Skryť podrobnosti" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Zobraziť podrobnosti" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Čakajte prosím, toto môže chvíľu trvať." -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Aktualizácia je dokončená" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Nová verzia: %s (veľkosť: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Vaša distribúcia už nie je podporovaná" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -833,27 +878,17 @@ msgstr "" "Pre viac informácií o prechode na novšiu verziu si pozrite http://www.ubuntu." "com.\"" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Naraz môže byť spustený len jeden program na správu softvéru" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" -"Musíte najprv zavrieť ostatné programy na správu softvéru, ako napr. " -"'aptitude' alebo 'Synaptic'." - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Index softvéru je poškodený" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -863,7 +898,7 @@ msgstr "" "Na odstránenie tohto problému použite správcu balíkov 'Synaptic' alebo " "spustite 'sudo apt-get install -f' v termáli." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -876,7 +911,7 @@ msgstr "" "správanie môžete nastaviť v ponuke menu 'Systém' -> 'Správa' -> 'Vlastnosti " "softvéru'." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -888,43 +923,47 @@ msgstr "" "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " "zraniteľnosti alebo poskytujú nové vlastnosti." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Udržujte si systém v aktuálnom stave</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "_Zrušiť sťahovanie" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Zmeny" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Skontrolovať" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Skontrolovať, či zdroje softvéru neobsahujú nové aktualizácie" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Popis" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Poznámky k vydaniu" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Zobraziť priebeh jednotlivých súborov" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Aktualizácie softvéru" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -932,63 +971,85 @@ msgstr "" "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné " "zraniteľnosti alebo poskytujú nové vlastnosti." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Aktualizovať" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Aktualizovať na najnovšiu verziu Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Skontrolovať" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Túto správu už viac nezobrazovať" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "Nainštalovať _aktualizácie" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Zdroje</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Zmeny" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internetové aktualizácie</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Kľúče</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internetové aktualizácie</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Pridať _CD" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentifikácia" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Zmazať stiahnuté inštalačné balíčky:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Sťahovanie je dokončené" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Inštalačné média" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internetové aktualizácie" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -996,39 +1057,55 @@ msgstr "" "Automaticky budú inštalované iba bezpečnostné aktualizácie z oficiálnych " "Ubuntu serverov." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_Obnoviť predvolené" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Obnoviť pôvodné kľúče distribúcie" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Predvoľby softvéru" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "<b>Zdroje softvéru</b>" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Zdrojový" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_Kontrolovať aktualizácie:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Stiahnuť aktualizácie automaticky, no neinštalovať ich" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "Importovať _kľúč" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Bezpečnostné aktualizácie inštalovať automaticky bez potvrdenia" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1045,40 +1122,33 @@ msgstr "" "\n" "Potrebujete na to funkčné internetové pripojenie." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Zdroj:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Komentár:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Súčasti:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Súčasti:</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribúcia:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>Adresa:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Zadajte kompletný APT riadok zdroja softvéru, ktorý chcete pridať</" @@ -1087,15 +1157,11 @@ msgstr "" "APT riadok obsahuje typ, umiestnenie a súčasti zdrojov softvéru. Napr.: <i>" "\"deb·http://ftp.debian.org·sarge·main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT riadok:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Pridať zdroj" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1103,24 +1169,21 @@ msgstr "" "Binárny\n" "Zdrojový" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Upraviť zdroje" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Zdrojový" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Prehľadáva sa CD" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Pridať zdroj" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Vlastný" +msgid "_Add Source" +msgstr "Zdrojový" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Obnoviť" @@ -1178,119 +1241,316 @@ msgid "The window size" msgstr "Veľkosť okna" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Nastaviť zdroje softvéru a internetové aktualizácie" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Vlastnosti softvéru" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 - aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +#, fuzzy +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Udržiavané komunitou (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Neslobodné (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Neslobodné (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS - bezpečnostné aktualizácie" +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS - aktualizácie" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS - backporty" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Oficiálne podporované" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "S obmedzujúcou licenciou" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 - aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 - backporty" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 - aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 - backporty" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Udržiavané komunitou (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Neslobodné (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Oficiálne podporované" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "S obmedzujúcou licenciou" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 aktualizácie" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 - backporty" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" - bezpečnostné aktualizácie" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "Softvér kompatibilný s DFSG bez závislostí na neslobodnom softvére" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Softvér nekompatibilný s DFSG" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "Skryť podrobnosti" + +#~ msgid "Show details" +#~ msgstr "Zobraziť podrobnosti" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Naraz môže byť spustený len jeden program na správu softvéru" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "" +#~ "Musíte najprv zavrieť ostatné programy na správu softvéru, ako napr. " +#~ "'aptitude' alebo 'Synaptic'." + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Zdroje</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Kľúče</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Pridať _CD" + +#~ msgid "Installation Media" +#~ msgstr "Inštalačné média" + +#~ msgid "Software Preferences" +#~ msgstr "Predvoľby softvéru" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Zdroj:</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Súčasti:</b>" + +#~ msgid "Add Channel" +#~ msgstr "Pridať zdroj" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "Edit Channel" +#~ msgstr "Upraviť zdroje" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 - bezpečnostné aktualizácie" +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Pridať zdroj" + +#~ msgid "_Custom" +#~ msgstr "_Vlastný" + +#~ msgid "Software Properties" +#~ msgstr "Vlastnosti softvéru" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 - aktualizácie" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 - backporty" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS - bezpečnostné aktualizácie" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS - aktualizácie" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS - backporty" #~ msgid "No valid entry found" #~ msgstr "Nebol nájdený žiadny platný záznam" @@ -1378,9 +1638,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Sekcie:</b>" -#~ msgid "Oficially supported" -#~ msgstr "Oficiálne podporované" - #~ msgid "Edit software sources and settings" #~ msgstr "Upraviť zdroje a nastavenia softvéru" @@ -1505,21 +1762,6 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "Binary" #~ msgstr "Binárny" -#~ msgid "Source" -#~ msgstr "Zdrojový" - -#~ msgid "CD disk with Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "Disk s Ubuntu 5.04 \"Hoary Hedgehog\"" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "Disk s Ubuntu 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 bezpečnostné aktualizácie" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 aktualizácie" - #~ msgid "Contributed software" #~ msgstr "Softvér závislý na neslobornom softvéri" @@ -1631,8 +1873,5 @@ msgstr "Softvér nekompatibilný s DFSG" #~ msgid "A_uthentication" #~ msgstr "A_utentifikácia" -#~ msgid "<b>Software Sources</b>" -#~ msgstr "<b>Zdroje softvéru</b>" - #~ msgid "<b>Packages to install:</b>" #~ msgstr "<b>Balíky na inštaláciu:</b>" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:41+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-27 12:27+0000\n" "Last-Translator: Dejan Milosavljevic <dejan@wavebone.net>\n" "Language-Team: Serbian <sr@li.org>\n" @@ -18,65 +18,108 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Svaki dan" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Svaki drugi dan" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Svake nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Svake druge nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Svakih %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Posle jedne nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Posle dve nedelje" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Posle jednog meseca" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Posle %s dana" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importiranje kljuca" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,54 +145,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +201,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +222,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,42 +235,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -236,35 +279,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -273,49 +316,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -323,19 +366,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -407,18 +450,20 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -426,7 +471,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:451 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -434,7 +479,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:457 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -442,40 +487,40 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:467 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:470 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:476 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:477 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:492 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -494,7 +539,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -515,8 +560,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -665,52 +709,56 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -718,64 +766,48 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -783,7 +815,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -791,143 +823,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -937,74 +1005,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1056,101 +1108,228 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:18+0000\n" "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -17,67 +17,114 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Dagligen" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Varannan dag" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Varje vecka" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Varannan vecka" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Var %s:e dag" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Efter en vecka" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Efter två veckor" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Efter en månad" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Efter %s dagar" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "%d uppdateringar" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, fuzzy, python-format +msgid "Server for %s" +msgstr "Server" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Programvaruuppdateringar" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +#, fuzzy +msgid "Active" +msgstr "Aktivera" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Källkod" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Källkod" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Importera nyckel" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Fel vid importing av vald fil" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Den valda filen verkar inte vara en GPG-nyckel eller så är filen trasig." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Fel vid borttagning av nyckeln" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Nyckeln du valde kan inte tas bort. Var vänlig anmäl detta som en bugg." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -88,11 +135,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Skriv in ett namn på skivan" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Sätt in en skiva i enheten:" @@ -109,20 +156,20 @@ msgstr "" "programmet. Reparera dem först med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Kan inte uppdatera obligatoriska meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Ett grundläggande paket skulle behöva tas bort" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Kunde inte beräkna uppdateringen" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " @@ -131,11 +178,11 @@ msgstr "" "vänlig rapportera detta som en bugg. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Det gick inte att autentisiera vissa paket" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -145,12 +192,12 @@ msgstr "" "nätverksfel. Det kan hjälpa med att försöka senare. Se nedan för en lista " "med icke autentisierade paket." -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Kan inte installera \"%s\"" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " @@ -159,11 +206,11 @@ msgstr "" "rapportera detta som en bugg. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Kan inte gissa meta-paket" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -177,15 +224,15 @@ msgstr "" " Installera ett av dessa paket med synaptic eller apt-get innan du " "fortsätter." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Läser cache" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Hittade ingen giltig serverspegel" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -205,11 +252,11 @@ msgstr "" "Om du väljer \"nej\" kommer uppdateringen avbrytas." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "Lägg till standardförråd?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -222,11 +269,11 @@ msgstr "" "Ska standardposter för \"%s\" läggas till? Om du väljer \"Nej\" kommer " "uppdateringen avbrytas." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Information om förråd ogiltig" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." @@ -234,11 +281,11 @@ msgstr "" "Uppdatering av förrådsinformationen orsakade en ogiltig fil. Var vänlig " "rapportera detta som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Tredjepartskällor inaktiverade" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -248,11 +295,11 @@ msgstr "" "aktivera dem efter uppgraderingen med verktyget \"software-properties\" " "eller med synaptic." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Fel vid uppdatering" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -261,11 +308,11 @@ msgstr "" "av nätverksproblem, var god kontrollera din nätverksanslutning och försök " "igen." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Inte tillräckligt med ledigt diskutrymme" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -277,15 +324,15 @@ msgstr "" "använda 'sudo apt-get clean'." #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Vill du starta uppdateringen?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Det gick inte att installera uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -293,11 +340,11 @@ msgstr "" "Uppgraderingen avbryts nu. Ditt system kan vara i ett oanvändbart tillstånd. " "En återställning kördes (dpkg --configure -a)." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Det gick inte ladda ner uppgraderingarna" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -305,11 +352,11 @@ msgstr "" "Uppdateringen avbryts nu. Var god kontrollera din internetanslutning eller " "ditt installationsmedia och försök igen. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "Viss programvara har inte längre officiellt stöd" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -321,23 +368,23 @@ msgstr "" "gemenskapsunderhållna ('universe').Om du inte har 'universe' aktiverat " "kommer dessa paket föreslås för borttagning i nästa steg. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "Ta bort föråldrade paket?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_Hoppa över det här steget" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Ta bort" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "Fel inträffade vid utförandet" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -346,26 +393,26 @@ msgstr "" "information. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "Återställer systemstatus" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Kontrollerar pakethanterare" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Uppdaterar förrådsinformation" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Ogiltig paketinformation" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -376,19 +423,19 @@ msgstr "" "nödvändiga paketet \"%s\" längre.\n" "Det här tyder på ett alvarligt fel, var god och rapportera detto som en bugg." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Ber om bekräftelse" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Uppgraderar" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Söker efter föråldrad mjukvara" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Systemuppdateringen är klar." @@ -462,11 +509,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "Kommandot \"diff\" hittades inte" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Ett kritiskt fel uppstod" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -477,62 +524,64 @@ msgstr "" "avbryts nu.\n" "Din ursprungliga sources.list sparades i /etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s paket kommer att tas bort." msgstr[1] "%s paket kommer att tas bort." -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s nytt paket kommer att installeras." msgstr[1] "%s nya paket kommer att installeras." -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s paket kommer att uppgraderas." msgstr[1] "%s paket kommer att uppgraderas." -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Du behöver ladda ner totalt %s." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Uppdateringen kan ta flera timmar och kan inte avbrytas någon gång senare." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "Stäng alla öppna program och dokument för att undvika dataförlust." #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Kunde inte hitta några uppgraderingar" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Ditt system har redan uppgraderats." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>Ta bort %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "Installera %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "Uppgradera %s" @@ -552,7 +601,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -578,8 +627,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Starta uppgraderingen?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Uppdaterar till Ubuntu 6.06 LTS</span>" @@ -740,11 +789,16 @@ msgstr "Hämtar hem fil %li av %li i %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Hämtar hem fil %li av %li med okänd hastighet" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "Listan med ändringar är inte tillgänglig än. Försök igen senare" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -753,11 +807,11 @@ msgstr "" "internetanslutning." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "Det går inte att installera alla tillgängliga uppdateringar" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -768,62 +822,54 @@ msgstr "" "kör \"sudo apt-get dist-upgrade\" i en terminal för att uppdatera ditt " "system helt och hållet." -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "Följande uppdateringar kommer att hoppas över" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Version %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "Hämtar lista med ändringar..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "Nerladdningsstorlek: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "Ditt system är uppdaterat" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "Du kan installera %s uppdatering" msgstr[1] "Du kan installera %s uppdateringar" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "Dölj detaljer" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "Visa detaljer" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "Var god vänta, det här kan ta lite tid" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "Uppdateringen är färdig" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "Ny version: %s (Storlek: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "Din distribution stöds inte längre" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -833,25 +879,17 @@ msgstr "" "till en senare version av Ubuntu Linux. Se http://www.ubuntu.com för mer " "information om att uppgradera." -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "Endast ett programvaruhanteringsverktyg tillåts att köra samtidigt" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "Stäng det andra programmet först, t.ex. 'aptitude' eller 'Synaptic'" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "Indexet för program är trasigt" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -861,7 +899,7 @@ msgstr "" "packethanteraren \"Synaptic\" eller kör \"sudo apt-get install -f\" i en " "terminal för att rätta till det här problemet först." -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -874,7 +912,7 @@ msgstr "" "detta beteende i \"System\" -> \"Administration\" -> " "\"Programvaruinställningar\"" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -886,43 +924,47 @@ msgstr "" "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " "funktioner." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>Håll ditt system uppdaterat</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Avbryt _nedladdningen" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Ändringar" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "_Kontrollera" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "Kontrollera programvarukanalerna efter nya uppdateringar" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Beskrivning" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "Versionsinformation" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "Visa förlopp för enstaka filer" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Programvaruuppdateringar" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." @@ -930,63 +972,86 @@ msgstr "" "Mjukvaruuppdateringar fixar fel, eliminerar säkerhetsproblem och ger dig nya " "funktioner." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_Uppdateringar" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "Uppdatera till senaste versionen av Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "_Kontrollera" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_Dölj denna information i framtiden" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_Installera uppdateringar" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>Kanaler</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "Ändringar" + +#: ../data/glade/UpdateManager.glade.h:24 +#, fuzzy +msgid "updates" +msgstr "Uppdateringar" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internetuppdateringar</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Nycklar</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "Lägg till _CD" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internetuppdateringar</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Autentisering" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_Ta bort nerladdade programfiler:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Hämtningslogg" + +#: ../data/glade/SoftwareProperties.glade.h:12 msgid "Import the public key from a trusted software provider" msgstr "Importera den publika nyckeln från en betrodd mjukvaruutgivare" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" -msgstr "Installationsmedia" - -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internetuppdateringar" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" @@ -994,39 +1059,56 @@ msgstr "" "Bara säkerhetsuppdateringar från de officiella Ubuntuservrarna kommer " "installeras automatiskt" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_Återställ standardalternativ" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "Återställ standardnycklarna för din distribution" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Programvaruinställningar" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" +msgstr "Programvarukällor" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Källkod" + +#: ../data/glade/SoftwareProperties.glade.h:19 +#, fuzzy +msgid "Statistics" +msgstr "Status" + +#: ../data/glade/SoftwareProperties.glade.h:20 +#, fuzzy +msgid "Submit statistical information" +msgstr "Hämta användningsinformation" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "Kolla efter uppdateringar _automatiskt:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_Hämta uppdateringar i bakgrunden, men installera dem inte" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_Installera säkerhetsuppdateringar utan bekräftelse" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -1042,40 +1124,33 @@ msgstr "" "\n" "Du behöver en fungerande internetanslutning för att kunna fortsätta." -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>Kanal</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Kommentar:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>Komponenter:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>Komponenter</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Distribution:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Typ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Skriv in hela APT-raden till kanalen du vill lägga till</b></big>\n" @@ -1083,15 +1158,11 @@ msgstr "" "APT-raden innehåller typ, plats och komponenter för en kanal, till exempel " "<i>\"deb http://ftp.debian.org sarge main\"</i>." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT-rad:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "Lägg till kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1099,24 +1170,21 @@ msgstr "" "Binär\n" "Källkod" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Redigera kanal" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Redigera tjänster" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "Söker igenom CD-skivan" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 #, fuzzy -msgid "_Add Channel" -msgstr "_Lägg till kanal" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "An_passad" +msgid "_Add Source" +msgstr "Lägg till tjänst" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Läs om" @@ -1175,120 +1243,316 @@ msgid "The window size" msgstr "Fönsterstorleken" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "Konfigurera programkanaler och internetuppdateringar" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Programvaruegenskaper" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Uppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Gemenskapsunderhållen (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Ickefri (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Ickefri (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 Uppdateringar" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 \"Dapper Drake\"" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Säkerhetsuppdateringar" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS Uppdateringar" +#: ../data/channels/Ubuntu.info.in:104 +#, fuzzy +msgid "Recommended updates" +msgstr "%d uppdateringar" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Bakåtportar" +#: ../data/channels/Ubuntu.info.in:111 +#, fuzzy +msgid "Backported updates" +msgstr "%d uppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Stöds officiellt" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Begränsad upphovsrätt" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Uppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 Bakåtportar" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Uppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 Bakåtportar" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Gemenskapsunderhållen (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Ickefri (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "Stöds officiellt" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Begränsad upphovsrätt" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Uppdateringar" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 Bakåtportar" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" Säkerhetsuppdateringar" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (testing)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "http://ftp.se.debian.org/debian/" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (unstable)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "DFSG-kompatibel programvara med icke-fria beroenden" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "Inte DFSG-kompatibel programvara" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 \"Dapper Drake\"" +#~ msgid "Hide details" +#~ msgstr "Dölj detaljer" + +#~ msgid "Show details" +#~ msgstr "Visa detaljer" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "Endast ett programvaruhanteringsverktyg tillåts att köra samtidigt" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "Stäng det andra programmet först, t.ex. 'aptitude' eller 'Synaptic'" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Kanaler</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Nycklar</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "Lägg till _CD" + +#~ msgid "Installation Media" +#~ msgstr "Installationsmedia" + +#~ msgid "Software Preferences" +#~ msgstr "Programvaruinställningar" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Kanal</b>" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Komponenter</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Säkerhetsuppdateringar" +#~ msgid "Add Channel" +#~ msgstr "Lägg till kanal" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Uppdateringar" +#~ msgid "Edit Channel" +#~ msgstr "Redigera kanal" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 Bakåtportar" +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "_Lägg till kanal" + +#~ msgid "_Custom" +#~ msgstr "An_passad" + +#~ msgid "Software Properties" +#~ msgstr "Programvaruegenskaper" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 Uppdateringar" + +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS Säkerhetsuppdateringar" + +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS Uppdateringar" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS Bakåtportar" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -1385,9 +1649,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ "APT-raden innehåller typ, plats och avdelningar för kanalen, till exempel " #~ "<i>\"deb http://ftp.debian.org sarge main\"</i>." -#~ msgid "Oficially supported" -#~ msgstr "Stöds officiellt" - #~ msgid "Installing updates" #~ msgstr "Installerar uppdateringar" @@ -1402,10 +1663,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgstr "Läs om paketinformationen från servern." #, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Programvaruuppdateringar" - -#, fuzzy #~ msgid "Could not add any software channels" #~ msgstr "inte installerad" @@ -1555,9 +1812,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Binary" #~ msgstr "Binär" -#~ msgid "Source" -#~ msgstr "Källkod" - #~ msgid "CD" #~ msgstr "CD" @@ -1570,9 +1824,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "US export restricted software" #~ msgstr "Programvara med USA-exportbegränsningar" -#~ msgid "Software Sources" -#~ msgstr "Programvarukällor" - #~ msgid "Sources" #~ msgstr "Källor" @@ -1685,9 +1936,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Activation Code:" #~ msgstr "Aktiveringskod:" -#~ msgid "Activate" -#~ msgstr "Aktivera" - #~ msgid "Please fill in both email and activation code." #~ msgstr "Fyll i både e-postadress och aktiveringskod." @@ -2117,9 +2365,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Print client version and exit" #~ msgstr "Skriv ut klientversionsnummer och avsluta" -#~ msgid "Get usage information" -#~ msgstr "Hämta användningsinformation" - #~ msgid "Usage: %s <options> ..." #~ msgstr "Användning: %s <flaggor> ..." @@ -2195,9 +2440,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Info" #~ msgstr "Info" -#~ msgid "Status" -#~ msgstr "Status" - #~ msgid "Patches" #~ msgstr "Programfixar" @@ -2312,9 +2554,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "All Packages" #~ msgstr "Alla paket" -#~ msgid "Updates" -#~ msgstr "Uppdateringar" - #~ msgid "Uninstalled Packages" #~ msgstr "Avinstallerade paket" @@ -2399,9 +2638,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Choose file to write XML to" #~ msgstr "Välj fil att skriva XML till" -#~ msgid "Edit Services" -#~ msgstr "Redigera tjänster" - #~ msgid "URL" #~ msgstr "URL" @@ -2411,9 +2647,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "_Add service" #~ msgstr "_Lägg till tjänst" -#~ msgid "Add Service" -#~ msgstr "Lägg till tjänst" - #~ msgid "Service URL" #~ msgstr "Tjänst-URL" @@ -2557,9 +2790,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Unable to mount '%s' as a channel" #~ msgstr "Kan inte montera \"%s\" som en kanal" -#~ msgid "Server" -#~ msgstr "Server" - #~ msgid "Server URL:" #~ msgstr "Server-URL:" @@ -3086,9 +3316,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "1 update" #~ msgstr "1 uppdatering" -#~ msgid "%d updates" -#~ msgstr "%d uppdateringar" - #~ msgid "" #~ "The following packages from this channel are currently installed on your " #~ "system." @@ -3281,9 +3508,6 @@ msgstr "Inte DFSG-kompatibel programvara" #~ msgid "Unable to create directory %s for local package storage" #~ msgstr "Kan inte skapa katalogen %s för lokal paketlagring" -#~ msgid "Download Log" -#~ msgstr "Hämtningslogg" - #~ msgid "Verification Log" #~ msgstr "Verifieringslogg" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-24 16:44+0000\n" "Last-Translator: Roys Hengwatanakul <roysheng@msn.com>\n" "Language-Team: Thai <th@li.org>\n" @@ -16,65 +16,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "ทุกวัน" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "ทุก 2 วัน" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "ทุกอาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "ทุก 2 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "ทุก %s วัน" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "หลังจาก 1 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "หลังจาก 2 อาทิตย์" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "หลังจาก 1 เดือน" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "หลังจาก %s วัน" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "_ติดตั้งปรัยปรุง" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "ซอฟต์แวร์ปรับปรุง" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "นำเข้ากุญแจ" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "ไม่สามารถนำเข้าไฟล์ที่เลือกไว้" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "ไฟล์ที่เลือกไว้อาจจะไม่ใช่ GPG กุญแจไฟล์หรืออาจจะเสียหาย" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "มีปัญหาขณะลบกุจแจ" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "กุญแจที่คุณเลือกไม่สามารถลบออกได้ กรุณารายงานว่าเป็นปัญหา" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -85,11 +129,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "กรุณาใส่ชื่อสำหรับแผ่นดิสก์" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "กรุณาใส่แผ่นดิสก์เข้าไปในเครื่อง:" @@ -105,31 +149,31 @@ msgstr "" "ระบบของคุณมีแพกเกจที่มีปัญหาที่ไม่สามารถซ่อมได้ด้วยโปรแกรมนี้ กรุณาซ่อมโดยใช้โปรแกรม synaptic " "หรือ apt-get ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "ไม่สามารถปรับปรุง meta แพกเกจที่ต้องการได้" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "แพจเกจที่สำคัญจะถูกลบออก" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "ไม่สามารถคำนวนการปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "ไม่สามารถแก้ไขปัญหาที่เกิดขึ้นได้ขณะคำนวนการปรับปรุง กรุณารายงานว่านี่เป็นปัญหา " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "ไม่ปัญหาในการยืนยันว่าเป็บของจริงสำหรับบางแพกเกจ" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -138,23 +182,23 @@ msgstr "" "ไม่สามารถที่จะยืนยันความถูกต้องของแพกเกจบางอันได้ นี่อาจจะเกี่ยวกับปัญหาในด้านเครือข่าย " "คุณอาจจะลองอีกครั้งภายหลังก็ได้ กรุณาตรวจดูรายการของแพกเกจที่ไม่ผ่านการยืนยัน" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "ไม่สามารถติดตั้ง '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "ไม่สามารถที่จะติดตั้งแพกเกจที่ต้องการได้ กรุณารายงานว่าเป็นปัญหา " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "ไม่สามารถเดาเมททาแพกเกจ(meta-package)ได้" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -167,15 +211,15 @@ msgstr "" "กรุณาติดตั้งแพกเกจข้างบนอย่างใดอย่างหนึ่งก่อนโดยใช้โปรแกรม synaptic หรือโปรแกรม apt-get " "ก่อนดำเนินการต่อไป" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "กำลังอ่านจากที่เก็บชั่วคราว" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "ไม่เจอเซิรฟ์เวอร์เสริม(mirror)" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -194,11 +238,11 @@ msgstr "" "ถ้าคุณเลือก 'no' การปรับปรุงจะถูกยกเลิก" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "สร้าง default sources?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -210,21 +254,21 @@ msgstr "" "\n" "ควรเพิ่มรายการสำหรับ '%s' หรือไม่?ถ้าคุณเลือก 'No' การปรับปรุงจะถูกยกเลิก" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "ข้อมูลเกี่ยวกับแหล่งเก็บข้อมูลใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "การปรับปรุงข้อมูลของแหล่งข้อมูลทำให้ไฟล์เสียหาย กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "แหล่งอื่นๆใช้ไม่ได้" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -234,11 +278,11 @@ msgstr "" "คุณสามารถเปลี่ยนให้ใช้ได้หลังการปรับปรุงด้วยเครื่องมือ 'software-properties' " "หรือด้วยโปรแกรม synaptic" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "เกิดข้อผิดพลาดขณะปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -246,11 +290,11 @@ msgstr "" "มีปัญหาเกิดขึ้นขณะทำการปรับปรุง โดยปกติแล้วจะเป็นปัญหาด้านเครือข่าย " "กรุณาตรวจสอบการสื่อสารในเครือข่ายของคุณแล้วลองใหม่อีกที" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "ไม่มีพื้นที่ว่างในดิสก์เพียงพอ" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -261,15 +305,15 @@ msgstr "" "เทถังขยะทิ้งและลบแพกเกจชั่วคราวจากการติดตั้งครั้งก่อนโดยใช้คำสั่ง 'sudo apt-get clean'" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "คุณต้องการที่จะเริ่มการปรับปรุงหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "ไม่สามารถปรับปรุงได้" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -277,11 +321,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก ระบบของคุณอาจจะอยู่ในสภาพที่ไม่มั่นคง โปรแกรมกู้ระบบถูกเรียกใช้ (dpkg --" "configure -a)" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "ไม่สามารถดาวน์โหลดข้อมูลปรับปรุงรุ่น" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -289,11 +333,11 @@ msgstr "" "การปรับปรุงถูกยกเลิก กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณหรือ installation " "mediaและลองอีกครั้ง " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "ซอฟแวร์บางตัวไม่ได้รับการสนับสนุนอย่างเป็นทางการแล้ว" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -306,50 +350,50 @@ msgstr "" "\\n\n" "ถ้าคุณไม่ได้เลือกใช้แหล่งข้อมูล 'universe' แพกเกจเหล่านี้จะถูกแนะนำให้ลบออกในขั้นต่อไป " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "ลบแพจเกจที่ล้าสมัยทิ้งหรือไม่?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "_ข้ามขั้นตอนนี้" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "เ_อาออก" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "เกิดข้อผิดพลาดขณะแก้ไขปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "เกิดปัญหาขึ้นขณะทำการเก็บกวาด กรุณาตรวจสอบข้อความข้างล่างสำหรับรายละเอียดเพิ่มเติม " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 #, fuzzy msgid "Restoring original system state" msgstr "เริ่มระบบใหม่อีกครั้ง" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "กำลังตรวจสอบโปรแกรมจัดการแพกเกจ" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "ปรับปรุงข้อมูลของแหล่งข้อมูล" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "ข้อมูลของแพกเกจไม่ถูกต้อง" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -359,19 +403,19 @@ msgstr "" "หลังจากการปรับปรุงข้อมูลของแพจเกจ แพจเกจที่จำเป็น '%s'ได้หายไป\n" "นี่แสดงว่าเป็นปัญหาร้ายแรง กรุณารายงานว่าเป็นปัญหา" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "_ถามการยืนยันจากคุณก่อน" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "กำลังปรับปรุง" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "ค้นหาซอฟแวร์ที่ล้าสมัย" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "ปรับปรุงระบบเสร็จแล้ว" @@ -445,11 +489,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "ไม่เจอคำสั่ง 'diff'" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "เกิดข้อผิดพลาดอย่างร้ายแรง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -459,58 +503,60 @@ msgstr "" "upgrade-apt.log มาในรายงานของคุณ การปรับปรุงถูกยกเลิก\n" "ไฟล์เก่า sources.list ของคุณถูกเก็บไว้ที่ /etc/apt/sources.list.distUpgrade" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s แพกเกจจะถูกลบออก" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s แพกเกจใหม่จะถูกติดตั้ง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s แพกเกจจะถูกปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "คุณจะต้องดาวน์โหลดทั้งหมด %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "การปรับปรุงอาจจะใช้เวลานานหลายชั่วโมงและไม่สามารถที่จะยกเลิกได้หลังจากนี้ไป" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "เพื่อป้องกันข้อมูลสูญหายกรุณาออกจากทุกโปรแกรมและเอกสารที่เปิดอยู่" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "ไม่มีอะไรให้ปรับปรุง" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "ระบบของคุณได้ผ่านการปรับปรุงแล้ว" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>ลบออก %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "ติดตั้ง %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "ปรับปรุงรุ่น %s" @@ -529,7 +575,7 @@ msgstr "การปรับปรุงเสร็จสิ้นแล้ว #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -553,8 +599,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>เริ่มการปรับปรุงหรือไม่?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "<span weight=\"bold\" size=\"x-large\">กำลังปรับปรุงอูบันตู 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -703,11 +749,16 @@ msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li msgid "Downloading file %li of %li with unknown speed" msgstr "กำลังดาวน์โหลดไฟล์ %li จาก %li โดยไม่ทราบความเร็ว" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "รายการของการเปลี่ยนแปลงยังไม่มีให้ กรุณาลองอีกทีภายหลัง" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." @@ -715,11 +766,11 @@ msgstr "" "ไม่สามารถดาวน์โหลดรายการของการเปลี่ยนแปลง กรุณาตรวจสอบการสื่อสารทางอินเตอร์เน็ตของคุณ" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "ไม่สามารถปรับปรุงทั้งหมดที่มีได้" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -729,61 +780,53 @@ msgstr "" "ของโปรแกรมจัดการแพกเกจ \"Synaptic\" หรือใช้คำสั่ง \"sudo apt-get dist-upgrade\" " "ในเทอร์มินัล ในการปรับปรุงระบบของคุณให้เสร็จสิ้นสมบรูณ์" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "การปรับปรุงต่อไปนี้จะถูกข้ามไป:" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "รุ่น %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "กำลังดาวน์โหลดรายการของการเปลี่ยนแปลง..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "ขนาดดาวน์โหลด: %s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "ระบบของคุณทันสมัยแล้ว" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "คุณสามารถติดตั้ง %s รายการปรับปรุง" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "ซ่อนรายละเอียด" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "แสดงรายละเอียด" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "กรุณารอสักครู่ นี่อาจจะใช้เวลาสักหน่อย" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "ปรับปรุงเสร็จสิ้นแล้ว" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "รุ่นใหม่: %s (ขนาด: %s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "ชุดเผยแพร่(distribution)ของคุณไม่มีบริการสนับสนุนแล้ว" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -793,25 +836,17 @@ msgstr "" "ปรับปรุงขึ้นไปรุ่นถัดไปของอูบันตูลีนุกซ์ กรุณาอ่าน http://www.ubuntu.com " "สำหรับรายละเอียดเพิ่มเติมในการปรับปรุงรุ่น" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "มีเพียงเครื่องมือจัดการซอฟแวร์เดียวที่อนุญาตให้เรียกใช้พร้อมกันได้" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "กรุณาออกจากโปรแกรมอื่นๆเช่น 'aptitude' หรือ 'Synaptic' ก่อน" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "ดัชนีของซอฟแวร์เสียหาย" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -820,7 +855,7 @@ msgstr "" "ไม่สามารถที่จะติดตั้งหรือลบออกซอฟแวร์ใดๆ กรุณาใช้โปรแกรมจัดการแพกเกจ \"Synaptic\" หรือ " "คำสั่ง \"sudo apt-get install -f\" ในเทอร์มินัลเพื่อที่จะแก้ปัญหานี้ก่อน" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -832,7 +867,7 @@ msgstr "" "ระบบของคุณไม่ตรวจหารายการปรับปรุงโดยอัตโนมัตื คุณสามารถปรับแต่งใน\"System\" -> " "\"Administration\" -> \"Software Properties\"." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -843,143 +878,184 @@ msgstr "" "\n" "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>รักษาระบบของคุณให้ทันสมัย</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "ยกเลิก_ดาวน์โหลด" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "เปลี่ยนแปลง" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "ต_รวจ" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "ตรวจช่องซอฟแวร์สำหรับรายการปรับปรุงใหม่" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "คำบรรยาย" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "บันทึกรายการปรับปรุง" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "แสดงการคืบหน้าของแต่ละไฟล์" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "ซอฟต์แวร์ปรับปรุง" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "ซอฟแวร์ปรับปรุงแก้ปัญหา,กำจัดจุดอ่อนด้านความปลอดภัยและเพิ่มความสามารถใหม่" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "_ปรับปรุง" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "ปรับปรุงให้เป็นรุ่นล่าสุดของอูบันตู" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "เ_ลือก" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "_ซ่อนข้อมูลนี้ในคราวหน้า" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "_ติดตั้งปรัยปรุง" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>ช่อง</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "เปลี่ยนแปลง" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>กุญแจ</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>ปรับปรุงทางอินเทอร์เน็ต</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "เพิ่ม_ซีดีรอม" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "การยืนยันของจริง" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "_ลบซอฟแวร์ไฟล์ที่ดาวน์โหลด:" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "ดาวน์โหลดเสร็จแล้ว" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "ปรัปรุงทางอินเทอร์เน็ต" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "การปรับปรุงด้านความปลอดภัยจะติดตั้งโดยอัตโนมัติจากเซิรฟ์เวอร์ทางการของอูบันตูเท่านั้น" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "_คืนค่าปริยาย" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "คืนกุญแจเดืมของชุดเผยแพร่ของคุณ" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "กำหนดรายละเอียดปรับแต่งของซอฟแวร์" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "คุณสมบัติของซอฟแวร์" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "_ตรวจหารายการปรับปรุงโดยอัตโนมัติ:" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "_ดาวน์โหลดปรับปรุงอยู่เบื้องหลังแต่ยังไม่ต้องติดตั้ง" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "_นำเข้ากุญแจไฟล์" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "_ติดตั้งการปรับปรุงด้านความปลอดภัยโดยไม่ต้องถามก่อน" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -994,40 +1070,33 @@ msgstr "" "\n" "คุณจะต้องมีการสื่อสารทางอินเตอร์เน็ตที่ใช้งานได้ที่เพื่อที่จะดำเนินการต่อไป" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>ช่อง</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>หมายเหตุ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>องค์ประกอบ:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>องค์ประกอบ</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>ชุดเผยแพร่(Distribution):</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>ชนิด:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>กรุณาเติมให้ครบบรรทัด APT ของช่องที่คุณต้องการจะเพิ่ม</b></big>\n" @@ -1035,15 +1104,11 @@ msgstr "" "บรรทัด APT ประกอบด้วย ชนิด,สถานที่,ส่วนประกอบของช่อง เช่น <i>\"deb http://ftp.debian." "org sarge main\"</i>" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT line:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "เพิ่มช่องทาง" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1051,23 +1116,19 @@ msgstr "" "ไบนารี\n" "ซอร์ส" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "แก้ไขช่องทาง" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "ตรวจสอบแผ่นซีดี" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "_เพิ่มช่องทาง" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_กำหนดเอง" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "เ_รียกใหม่" @@ -1122,119 +1183,310 @@ msgid "The window size" msgstr "ขนาดของหน้าต่าง" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "ปรับแต่งช่องทางซอฟแวร์และปรับปรุงทางอินเตอร์เน็ต" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "คุณสมบัติของซอฟแวร์" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "อูบันตู 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "อูบันตู 5.10 Updates" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "อูบันตู 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "อูบันตู 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "อูบันตู 6.06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "ชุมชนดูแล (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "ไม่ฟรี(ลิขสิทธิ์)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "ไม่ฟรี(ลิขสิทธิ์)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "อูบันตู 6.06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "อูบันตู 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "อูบันตู 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "สนับสนุนอย่างเป็นทางการ" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "จำกัดลิขสิทธิ์" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "อูบันตู 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "อูบันตู 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "อูบันตู 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "อูบันตู 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "อูบันตู 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "อูบันตู 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "อูบันตู 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "อูบันตู 5.10 Backports" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "อูบันตู 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "ชุมชนดูแล (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "ไม่ฟรี(ลิขสิทธิ์)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "สนับสนุนอย่างเป็นทางการ" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "จำกัดลิขสิทธิ์" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "อูบันตู 5.10 Security Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "อูบันตู 5.10 Updates" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "อูบันตู 5.10 Backports" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "เดเบียน 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "เดเบียน 3.1 \"Sarge\" ปรับปรุงด้านความปลอดภัย" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "เดเบียน \"Etch\" (กำลังทดสอบ)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "เดเบียน \"Sid\" (ผันผวน)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "เข้ากับ DFSG ซอฟแวร์แต่ขึ้นอยู่กับไม่ฟรี" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "ไม่เข้ากับ DFSG ซอฟแวร์" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "อูบันตู 6.06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "ซ่อนรายละเอียด" + +#~ msgid "Show details" +#~ msgstr "แสดงรายละเอียด" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "มีเพียงเครื่องมือจัดการซอฟแวร์เดียวที่อนุญาตให้เรียกใช้พร้อมกันได้" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "กรุณาออกจากโปรแกรมอื่นๆเช่น 'aptitude' หรือ 'Synaptic' ก่อน" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>ช่อง</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>กุญแจ</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "เพิ่ม_ซีดีรอม" + +#~ msgid "Installation Media" +#~ msgstr "การติดตั้งมีเดีย" + +#~ msgid "Software Preferences" +#~ msgstr "กำหนดรายละเอียดปรับแต่งของซอฟแวร์" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>ช่อง</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>องค์ประกอบ</b>" + +#~ msgid "Add Channel" +#~ msgstr "เพิ่มช่องทาง" + +#~ msgid "Edit Channel" +#~ msgstr "แก้ไขช่องทาง" + +#~ msgid "_Add Channel" +#~ msgstr "_เพิ่มช่องทาง" + +#~ msgid "_Custom" +#~ msgstr "_กำหนดเอง" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "อูบันตู 5.10 'Breezy Badger'" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "อูบันตู 6.06 LTS" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "อูบันตู 5.10 Security Updates" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "อูบันตู 6.06 LTS Security Updates" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "อูบันตู 5.10 Updates" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "อูบันตู 6.06 LTS Updates" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "อูบันตู 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "อูบันตู 6.06 LTS Backports" #~ msgid "" #~ "The upgrade aborts now. Please free at least %s of disk space. Empty your " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Özgur KIRCALI <okircali@gmail.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -17,65 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Günlük" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Her iki günde bir" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Haftalık" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Her iki haftada bir" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Her %s günde bir" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Bir hafta sonra" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "İki hafta sonra" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Bir ay sonra" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s gün sonra" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Kanal Düzenle" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Anahtar aktar" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Seçili dosyayı aktarmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Seçili dosya bir GPG anahtar dosyası olmayabilir veya bozuk olabilir." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Anahtar kaldırmada hata" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Seçtiğiniz anahtar kaldırılamadı. Lütfen bunu bir hata olarak iletin." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -86,11 +130,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Lütfen disk için bir isim girin" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Lütfen sürücüye bir disk yerleştirin:" @@ -106,54 +150,54 @@ msgstr "" "Sisteminiz bu yazılım ile düzeltilemeyen bozuk paketler içeriyor. Devam " "etmeden önce lütfen bunları synaptic veya apt-get kullanarak düzeltin." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Gerekli bilgi-paketleri güncelleştirilemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "'%s' yüklenemiyor" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "Gerekli bir paket yüklenemedi. Lütfen bunu bir hata olarak bildirin. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -166,15 +210,15 @@ msgstr "" " Lütfen devam etmeden önce, synaptic veya apt-get kullanarak yukarıdaki " "paketlerden birini kurun." -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Önbellek okunuyor" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "Geçerli yansı bulunamadı" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -187,11 +231,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -204,32 +248,32 @@ msgstr "" "'%s' için varsayılan girişler eklensin mi? Eğer 'Hayır'ı seçerseniz, " "güncelleştirme iptal edilecektir." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "Üçüncü parti kaynaklar devredışı bırakıldı" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "Güncelleştirme sırasında hata" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." @@ -237,11 +281,11 @@ msgstr "" "Güncelleştirme sırasında bir hata oluştu. Bu genellikle bir ağ sorunudur, " "lütfen ağ bağlantınızı kontrol edin ve yeniden deneyin." -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Yeterince boş disk alanı yok" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -250,25 +294,25 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Yükseltmeyi başlatmak istiyor musunuz?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Yükseltmeler kurulamadı" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Yükseltmeler indirilemedi" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -276,11 +320,11 @@ msgstr "" "Yükseltme şimdi iptal edilecek. Lütfen internet bağlantınızı veya kurulum " "ortamınızı kontrol edin ve yeniden deneyin. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -289,49 +333,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "Bu Adımı _Atla" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "_Kaldır" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "Geçersiz paket bilgisi" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -339,19 +383,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "Yükseltiliyor" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Sistem yükseltmesi tamamlandı." @@ -423,69 +467,71 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "'diff' komutu bulunamadı" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Sisteminiz zaten yükseltilmiş." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "%s'i kur" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "%s'i yükselt" @@ -506,7 +552,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -527,8 +573,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Yükseltme başlatılsın mı?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">Ubuntu 6.06 LTS'ya yükseltiliyor</" "span>" @@ -679,115 +725,103 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -795,7 +829,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -803,144 +837,182 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" -msgstr "" +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "İndirme tamamlandı" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Yazılım Özellikleri" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Anahtar aktar" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -950,74 +1022,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "Kanal Düzenle" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "CD-ROM taranıyor" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "Kanal _ekle" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "_Özel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "_Yenile" @@ -1071,108 +1127,257 @@ msgid "The window size" msgstr "Pencere boyutu" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Yazılım Özellikleri" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 Güvenlik Güncelleştirmeleri" +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "Resmi olarak desteklenenler" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Sınırlı telif hakkı" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Resmi olarak desteklenenler" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Sınırlı telif hakkı" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" +#~ msgid " " +#~ msgstr " " + +#~ msgid "_Add Channel" +#~ msgstr "Kanal _ekle" + +#~ msgid "_Custom" +#~ msgstr "_Özel" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 Güvenlik Güncelleştirmeleri" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 Güvenlik Güncelleştirmeleri" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS Güvenlik Güncelleştirmeleri" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Serhey Kusyumoff <gpalco@gmail.com>\n" "Language-Team: Ukrainian <uk@li.org>\n" @@ -15,67 +15,113 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>Подробиці</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 #, fuzzy msgid "Every two days" msgstr "Кожні %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Кожні %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Через %s днів" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Встановлення оновлень..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Оновлення програм" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Текст програми" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Текст програми" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "Імпортувати ключ" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +129,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "Введіть назву диску" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "Вставте диск в пристрій:" @@ -103,20 +149,20 @@ msgstr "" "Ваша система містить пошкоджені пакунки, котрі не можуть бути виправлені " "цією програмою. Скористайтесь перш програмами synaptic чи apt-get." -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "Не можливо поновити необхідні meta-пакунки" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "Це призведе довидалення базового пакунку системи" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "Не можливо розрахувати поновлення" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -124,23 +170,23 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "Помилка підписів в деяких пакунках" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "Не можливо встановити '%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -148,11 +194,11 @@ msgid "" msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "Не можливо підібрати meta-пакунок" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -161,16 +207,16 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "Зчитування кешу" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 #, fuzzy msgid "No valid mirror found" msgstr "Не знайдено" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -183,11 +229,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -196,43 +242,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "Помилка в даних про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Помилка підчас поновлення" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "Недостатньо місця на диску" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -241,15 +287,15 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "Бажаєте почати апгрейд системи?" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "Неможливо провести апргрейд системи" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 #, fuzzy msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " @@ -259,11 +305,11 @@ msgstr "" "Виконайте команду 'sudo apt-get install -f', або скористайдесь програмою " "Synaptic для налаштування системи." -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "Неможливо завантажити пакунки для апргрейду системи" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " @@ -271,11 +317,11 @@ msgstr "" "Апргрейд системи щойно перервано. Будь ласка, перевірте зєднання з " "інтернетом чи носії та спробуйте знов. " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -284,24 +330,24 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 #, fuzzy msgid "Remove obsolete packages?" msgstr "Видалити непотрібні пакунки?" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " @@ -310,27 +356,27 @@ msgstr "" "нижче. " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 #, fuzzy msgid "Restoring original system state" msgstr "Перезавантаження системи" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "Перевірка програми управління пакунками" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "Отримання інформації про репозиторій" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -338,20 +384,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "Запит підтвердження" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Оновлення завершено" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "Пошук програм, що не використовуються" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "Апргрейд системи завершено." @@ -425,11 +471,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "Виникла невиправна помилка" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 #, fuzzy msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " @@ -439,7 +485,9 @@ msgstr "" "Будь ласка, повідмте це я помилку, включивши в повідомлення файли ~/dist-" "upgrade.log and ~/dist-upgrade-apt.log . Апргрейд щойно перервано." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." @@ -447,7 +495,7 @@ msgstr[0] "%s пакунків буде видалено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." @@ -455,7 +503,7 @@ msgstr[0] "%s пакунків буде встановлено." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." @@ -463,42 +511,42 @@ msgstr[0] "буде проведено апргрейд %s пакунків." msgstr[1] "" msgstr[2] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "Потрібно завантажити всього %s пакунків." -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" "Апрейд може продовжуватись декілька годин, і не може бути перервано протягом " "всього часу." -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "Не знайдено пакунків для апгрейду" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "Апгрейд вашої системи вже проведено." -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, fuzzy, python-format msgid "<b>Remove %s</b>" msgstr "<b>Видалити %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, fuzzy, python-format msgid "Install %s" msgstr "Встановити %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, fuzzy, python-format msgid "Upgrade %s" msgstr "Апргрейд %s" @@ -519,7 +567,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -542,8 +590,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>Почати апгрейд системи?</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -700,11 +747,16 @@ msgstr "Завантажується файл %li of %li at %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "Завантажується файл %li of %li на невизначенії швидкості" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Доступний новий випуск Ubuntu!" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -713,44 +765,44 @@ msgstr "" "не вдається завантажити зміни. Перевірте чи активне з'єднання з Інтернет." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 #, fuzzy msgid "Cannot install all available updates" msgstr "Пошук пакунків для апгрейду" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Версія %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Завантаження змін" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Ваша система оновлена!" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, fuzzy, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" @@ -758,67 +810,50 @@ msgstr[0] "Неможливо провести апргрейд системи" msgstr[1] "Неможливо провести апргрейд системи" msgstr[2] "Неможливо провести апргрейд системи" -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Подробиці</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 #, fuzzy msgid "Update is complete" msgstr "Завантадення пакунків завершено" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Ваш дистрибутив вже не підтримується" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -826,7 +861,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -834,152 +869,192 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "Скасувати _Завантаження" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Зміни" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Опис" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Оновлення програм" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Встановлення оновлень..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Клавіші</b>" +msgid "changes" +msgstr "Зміни" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>Оновлення через Інтернет</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>Клавіші</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>Оновлення через Інтернет</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Аутентифікація" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "Завантадення пакунків завершено" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Оновлення через Інтернет</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Відновити початкові параметри" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Відновити початкові ключі" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "Параметри програм" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Властивості програм" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Текст програми" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "Перевіряти оновлення кожні" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "Імпортувати ключ" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -989,44 +1064,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Клавіші</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Коментар:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Компоненти</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Компоненти</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Дистрибутив:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Тип:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>Введіть повний рядок APT репозиторію, який ви бажаєте додати</b></" @@ -1036,15 +1101,11 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. Докладні приклади можна знайти у " "документації." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Рядок APT" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1052,23 +1113,21 @@ msgstr "" "Двійкові\n" "вихідні" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Текст програми" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "В_ласний" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Текст програми" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Перезавантажити" @@ -1121,142 +1180,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Властивості програм" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Оновлення Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Оновлення безпеки Ubuntu 5.04" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Оновлення Ubuntu 5.10" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Оновлення Ubuntu 5.04" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Підтримується спільнотою (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Не-вільний (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Не-вільний (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Оновлення Ubuntu 5.10" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Оновлення Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Оновлення безпеки Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Офіціально підтримуються" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Обмежені авторські права" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Оновлення безпеки Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Оновлення Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Оновлення Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Оновлення безпеки Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Оновлення Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Оновлення Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Підтримується спільнотою (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Не-вільний (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Офіціально підтримуються" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Обмежені авторські права" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Оновлення безпеки Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Оновлення Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Оновлення Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Оновлення безпеки стабільного Debian" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Тестовий Debian" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian поза США (Нестабільний)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Оновлення Ubuntu 5.04" +#~ msgid "Hide details" +#~ msgstr "<b>Подробиці</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "CD диск з Ubuntu 5.10 \"Breezy Badger\"" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Клавіші</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Оновлення безпеки Ubuntu 5.10" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Клавіші</b>" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Оновлення Ubuntu 5.10" +#~ msgid "Installation Media" +#~ msgstr "Носій встановлення" + +#~ msgid "Software Preferences" +#~ msgstr "Параметри програм" + +#~ msgid " " +#~ msgstr " " #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Клавіші</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Компоненти</b>" + +#~ msgid "_Custom" +#~ msgstr "В_ласний" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Оновлення Ubuntu 5.10" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>Розділи:</b>" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Оновлення безпеки Ubuntu 5.04" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Офіціально підтримуються" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Оновлення Ubuntu 5.10" #, fuzzy -#~ msgid "Installing updates" -#~ msgstr "Встановлення оновлень..." +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Оновлення Ubuntu 5.10" + +#, fuzzy +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>Розділи:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Розділи:</b>" @@ -1265,10 +1488,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Перезавантажити з сервера інформацію про пакет" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Оновлення програм" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1282,10 +1501,6 @@ msgstr "" #~ msgstr "Показати доступні оновлення та зміни до встановлених пакетів" #, fuzzy -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "CD диск з Ubuntu 5.04 \"Hoary Hedgehog\"" - -#, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "Помилка видалення ключа" @@ -1416,18 +1631,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Двійковий" -#~ msgid "Source" -#~ msgstr "Текст програми" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "CD диск з Ubuntu 4.10 \"Warty Warthog\"" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Оновлення безпеки Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Оновлення Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Супутнє програмне забезпечення" @@ -1517,9 +1720,6 @@ msgstr "" #~ "версії не випускаються виправлення безпеки та інші критичні оновлення. " #~ "Дивіться інформацію про оновлення на http://www.ubuntulinux.org" -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Доступний новий випуск Ubuntu!" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." diff --git a/po/update-manager.pot b/po/update-manager.pot index 635932cc..e3c9c7b9 100644 --- a/po/update-manager.pot +++ b/po/update-manager.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,65 +17,108 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -101,54 +144,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +200,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +221,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +234,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +278,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +315,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +365,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -406,72 +449,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -490,7 +535,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -511,8 +556,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -661,116 +705,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -778,7 +810,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -786,143 +818,179 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -932,74 +1000,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1051,101 +1103,228 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-19 02:46+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -17,66 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "روز" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "ھر دو دن" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "ھفتھ وار" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "ھر دو ھفتے" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "ھر %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "ایک ھفتھ" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "دو ھفتھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "ایک ماھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "بعد %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,54 +145,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +201,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +222,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,42 +235,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -236,35 +279,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -273,49 +316,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -323,19 +366,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -407,72 +450,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -491,7 +536,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -512,8 +557,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -662,116 +706,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -779,7 +811,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -787,144 +819,180 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "امپورٹ کی" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -934,74 +1002,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1053,101 +1105,231 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" + +#~ msgid " " +#~ msgstr " " @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-07 01:53+0000\n" "Last-Translator: Hameed محمد حمید <hameeduddin517@yahoo.com>\n" "Language-Team: Urdu <urd@li.org>\n" @@ -17,66 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "روز" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "ھر دو دن" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "ھفتھ وار" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "ھر دو ھفتے" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "ھر %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "ایک ھفتھ" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "دو ھفتھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "ایک ماھ باد" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "بعد %s دن" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, python-format +msgid "%s updates" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +msgid "Software Channel" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 #, fuzzy msgid "Import key" msgstr "امپورٹ کی" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -102,54 +145,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +201,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +222,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,42 +235,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -236,35 +279,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -273,49 +316,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -323,19 +366,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -407,72 +450,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -491,7 +536,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr "" @@ -512,8 +557,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -662,116 +706,104 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +msgid "The list of changes is not available" +msgstr "" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -779,7 +811,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -787,144 +819,180 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -msgid "Installation Media" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +msgid "Software Sources" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 #, fuzzy msgid "_Import Key File" msgstr "امپورٹ کی" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -934,74 +1002,58 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1053,101 +1105,228 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" -msgstr "" - -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" +msgid "Configure the sources for installable software and updates" msgstr "" #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:97 +msgid "Important security updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Tran The Trung <tttrung@hotmail.com>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -16,65 +16,111 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: LocFactoryEditor 1.2.2\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "Hằng ngày" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "Hằng hai ngày" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "Hằng tuần" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "Hằng hai tuần" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "Hằng %s ngày" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "Sau một tuần" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "Sau hai tuần" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "Sau một tháng" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "Sau %s ngày" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Đang cài đặt bản cập nhật..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Bản cập nhật phần mềm" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "Nguồn" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "Nguồn" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Có lẽ tập tin đã chọn không phai là tập tin khóa GPG, hoặc nó bị hỏng." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này." -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -82,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -100,20 +146,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -121,23 +167,23 @@ msgid "" msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -145,11 +191,11 @@ msgid "" msgstr "Bạn đã chọn một khóa không thể gỡ bỏ. Vui lòng thông báo lỗi này. " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +204,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +225,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,43 +238,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -237,35 +283,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -274,50 +320,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "Một bộ quản lý gói khác đang chạy" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -325,20 +371,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "Nâng cấp xong" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -412,69 +458,71 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -493,7 +541,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -514,8 +562,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -669,11 +716,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Có một bản phát hành Ubuntu mới công bố." + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -683,109 +735,92 @@ msgstr "" "chưa." #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 #, fuzzy msgid "Cannot install all available updates" msgstr "Đang kiểm tra có cập nhật..." -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "Phiên bản %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "Đang tải các thay đổi" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "Hệ thống bạn toàn mới nhất." -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>Chi tiết</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "Không còn hỗ trợ lại bản phát hành của bạn." -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -793,7 +828,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -801,151 +836,190 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "Đổi" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "Mô tả" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "Bản cập nhật phần mềm" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Đang cài đặt bản cập nhật..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>Khóa</b>" +msgid "changes" +msgstr "Đổi" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic 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/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>Cập nhật dùng Mạng</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "Xác thực" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>Cập nhật dùng Mạng</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "Phục hồi mặc định" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, 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/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "Thuộc tính phần mềm" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "Nguồn" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, 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 background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -955,44 +1029,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>Khóa</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>Ghi chú :</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>Thành phần</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>Thành phần</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>Bản phát hành:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>Kiểu:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>Địa chỉ định vị:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, 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" @@ -1001,15 +1065,11 @@ msgstr "" "http://ftp.debian.org sarge main\"</i>. Bạn có thể tìm mô tả chi tiết của cú " "pháp này trong tài liệu hướng dẫn." -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "Dòng APTL" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1017,23 +1077,21 @@ msgstr "" "Nhị phân\n" "Nguồn" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "Nguồn" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "Tự _chọn" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "Nguồn" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "Tải lại" @@ -1086,138 +1144,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "Thuộc tính phần mềm" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Bản cập nhật Ubuntu 5.10" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Bản cập nhật bảo mặt Ubuntu 5.04" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Bản cập nhật Ubuntu 5.10" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Bản cập nhật Ubuntu 5.04" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "Do cộng đồng bảo quản (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "Không tự do (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "Không tự do (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Bản cập nhật Ubuntu 5.10" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Bản cập nhật Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "Được hỗ trợ một cách chính thức" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "Bản quyền bị giới hạn" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Bản cập nhật Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Bản cập nhật Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Đĩa CD chứa « Hoary Hedgehog » của Ubuntu 5.04" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Bản cập nhật Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Bản cập nhật Ubuntu 5.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "Do cộng đồng bảo quản (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "Không tự do (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "Được hỗ trợ một cách chính thức" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "Bản quyền bị giới hạn" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Bản cập nhật Ubuntu 4.10" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Bản cập nhật Ubuntu 5.10" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 « Sarge »" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Bản cập nhật bảo mặt ổn định Debian" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Thử ra Debian" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Không Mỹ Debian (Bất định)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Bản cập nhật Ubuntu 5.04" +#~ msgid "Hide details" +#~ msgstr "<b>Chi tiết</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Đĩa CD chứa « Breezy Badger » của Ubuntu 5.10" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>Khóa</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.10" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>Khóa</b>" -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Installation Media" +#~ msgstr "Phương tiên cài đặt" + +#~ msgid "Software Preferences" +#~ msgstr "Sở thích phần mềm" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>Khóa</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>Thành phần</b>" + +#~ msgid "_Custom" +#~ msgstr "Tự _chọn" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Bản cập nhật Ubuntu 5.10" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Bản cập nhật bảo mặt Ubuntu 5.04" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Bản cập nhật Ubuntu 5.10" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>Phần:</b>" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Bản cập nhật Ubuntu 5.10" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "Được hỗ trợ một cách chính thức" +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>Phần:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>Phần:</b>" @@ -1226,10 +1452,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "Tải lại thông tin gói từ máy phục vụ." -#, 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" @@ -1243,10 +1465,6 @@ msgstr "" #~ 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" @@ -1361,18 +1579,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "Nhị phân" -#~ msgid "Source" -#~ msgstr "Nguồn" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "Đĩa CD chứa « Warty Warthog » của Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Bản cập nhật bảo mặt Ubuntu 4.10" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Bản cập nhật Ubuntu 4.10" - #~ msgid "Contributed software" #~ msgstr "Phần mềm đã đóng góp" @@ -1456,9 +1662,6 @@ msgstr "" #~ "hiện thời của bạn sẽ không còn nhận lại bản cập nhật bảo mật. Hãy xem " #~ "<http://www.ubuntulinux.org> để tìm thông tin nâng cấp." -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Có một bản phát hành Ubuntu mới công bố." - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-04-20 19:15+0000\n" "Last-Translator: Canonical Ltd <translations@canonical.com>\n" "Language-Team: Xhosa <xh-translate@ubuntu.com>\n" @@ -17,65 +17,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "Bonisa izihlaziyo" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "Bonisa izihlaziyo" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -83,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -101,54 +145,54 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "" #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -157,15 +201,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -178,11 +222,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -191,42 +235,42 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -235,35 +279,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -272,49 +316,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -322,19 +366,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -406,72 +450,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -490,7 +536,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -511,8 +557,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -661,116 +706,105 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Kukho i-%i yohlaziyo ekhoyo" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -778,7 +812,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -786,149 +820,183 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 #, fuzzy msgid "Software Updates" msgstr "Bonisa izihlaziyo" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "Bonisa izihlaziyo" -#: ../data/SoftwareProperties.glade.h:1 -#, fuzzy -msgid "<b>Channels</b>" -msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" +#: ../data/glade/UpdateManager.glade.h:23 +msgid "changes" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +msgid "<b>Automatic updates</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 -msgid "Import the public key from a trusted software provider" +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" msgstr "" -#: ../data/SoftwareProperties.glade.h:8 -#, fuzzy -msgid "Installation Media" -msgstr "Seka zonke izihlaziyo" +#: ../data/glade/SoftwareProperties.glade.h:12 +msgid "Import the public key from a trusted software provider" +msgstr "" -#: ../data/SoftwareProperties.glade.h:9 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "Bonisa izihlaziyo" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 #, fuzzy -msgid "Software Preferences" +msgid "Software Sources" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -938,78 +1006,60 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 #, fuzzy msgid "<b>Comment:</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "" @@ -1062,113 +1112,259 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -#, fuzzy -msgid "Software Properties" -msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:62 +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +msgid "Community maintained (universe)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +msgid "Non-free drivers" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +msgid "Restricted software (Multiverse)" +msgstr "" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Bonisa izihlaziyo" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +msgid "Ubuntu 5.04 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +msgid "Ubuntu 5.04 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +msgid "Ubuntu 5.04 Backports" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +msgid "Ubuntu 4.10 'Warty Warthog'" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +msgid "Ubuntu 4.10 Backports" +msgstr "" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "<b>Sections</b>" +#~ msgid "<b>Channels</b>" +#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" + +#, fuzzy +#~ msgid "Installation Media" +#~ msgstr "Seka zonke izihlaziyo" + +#, fuzzy +#~ msgid "Software Preferences" +#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" #~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" #, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "Bonisa izihlaziyo" +#~ msgid "<b>Components</b>" +#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" + +#, fuzzy +#~ msgid "<b>Sections</b>" +#~ msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" #, fuzzy #~ msgid "Updating package list..." @@ -1178,10 +1374,6 @@ msgstr "" #~ msgid "There are no updates available." #~ msgstr "Kukho i-%i yohlaziyo ekhoyo" -#, fuzzy -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Kukho i-%i yohlaziyo ekhoyo" - #~ msgid "" #~ "Please enter your password to run:\n" #~ " %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index c6f94421..f2881f39 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-30 14:16+0000\n" "Last-Translator: catinsnow <catinsnow@gmail.com>\n" "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" @@ -16,65 +16,115 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "每天" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "每两天" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "每周" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "每两周" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "每%s天" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "一周后" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "两周后" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "一月后" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s天后" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "安装更新" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "软件更新" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "" +"二进制\n" +"源代码" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "" +"二进制\n" +"源代码" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "导入密钥" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "在导入所选文件时出错" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "所选文件可能不是GPG密钥文件或者已经损坏." -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "删除密钥时候出错" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你所选择的密钥不能被删除。请汇报这个bug" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -85,11 +135,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "请输入光盘的名称" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "请将光盘插入到光驱里:" @@ -105,31 +155,31 @@ msgstr "" "你的系统包含有破损的软件包而不能通过此软件修复。 在你继续前请先用新立得或者" "apt-get修复它们。" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "不能升级要求的元包" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "一个必要的软件包会被删除" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "无法计算升级" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "在计算升级时遇到一个无法解决的问题。请汇报这个bug。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "在认证一些软件包时出错" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -138,23 +188,23 @@ msgstr "" "无法认证一些软件包。这可能是暂时的网络问题。你可以在稍后再试。以下是未认证软" "件包的列表。" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "无法安装'%s'" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "无法安装要求的软件包。请汇报这个bug。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "无法猜出元包" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -166,15 +216,15 @@ msgstr "" "确定你运行的ubuntu的版本。 请在继续前先用新立得或apt-get安装以上所举软件包中" "的一个。" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "正在读取缓存" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "未找到可用的镜像" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -191,11 +241,11 @@ msgstr "" "如果选'no'更新将被取消." #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "生成默认的源?" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -207,21 +257,21 @@ msgstr "" "\n" "添加用于'%s'的缺省条目?如果选择'No',升级将被取消." -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "源的信息无效" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升级源的信息时产生一个无效文件。请汇报这个bug。" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "第三方源被禁用" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -230,21 +280,21 @@ msgstr "" "源列表中一些第三方源被禁用.你可以在升级后用\"软件属性\"工具或新立得包管理器来" "重新启用它们." -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "升级时出错" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "升级时候出错。这通常是一些网络问题，请检查你的网络连接后再试。" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "磁盘空间不足" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -255,15 +305,15 @@ msgstr "" "get clean'命令来删除之前安装的临时软件包。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "你要开始升级么？" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "无法安装升级" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -271,21 +321,21 @@ msgstr "" "升级现在取消。你的系统可能处于不稳定状态。恢复操作可运行(dpkg --configure -" "a)。" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "无法下载升级包" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升级现在取消。请检查你的网络连接活重新放置安装媒体后再试。 " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "一些软件已经不在被官方支持." -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -297,49 +347,49 @@ msgstr "" "\n" "如果你没有启用'社区维护'源,下一步这些包将被建议移除. " -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "删除陈旧的软件包？" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "跳过这个步骤(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "删除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "确认时出错" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理时发生问题。更多信息请查看以下消息。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "正在恢复原始系统状态" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "正在检查软件包管理器" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "更新源的信息" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "无效的包信息" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -349,19 +399,19 @@ msgstr "" "包信息被更新后核心包'%s'没有找到.\n" "这标志着一个严重的错误,请报告bug." -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "请求确认" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "正在更新" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "寻找陈旧的软件包" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "系统更新完毕" @@ -435,11 +485,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "外部命令“diff”没有找到" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "出现致命错误" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -449,58 +499,60 @@ msgstr "" "log。升级现在取消。\n" "你原始的sources.list已保存在/etc/apt/sources.list.distUpgrade." -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s软件包将被删除。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s新的软件包将被安装。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s软件包将被升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "你下载了总体的%s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "升级会持续几个小时且不能在稍后的任何时候被终止" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "关闭所有打开的程序和文档以防止数据丢失。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "不能找到任何升级" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "你的系统已经升级。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>删除%s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "安装%s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "升级%s" @@ -519,7 +571,7 @@ msgstr "升级已经完成并需要重启。你要现在重启么？" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -542,8 +594,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>开始升级？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" "<span weight=\"bold\" size=\"x-large\">正在升级到 Ubuntu 6.06 LTS</span>" @@ -693,22 +745,27 @@ msgstr "正在下载文件 %li/%li 速度是 %s/s" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下载文件 %li/%li 速度未知" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "变动列表尚不可用。请稍后再试。" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "变动列表尚不可用。请稍后再试。" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "无法下载更新列表。请检查您的网络连接。" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "无法安装所有升级" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -717,61 +774,53 @@ msgstr "" "一些更新包要求删除更多的软件。用包管理器 “Synaptic” 的“标出所有更新”功能并运" "行 “sudo apt-get dist-upgrade”来彻底更你新的系统。" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "将跳过以下的升级包" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "正在下载更新列表..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "下载文件大小：%s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "您的系统已为最新" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "你可以安装 %s 个更新" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "隐藏详情" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "显示详情" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "请稍等，这需要花一些时间。" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "新版本：%s(大小：%s)" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "您的发行版不再被支持" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -781,25 +830,17 @@ msgstr "" "\r\n" "http://www.ubuntu.com 来获取更多有关升级的信息。" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>新发行版 '%s' 可用</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "同时只能有一个软件管理工具在运行" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "请先关闭别的应用程序，如“aptitude”或“synaptic”。" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "软件索引已被破坏" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -808,7 +849,7 @@ msgstr "" "无法安装或删除任何软件。请使用包管理软件\"synaptic\"或在终端运行\"sudo apt-" "get install -f\"来修正这个问题。" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -820,7 +861,7 @@ msgstr "" "你的系统未自动检测升级。你可以通过编辑\"系统\" -> \"管理\" -> \"软件性能\"改" "变." -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -831,143 +872,187 @@ msgstr "" "\n" "软件更新可以为你修复错误，除去安全漏洞，并提供新的特性。" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>保持你的系统更新</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "取消下载(_D)" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "变更" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "检查（_K）" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "检查软件频道以获得新的更新" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "描述" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "发布说明" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "显示单个文件进度" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "软件更新" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "软件更行可以为你修复错误，消除安全漏洞及提供新的特性" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "升级(_p)" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "升级到最新版本的Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "检查（_C）" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "在以后隐藏该信息(_H)" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "安装更新(_I)" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>途径</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "变更" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>Internet 更新</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>密钥</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "添加 CDrom(_C)" +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>Internet 更新</b>" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "身份验证" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "删除下载的软件文件(_e)" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "下载完成" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "Internet 更新" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "只有来自官方Ubuntu服务器的安全更新才会被自动安装。" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "恢复默认值(_D)" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "还原为发行版本预设的密钥" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "软件首选项" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "软件属性" + +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "" +"二进制\n" +"源代码" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "自动检查更新(_C)" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "在后台下载更新，但是不安装(_D)" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "导入密钥(_I)" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "不确认就安装安全更新(_I)" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -982,55 +1067,44 @@ msgstr "" "\n" "你需要一个有效的互联网连接才能继续。" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>途径</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>注释：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>组件:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>组件</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>发行版：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>类型：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>输入你想增加的完整的频道 APT 命令行</b></big>\n" "APT 命令行包含频道的类型，位置和部分，例如：<i>\"deb http://ftp.debian.org " "sarge main\"</i>。" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT 行：" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "添加通道" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1038,23 +1112,25 @@ msgstr "" "二进制\n" "源代码" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "编辑路径" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "" +"二进制\n" +"源代码" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "正在扫描CD-ROM" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "添加路径(_A)" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "自定义(_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "" +"二进制\n" +"源代码" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "重新载入(_R)" @@ -1108,119 +1184,309 @@ msgid "The window size" msgstr "窗口大小" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "设定软件频道和互联网升级" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "软件属性" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 LTS" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 更新" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS 安全更新" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS 升级" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6-06 'Dapper Drake'" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "社区维护(Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "非自由(Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "非自由(Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6-06 'Dapper Drake'" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS 后备支持" +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支持" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "版权限制" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 'Breezy Badger'" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 移植" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 移植" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 'Breezy Badger'" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "社区维护(Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "非自由(Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +msgid "Oficially supported" +msgstr "官方支持" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "版权限制" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 安全更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 移植" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 \"Sarge\"" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 \"Sarge\" 安全更新" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian \"Etch\" (测试)" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian \"Sid\" (非稳定)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "带有非自由依赖关系的DFSG兼容软件" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "非DFSG兼容软件" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6-06 'Dapper Drake'" +#~ msgid "Hide details" +#~ msgstr "隐藏详情" + +#~ msgid "Show details" +#~ msgstr "显示详情" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "同时只能有一个软件管理工具在运行" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 'Breezy Badger'" +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "请先关闭别的应用程序，如“aptitude”或“synaptic”。" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>途径</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>密钥</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "添加 CDrom(_C)" + +#~ msgid "Installation Media" +#~ msgstr "安装媒体" + +#~ msgid "Software Preferences" +#~ msgstr "软件首选项" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>途径</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>组件</b>" + +#~ msgid "Add Channel" +#~ msgstr "添加通道" + +#~ msgid "Edit Channel" +#~ msgstr "编辑路径" + +#~ msgid "_Add Channel" +#~ msgstr "添加路径(_A)" + +#~ msgid "_Custom" +#~ msgstr "自定义(_C)" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 安全更新" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 LTS" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 更新" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS 安全更新" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 移植" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS 升级" + +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS 后备支持" #~ msgid "" #~ "While scaning your repository information no valid entry for the upgrade " @@ -1233,12 +1499,6 @@ msgstr "非DFSG兼容软件" #~ msgid "<b>Sections</b>" #~ msgstr "<b>节：</b>" -#~ msgid "Oficially supported" -#~ msgstr "官方支持" - -#~ msgid "Installing updates" -#~ msgstr "安装更新" - #~ msgid "Check for available updates" #~ msgstr "检查有效的更新" @@ -1249,18 +1509,10 @@ msgstr "非DFSG兼容软件" #~ msgid "Reload the latest information about updates" #~ 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>" @@ -1349,18 +1601,9 @@ msgstr "非DFSG兼容软件" #~ "二进制\n" #~ "源代码" -#, fuzzy -#~ msgid "Source" -#~ msgstr "" -#~ "二进制\n" -#~ "源代码" - #~ msgid "CD" #~ msgstr "CD" -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 安全更新" - #~ msgid "Contributed software" #~ msgstr "贡献的软件" diff --git a/po/zh_HK.po b/po/zh_HK.po index 05ca6b8e..5ef6fb94 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-23 19:45+0000\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -15,66 +15,112 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 #, fuzzy msgid "Daily" msgstr "<b>細節</b>" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "正在安裝軟件更新..." + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "軟件更新" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +#, fuzzy +msgid "(Source Code)" +msgstr "源程式碼" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +#, fuzzy +msgid "Source Code" +msgstr "源程式碼" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -82,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "" @@ -100,20 +146,20 @@ msgid "" "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 #, fuzzy msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " @@ -121,23 +167,23 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 #, fuzzy msgid "" "It was impossible to install a required package. Please report this as a " @@ -145,11 +191,11 @@ msgid "" msgstr "你選定的密碼匙無法移除，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -158,15 +204,15 @@ msgid "" "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -179,11 +225,11 @@ msgid "" msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -192,43 +238,43 @@ msgid "" "cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " "synaptic." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 #, fuzzy msgid "Error during update" msgstr "移除密碼匙時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -237,35 +283,35 @@ msgid "" msgstr "" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -274,50 +320,50 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 #, fuzzy msgid "Checking package manager" msgstr "另一個套件管理員正在執行中" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -325,20 +371,20 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 #, fuzzy msgid "Upgrading" msgstr "完成升級" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "" @@ -412,72 +458,74 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, 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:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, 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:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, 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:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "" @@ -496,7 +544,7 @@ msgstr "" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -517,8 +565,7 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -672,11 +719,16 @@ msgstr "" msgid "Downloading file %li of %li with unknown speed" msgstr "" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "Ubuntu 已推出新版本！" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 #, fuzzy msgid "" "Failed to download the list of changes. Please check your Internet " @@ -684,110 +736,93 @@ msgid "" msgstr "無法下載更改紀錄。請檢查網絡連線是否正常。" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 #, fuzzy msgid "Cannot install all available updates" msgstr "正在檢查更新套件..." -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" "get dist-upgrade\" in a terminal to update your system completely." msgstr "" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "版本 %s: \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 #, fuzzy msgid "Downloading the list of changes..." msgstr "正在下載更改紀錄" -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 #, fuzzy msgid "Your system is up-to-date" msgstr "系統已經在最新狀態！" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -#, fuzzy -msgid "Hide details" -msgstr "<b>細節</b>" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 #, fuzzy msgid "Your distribution is not supported anymore" msgstr "已經不再支援你用的發行版本" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " "information on upgrading." msgstr "" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -795,7 +830,7 @@ msgid "" "behavior in \"System\" -> \"Administration\" -> \"Software Properties\"." msgstr "" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -803,151 +838,190 @@ msgid "" "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "更改紀錄" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "詳細說明" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "軟件更新" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 #, fuzzy msgid "_Install Updates" msgstr "正在安裝軟件更新..." -#: ../data/SoftwareProperties.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:23 #, fuzzy -msgid "<b>Channels</b>" -msgstr "<b>密碼匙</b>" +msgid "changes" +msgstr "更改紀錄" + +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" -#: ../data/SoftwareProperties.glade.h:2 +#: ../data/glade/SoftwareProperties.glade.h:2 #, fuzzy -msgid "<b>Internet updates</b>" +msgid "<b>Automatic updates</b>" msgstr "<b>線上更新</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>密碼匙</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" +#: ../data/glade/SoftwareProperties.glade.h:5 +#, fuzzy +msgid "<b>Internet updates</b>" +msgstr "<b>線上更新</b>" + +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "認證" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +msgid "Download from:" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:12 #, 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 +#: ../data/glade/SoftwareProperties.glade.h:13 #, fuzzy msgid "Internet Updates" msgstr "<b>線上更新</b>" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 #, fuzzy msgid "Restore _Defaults" msgstr "還原為預設值" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "還原為預設密碼匙" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "軟件偏好設定" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "軟件屬性" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:18 +#, fuzzy +msgid "Source code" +msgstr "源程式碼" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:22 #, fuzzy msgid "_Check for updates automatically:" msgstr "檢查軟件更新間隔：" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +msgid "_Download updates automatically, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -957,44 +1031,34 @@ msgid "" "You need a working internet connection to continue." msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -#, fuzzy -msgid "<b>Channel</b>" -msgstr "<b>密碼匙</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>備註:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 #, fuzzy msgid "<b>Components:</b>" msgstr "<b>元件</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -#, fuzzy -msgid "<b>Components</b>" -msgstr "<b>元件</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>發行版本:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>類型:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI:</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 #, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入整行你想加入的 APT 軟件庫位置</b></big>\n" @@ -1002,15 +1066,11 @@ msgstr "" "該行的內容包括 APT 軟件庫的類型、位置和內容，例如： <i>\"deb http://ftp." "debian.org sarge main\"</i>。你可以在文件中尋找有關該行的格式的詳細描述。" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT 軟件庫:" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1018,23 +1078,21 @@ msgstr "" "可執行檔\n" "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +#, fuzzy +msgid "Edit Source" +msgstr "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -msgid "_Add Channel" -msgstr "" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "自選(_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +#, fuzzy +msgid "_Add Source" +msgstr "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 #, fuzzy msgid "_Reload" msgstr "重新載入" @@ -1087,138 +1145,306 @@ msgid "The window size" msgstr "" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +msgid "Configure the sources for installable software and updates" msgstr "" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "軟件屬性" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/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 +#: ../data/channels/Ubuntu.info.in:7 #, fuzzy -msgid "Ubuntu 6.06 LTS" +msgid "Ubuntu 6.10 'Edgy Eft'" msgstr "Ubuntu 5.10 更新" #. Description -#: ../channels/Ubuntu.info.in:23 +#: ../data/channels/Ubuntu.info.in:28 #, fuzzy -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 5.04 安全性更新" +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. Description -#: ../channels/Ubuntu.info.in:40 +#: ../data/channels/Ubuntu.info.in:62 #, fuzzy -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 5.10 更新" +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 更新" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "協力維護軟件 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "非自由軟件 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "非自由軟件 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:57 +#: ../data/channels/Ubuntu.info.in:83 #, fuzzy -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 5.10 更新" +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 5.04 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +#, fuzzy +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 #, fuzzy msgid "Officially supported" msgstr "官方支援" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "版權受限" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +#, fuzzy +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +#, fuzzy +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "協力維護軟件 (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "非自由軟件 (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +#, fuzzy +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "官方支援" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "版權受限" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 4.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 4.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 更新" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/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 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 “Sarge”" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 #, fuzzy msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 穩定版安全性更新" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 #, fuzzy msgid "Debian \"Etch\" (testing)" msgstr "Debian 測試版" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/channels/Debian.info.in:47 msgid "http://http.us.debian.org/debian/" msgstr "" #. Description -#: ../channels/Debian.info.in:48 +#: ../data/channels/Debian.info.in:48 #, fuzzy msgid "Debian \"Sid\" (unstable)" msgstr "Debian Non-US (不穩定版)" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "" #, fuzzy -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 5.04 更新" +#~ msgid "Hide details" +#~ msgstr "<b>細節</b>" #, fuzzy -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 光碟 “Breezy Badger”" +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>密碼匙</b>" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 安全性更新" +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>密碼匙</b>" -#~ msgid "Ubuntu 5.10 Updates" +#~ msgid "Installation Media" +#~ msgstr "安裝媒體" + +#~ msgid "Software Preferences" +#~ msgstr "軟件偏好設定" + +#~ msgid " " +#~ msgstr " " + +#, fuzzy +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>密碼匙</b>" + +#, fuzzy +#~ msgid "<b>Components</b>" +#~ msgstr "<b>元件</b>" + +#~ msgid "_Custom" +#~ msgstr "自選(_C)" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS" #~ msgstr "Ubuntu 5.10 更新" #, fuzzy -#~ msgid "Ubuntu 5.10 Backports" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 5.04 安全性更新" + +#, fuzzy +#~ msgid "Ubuntu 6.06 LTS Updates" #~ msgstr "Ubuntu 5.10 更新" #, fuzzy -#~ msgid "<b>Sections</b>" -#~ msgstr "<b>分類:</b>" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 5.10 更新" #, fuzzy -#~ msgid "Oficially supported" -#~ msgstr "官方支援" +#~ msgid "<b>Sections</b>" +#~ msgstr "<b>分類:</b>" #~ msgid "<b>Sections:</b>" #~ msgstr "<b>分類:</b>" @@ -1227,10 +1453,6 @@ msgstr "" #~ msgid "Reload the latest information about updates" #~ msgstr "由伺服器重新載入套件資料。" -#, fuzzy -#~ msgid "Add Software Channels" -#~ msgstr "軟件更新" - #~ msgid "" #~ "<span weight=\"bold\" size=\"larger\">Downloading changes</span>\n" #~ "\n" @@ -1244,10 +1466,6 @@ msgstr "" #~ msgstr "顯示所有可更新的套件，並選擇要安裝的套件" #, fuzzy -#~ msgid "Ubuntu 5.04 \"Hoary Hedgehog\"" -#~ msgstr "Ubuntu 5.04 光碟 “Hoary Hedgehog”" - -#, fuzzy #~ msgid "Error fetching the packages" #~ msgstr "移除密碼匙時發生錯誤" @@ -1360,18 +1578,6 @@ msgstr "" #~ msgid "Binary" #~ msgstr "可執行檔" -#~ msgid "Source" -#~ msgstr "源程式碼" - -#~ msgid "CD disk with Ubuntu 4.10 \"Warty Warthog\"" -#~ msgstr "Ubuntu 4.10 光碟 “Warty Warthog”" - -#~ msgid "Ubuntu 4.10 Security Updates" -#~ msgstr "Ubuntu 4.10 安全性更新" - -#~ msgid "Ubuntu 4.10 Updates" -#~ msgstr "Ubuntu 4.10 更新" - #~ msgid "Contributed software" #~ msgstr "協力維護軟件" @@ -1456,9 +1662,6 @@ msgstr "" #~ "請升級至新版本的 Ubuntu Linux。你現在用的版本不會再有任何安全性更新或重要" #~ "的更新。有關升級的資料，請瀏覽 http://www.ubuntulinux.org 。" -#~ msgid "There is a new release of Ubuntu available!" -#~ msgstr "Ubuntu 已推出新版本！" - #~ msgid "" #~ "A new release with the codename '%s' is available. Please see http://www." #~ "ubuntulinux.org/ for upgrade instructions." diff --git a/po/zh_TW.po b/po/zh_TW.po index 234a2ae5..b048f48e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" "Report-Msgid-Bugs-To: sebastian.heinlein@web.de\n" -"POT-Creation-Date: 2006-05-31 18:19+0200\n" +"POT-Creation-Date: 2006-08-01 00:06+0200\n" "PO-Revision-Date: 2006-05-31 12:00+0000\n" "Last-Translator: PCMan <pcman.tw@gmail.com>\n" "Language-Team: Chinese (Taiwan) <zh-l10n@linux.org.tw>\n" @@ -15,65 +15,109 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../SoftwareProperties/SoftwareProperties.py:103 +#: ../SoftwareProperties/SoftwareProperties.py:135 msgid "Daily" msgstr "每天" -#: ../SoftwareProperties/SoftwareProperties.py:104 +#: ../SoftwareProperties/SoftwareProperties.py:136 msgid "Every two days" msgstr "每兩天" -#: ../SoftwareProperties/SoftwareProperties.py:105 +#: ../SoftwareProperties/SoftwareProperties.py:137 msgid "Weekly" msgstr "每周" -#: ../SoftwareProperties/SoftwareProperties.py:106 +#: ../SoftwareProperties/SoftwareProperties.py:138 msgid "Every two weeks" msgstr "每隔兩周" -#: ../SoftwareProperties/SoftwareProperties.py:111 +#: ../SoftwareProperties/SoftwareProperties.py:143 #, python-format msgid "Every %s days" msgstr "每隔 %s 天" -#: ../SoftwareProperties/SoftwareProperties.py:134 +#: ../SoftwareProperties/SoftwareProperties.py:166 msgid "After one week" msgstr "一週後" -#: ../SoftwareProperties/SoftwareProperties.py:135 +#: ../SoftwareProperties/SoftwareProperties.py:167 msgid "After two weeks" msgstr "兩週後" -#: ../SoftwareProperties/SoftwareProperties.py:136 +#: ../SoftwareProperties/SoftwareProperties.py:168 msgid "After one month" msgstr "一個月後" -#: ../SoftwareProperties/SoftwareProperties.py:141 +#: ../SoftwareProperties/SoftwareProperties.py:173 #, python-format msgid "After %s days" msgstr "%s 天過後" -#: ../SoftwareProperties/SoftwareProperties.py:432 +#. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu +#: ../SoftwareProperties/SoftwareProperties.py:235 +#, fuzzy, python-format +msgid "%s updates" +msgstr "安裝更新套件(_I)" + +#: ../SoftwareProperties/SoftwareProperties.py:294 +msgid "Main server" +msgstr "" + +#. TRANSLATORS: %s is a country +#: ../SoftwareProperties/SoftwareProperties.py:298 +#: ../SoftwareProperties/SoftwareProperties.py:315 +#, python-format +msgid "Server for %s" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:302 +msgid "Nearest server" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:322 +msgid "Custom servers" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:543 +#: ../SoftwareProperties/SoftwareProperties.py:560 +#, fuzzy +msgid "Software Channel" +msgstr "軟體更新" + +#: ../SoftwareProperties/SoftwareProperties.py:551 +#: ../SoftwareProperties/SoftwareProperties.py:568 +msgid "Active" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:652 +msgid "(Source Code)" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:658 +msgid "Source Code" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:908 msgid "Import key" msgstr "匯入金鑰" -#: ../SoftwareProperties/SoftwareProperties.py:442 +#: ../SoftwareProperties/SoftwareProperties.py:918 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:443 +#: ../SoftwareProperties/SoftwareProperties.py:919 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:455 +#: ../SoftwareProperties/SoftwareProperties.py:931 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:456 +#: ../SoftwareProperties/SoftwareProperties.py:932 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:497 +#: ../SoftwareProperties/SoftwareProperties.py:978 #, python-format msgid "" "<big><b>Error scaning the CD</b></big>\n" @@ -84,11 +128,11 @@ msgstr "" "\n" "%s" -#: ../SoftwareProperties/SoftwareProperties.py:554 +#: ../SoftwareProperties/SoftwareProperties.py:1035 msgid "Please enter a name for the disc" msgstr "請輸入光碟的名稱" -#: ../SoftwareProperties/SoftwareProperties.py:570 +#: ../SoftwareProperties/SoftwareProperties.py:1051 msgid "Please insert a disc in the drive:" msgstr "請將光碟放入光碟機：" @@ -104,31 +148,31 @@ msgstr "" "您的系統有安裝不完整的套件，而本程式無法將它們修正。在進行前請先使用 " "synaptic 或 apt-get 來修恢它們。" -#: ../DistUpgrade/DistUpgradeCache.py:135 +#: ../DistUpgrade/DistUpgradeCache.py:150 msgid "Can't upgrade required meta-packages" msgstr "無法升級須要的元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:142 +#: ../DistUpgrade/DistUpgradeCache.py:157 msgid "A essential package would have to be removed" msgstr "將會移除的核心套件" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:145 +#: ../DistUpgrade/DistUpgradeCache.py:160 msgid "Could not calculate the upgrade" msgstr "無法計算升級" -#: ../DistUpgrade/DistUpgradeCache.py:146 +#: ../DistUpgrade/DistUpgradeCache.py:161 msgid "" "A unresolvable problem occured while calculating the upgrade. Please report " "this as a bug. " msgstr "計算升級時發生無法解決的問題，請匯報問題。 " #. FIXME: maybe ask a question here? instead of failing? -#: ../DistUpgrade/DistUpgradeCache.py:169 +#: ../DistUpgrade/DistUpgradeCache.py:184 msgid "Error authenticating some packages" msgstr "認證一些套件時發生錯誤" -#: ../DistUpgrade/DistUpgradeCache.py:170 +#: ../DistUpgrade/DistUpgradeCache.py:185 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " @@ -137,23 +181,23 @@ msgstr "" "一些套件不能認證，這可能是由於短暫的網路問題；您可以稍後再試。以下為沒有認證" "的套件。" -#: ../DistUpgrade/DistUpgradeCache.py:233 +#: ../DistUpgrade/DistUpgradeCache.py:248 #, python-format msgid "Can't install '%s'" msgstr "無法安裝‘%s’" -#: ../DistUpgrade/DistUpgradeCache.py:234 +#: ../DistUpgrade/DistUpgradeCache.py:249 msgid "" "It was impossible to install a required package. Please report this as a " "bug. " msgstr "無法安裝須要的套件，請匯報問題。 " #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:241 +#: ../DistUpgrade/DistUpgradeCache.py:256 msgid "Can't guess meta-package" msgstr "無法估計元套件 (meta-package)" -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:257 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop or edubuntu-" "desktop package and it was not possible to detect which version of ubuntu " @@ -165,15 +209,15 @@ msgstr "" "此無法偵測正在執行那個版本的 ubuntu。\n" " 請進行操作前使用 synaptic 或 apt-get安裝上述其中一個套件" -#: ../DistUpgrade/DistUpgradeControler.py:44 +#: ../DistUpgrade/DistUpgradeControler.py:48 msgid "Reading cache" msgstr "正在讀取快取" -#: ../DistUpgrade/DistUpgradeControler.py:145 +#: ../DistUpgrade/DistUpgradeControler.py:149 msgid "No valid mirror found" msgstr "找不到有效的 mirror" -#: ../DistUpgrade/DistUpgradeControler.py:146 +#: ../DistUpgrade/DistUpgradeControler.py:150 #, python-format msgid "" "While scaning your repository information no mirror entry for the upgrade " @@ -192,11 +236,11 @@ msgstr "" "如果選擇「否」，則更新會被取消。" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeControler.py:163 +#: ../DistUpgrade/DistUpgradeControler.py:167 msgid "Generate default sources?" msgstr "產生預設的來源？" -#: ../DistUpgrade/DistUpgradeControler.py:164 +#: ../DistUpgrade/DistUpgradeControler.py:168 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -208,21 +252,21 @@ msgstr "" "\n" "需要加入預設的 '%s' 項目嗎？如果你選擇「否」，更新將會被取消。" -#: ../DistUpgrade/DistUpgradeControler.py:198 +#: ../DistUpgrade/DistUpgradeControler.py:202 msgid "Repository information invalid" msgstr "無效的套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:199 +#: ../DistUpgrade/DistUpgradeControler.py:203 msgid "" "Upgrading the repository information resulted in a invalid file. Please " "report this as a bug." msgstr "升級套件庫時導致無效的檔案。請匯報問題。" -#: ../DistUpgrade/DistUpgradeControler.py:205 +#: ../DistUpgrade/DistUpgradeControler.py:209 msgid "Third party sources disabled" msgstr "停用第三方來源" -#: ../DistUpgrade/DistUpgradeControler.py:206 +#: ../DistUpgrade/DistUpgradeControler.py:210 msgid "" "Some third party entries in your souces.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or with " @@ -231,21 +275,21 @@ msgstr "" "你的 sources.list 中，部份第三方的項目已經被停用。在使用 'software-" "properties' 工具或 synaptic升級後，你可以重新啟用它。" -#: ../DistUpgrade/DistUpgradeControler.py:252 +#: ../DistUpgrade/DistUpgradeControler.py:256 msgid "Error during update" msgstr "更新時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:253 +#: ../DistUpgrade/DistUpgradeControler.py:257 msgid "" "A problem occured during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "更新時發生錯誤。這可能是某些網路問題，試檢查網路連線及再試。" -#: ../DistUpgrade/DistUpgradeControler.py:262 +#: ../DistUpgrade/DistUpgradeControler.py:266 msgid "Not enough free disk space" msgstr "磁碟空間不足" -#: ../DistUpgrade/DistUpgradeControler.py:263 +#: ../DistUpgrade/DistUpgradeControler.py:267 #, python-format msgid "" "The upgrade aborts now. Please free at least %s of disk space on %s. Empty " @@ -256,15 +300,15 @@ msgstr "" "clean'來移除先前安裝套件時的暫存檔。" #. ask the user if he wants to do the changes -#: ../DistUpgrade/DistUpgradeControler.py:320 +#: ../DistUpgrade/DistUpgradeControler.py:326 msgid "Do you want to start the upgrade?" msgstr "是否要開始升級？" -#: ../DistUpgrade/DistUpgradeControler.py:337 +#: ../DistUpgrade/DistUpgradeControler.py:343 msgid "Could not install the upgrades" msgstr "無法安裝升級" -#: ../DistUpgrade/DistUpgradeControler.py:338 +#: ../DistUpgrade/DistUpgradeControler.py:344 msgid "" "The upgrade aborts now. Your system can be in an unusable state. A recovery " "was run (dpkg --configure -a)." @@ -272,21 +316,21 @@ msgstr "" "升級中止。 你的系統現在可能在一個不穩定的狀態。 正在進行復原 (dpkg --" "configure -a)。" -#: ../DistUpgrade/DistUpgradeControler.py:353 +#: ../DistUpgrade/DistUpgradeControler.py:359 msgid "Could not download the upgrades" msgstr "無法下載升級套件" -#: ../DistUpgrade/DistUpgradeControler.py:354 +#: ../DistUpgrade/DistUpgradeControler.py:360 msgid "" "The upgrade aborts now. Please check your internet connection or " "installation media and try again. " msgstr "升級現正中止。請檢查網路連線是否正常及再試 " -#: ../DistUpgrade/DistUpgradeControler.py:389 +#: ../DistUpgrade/DistUpgradeControler.py:395 msgid "Some software no longer officially supported" msgstr "有些軟體不再有官方支援" -#: ../DistUpgrade/DistUpgradeControler.py:391 +#: ../DistUpgrade/DistUpgradeControler.py:397 msgid "" "These installed packages are no longer officially supported, and are now " "only community-supported ('universe').\n" @@ -295,49 +339,49 @@ msgid "" "removal in the next step. " msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:416 +#: ../DistUpgrade/DistUpgradeControler.py:422 msgid "Remove obsolete packages?" msgstr "移除不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Skip This Step" msgstr "略過這步驟(_S)" -#: ../DistUpgrade/DistUpgradeControler.py:417 +#: ../DistUpgrade/DistUpgradeControler.py:423 msgid "_Remove" msgstr "移除(_R)" -#: ../DistUpgrade/DistUpgradeControler.py:427 +#: ../DistUpgrade/DistUpgradeControler.py:433 msgid "Error during commit" msgstr "提交時發生錯誤" -#: ../DistUpgrade/DistUpgradeControler.py:428 +#: ../DistUpgrade/DistUpgradeControler.py:434 msgid "" "Some problem occured during the clean-up. Please see the below message for " "more information. " msgstr "在清理時發生一些問題。請參閱以下訊息以取得更多資訊。 " #. generate a new cache -#: ../DistUpgrade/DistUpgradeControler.py:437 +#: ../DistUpgrade/DistUpgradeControler.py:443 msgid "Restoring original system state" msgstr "恢復原先的系統狀態" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeControler.py:445 -#: ../DistUpgrade/DistUpgradeControler.py:469 +#: ../DistUpgrade/DistUpgradeControler.py:451 +#: ../DistUpgrade/DistUpgradeControler.py:475 msgid "Checking package manager" msgstr "正在檢查套件管理程式" -#: ../DistUpgrade/DistUpgradeControler.py:461 +#: ../DistUpgrade/DistUpgradeControler.py:467 msgid "Updating repository information" msgstr "正在更新套件庫資料" -#: ../DistUpgrade/DistUpgradeControler.py:480 +#: ../DistUpgrade/DistUpgradeControler.py:486 msgid "Invalid package information" msgstr "無效的套件資訊" -#: ../DistUpgrade/DistUpgradeControler.py:481 +#: ../DistUpgrade/DistUpgradeControler.py:487 #, python-format msgid "" "After your package information was updated the essential package '%s' can " @@ -345,19 +389,19 @@ msgid "" "This indicates a serious error, please report this as a bug." msgstr "" -#: ../DistUpgrade/DistUpgradeControler.py:491 +#: ../DistUpgrade/DistUpgradeControler.py:497 msgid "Asking for confirmation" msgstr "詢問以確認" -#: ../DistUpgrade/DistUpgradeControler.py:495 +#: ../DistUpgrade/DistUpgradeControler.py:501 msgid "Upgrading" msgstr "升級中" -#: ../DistUpgrade/DistUpgradeControler.py:502 +#: ../DistUpgrade/DistUpgradeControler.py:508 msgid "Searching for obsolete software" msgstr "尋搜不再使用的套件" -#: ../DistUpgrade/DistUpgradeControler.py:507 +#: ../DistUpgrade/DistUpgradeControler.py:513 msgid "System upgrade is complete." msgstr "系統升級完成。" @@ -431,11 +475,11 @@ msgstr "" msgid "The 'diff' command was not found" msgstr "找不到‘diff’指令" -#: ../DistUpgrade/DistUpgradeViewGtk.py:337 +#: ../DistUpgrade/DistUpgradeViewGtk.py:338 msgid "A fatal error occured" msgstr "發生嚴重錯誤" -#: ../DistUpgrade/DistUpgradeViewGtk.py:338 +#: ../DistUpgrade/DistUpgradeViewGtk.py:339 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade.log " "and /var/log/dist-upgrade-apt.log in your report. The upgrade aborts now.\n" @@ -445,61 +489,63 @@ msgstr "" "dist-upgrade-apt.log 這兩個檔案。 現在取消更新。\n" "您的原始 sources.list 已被存到 /etc/apt/sources.list.distUpgrade。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:446 +#. FIXME: make those two seperate lines to make it clear +#. that the "%" applies to the result of ngettext +#: ../DistUpgrade/DistUpgradeViewGtk.py:449 #, python-format msgid "%s package is going to be removed." msgid_plural "%s packages are going to be removed." msgstr[0] "%s 個套件將會移除。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:452 +#: ../DistUpgrade/DistUpgradeViewGtk.py:454 #, python-format msgid "%s new package is going to be installed." msgid_plural "%s new packages are going to be installed." msgstr[0] "%s 個新套件將會安裝。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:458 +#: ../DistUpgrade/DistUpgradeViewGtk.py:460 #, python-format msgid "%s package is going to be upgraded." msgid_plural "%s packages are going to be upgraded." msgstr[0] "%s 個套件將會升級。" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:465 +#: ../DistUpgrade/DistUpgradeViewGtk.py:466 #, python-format msgid "You have to download a total of %s." msgstr "您總共需要下載 %s。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:469 +#: ../DistUpgrade/DistUpgradeViewGtk.py:470 msgid "" "The upgrade can take several hours and cannot be canceled at any time later." msgstr "升級可能需要數小時及無法在稍後任何時間取消。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:472 +#: ../DistUpgrade/DistUpgradeViewGtk.py:473 msgid "To prevent data loss close all open applications and documents." msgstr "避免遺失請關閉所有已開啟的程式及文件。" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeViewGtk.py:478 +#: ../DistUpgrade/DistUpgradeViewGtk.py:479 msgid "Could not find any upgrades" msgstr "無法找到任何升級" -#: ../DistUpgrade/DistUpgradeViewGtk.py:479 +#: ../DistUpgrade/DistUpgradeViewGtk.py:480 msgid "Your system has already been upgraded." msgstr "系統升級已經完成。" -#: ../DistUpgrade/DistUpgradeViewGtk.py:494 +#: ../DistUpgrade/DistUpgradeViewGtk.py:495 #, python-format msgid "<b>Remove %s</b>" msgstr "<b>移除 %s</b>" -#: ../DistUpgrade/DistUpgradeViewGtk.py:496 +#: ../DistUpgrade/DistUpgradeViewGtk.py:497 #, python-format msgid "Install %s" msgstr "安裝 %s" -#: ../DistUpgrade/DistUpgradeViewGtk.py:498 +#: ../DistUpgrade/DistUpgradeViewGtk.py:499 #, python-format msgid "Upgrade %s" msgstr "升級 %s" @@ -518,7 +564,7 @@ msgstr "升級已經完成及須要重新啟動。現在要重新啟動嗎？" #. view.setStep(i+1) #. app.openCache() #: ../DistUpgrade/DistUpgrade.glade.h:1 -#: ../data/SoftwarePropertiesDialogs.glade.h:1 +#: ../data/glade/SoftwareProperties.glade.h:1 msgid " " msgstr " " @@ -542,8 +588,8 @@ msgid "<b><big>Start the upgrade?</big></b>" msgstr "<b><big>開始升級？</big></b>" #: ../DistUpgrade/DistUpgrade.glade.h:7 -msgid "" -"<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.06 LTS</span>" +#, fuzzy +msgid "<span weight=\"bold\" size=\"x-large\">Upgrading to Ubuntu 6.10</span>" msgstr "<span weight=\"bold\" size=\"x-large\">升級至 Ubuntu 6.06 LTS</span>" #: ../DistUpgrade/DistUpgrade.glade.h:8 @@ -692,22 +738,27 @@ msgstr "正在下載檔案 %li/%li，下載速度為 %s/秒" msgid "Downloading file %li of %li with unknown speed" msgstr "正在下載檔案 %li/%li，下載速度不明" -#: ../UpdateManager/UpdateManager.py:175 +#: ../UpdateManager/UpdateManager.py:185 +#, fuzzy +msgid "The list of changes is not available" +msgstr "修改紀錄不存在，請稍後再試。" + +#: ../UpdateManager/UpdateManager.py:191 msgid "The list of changes is not available yet. Please try again later." msgstr "修改紀錄不存在，請稍後再試。" -#: ../UpdateManager/UpdateManager.py:180 +#: ../UpdateManager/UpdateManager.py:196 msgid "" "Failed to download the list of changes. Please check your Internet " "connection." msgstr "無法下載更動列表。請檢查網路連線是否正常。" #. print "WARNING, keeping packages" -#: ../UpdateManager/UpdateManager.py:211 +#: ../UpdateManager/UpdateManager.py:224 msgid "Cannot install all available updates" msgstr "無法安裝所有更新套件" -#: ../UpdateManager/UpdateManager.py:212 +#: ../UpdateManager/UpdateManager.py:225 msgid "" "Some updates require the removal of further software. Use the function " "\"Mark All Upgrades\" of the package manager \"Synaptic\" or run \"sudo apt-" @@ -716,62 +767,54 @@ msgstr "" "有一些更新須要移除其它套件。使用“Synaptic 套件管理程式”的「標記所有升級」功能" "或在終端機中執行“sudo apt-get dist-upgrade”來完整地更新您的系統。" -#: ../UpdateManager/UpdateManager.py:222 +#: ../UpdateManager/UpdateManager.py:235 msgid "The following updates will be skipped:" msgstr "會略過更新以下套件：" -#: ../UpdateManager/UpdateManager.py:361 +#: ../UpdateManager/UpdateManager.py:408 #, python-format msgid "Version %s: \n" msgstr "版本 %s： \n" -#: ../UpdateManager/UpdateManager.py:421 +#: ../UpdateManager/UpdateManager.py:468 msgid "Downloading the list of changes..." msgstr "正在下載修改紀錄..." -#: ../UpdateManager/UpdateManager.py:444 ../UpdateManager/UpdateManager.py:454 -#: ../UpdateManager/UpdateManager.py:478 +#: ../UpdateManager/UpdateManager.py:491 ../UpdateManager/UpdateManager.py:501 +#: ../UpdateManager/UpdateManager.py:525 #, python-format msgid "Download size: %s" msgstr "下載大小：%s" -#: ../UpdateManager/UpdateManager.py:463 +#: ../UpdateManager/UpdateManager.py:510 msgid "Your system is up-to-date" msgstr "系統已經在最新狀態" -#: ../UpdateManager/UpdateManager.py:474 +#: ../UpdateManager/UpdateManager.py:521 #, python-format msgid "You can install %s update" msgid_plural "You can install %s updates" msgstr[0] "您可以安裝 %s 個更新" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:489 -msgid "Hide details" -msgstr "隱藏詳細資料" - -#: ../UpdateManager/UpdateManager.py:491 ../data/UpdateManager.glade.h:14 -msgid "Show details" -msgstr "顯示詳細資料" - -#: ../UpdateManager/UpdateManager.py:506 +#: ../UpdateManager/UpdateManager.py:555 msgid "Please wait, this can take some time." msgstr "請稍候，這可能需要一點時間。" -#: ../UpdateManager/UpdateManager.py:508 +#: ../UpdateManager/UpdateManager.py:557 msgid "Update is complete" msgstr "更新完成" -#: ../UpdateManager/UpdateManager.py:611 +#: ../UpdateManager/UpdateManager.py:665 #, python-format msgid "New version: %s (Size: %s)" msgstr "新版本：%s （大小：%s）" -#: ../UpdateManager/UpdateManager.py:625 +#: ../UpdateManager/UpdateManager.py:679 msgid "Your distribution is not supported anymore" msgstr "您正使用的發行版本已不再支援" -#: ../UpdateManager/UpdateManager.py:626 +#: ../UpdateManager/UpdateManager.py:680 msgid "" "You will not get any further security fixes or critical updates. Upgrade to " "a later version of Ubuntu Linux. See http://www.ubuntu.com for more " @@ -780,25 +823,17 @@ msgstr "" "您不會再取得任何安全或重大更新，請升級到最新版本的 Ubuntu Linux。請參閱 " "http://www.ubuntu.com以取得更多升級資訊。" -#: ../UpdateManager/UpdateManager.py:662 +#: ../UpdateManager/UpdateManager.py:716 #, python-format msgid "<b>New distribution release '%s' is available</b>" msgstr "<b>有新的 distribution 發行版 '%s'</b>" -#: ../UpdateManager/UpdateManager.py:677 -msgid "Only one software management tool is allowed to run at the same time" -msgstr "同時間只允許執行一個套件管理程式" - -#: ../UpdateManager/UpdateManager.py:679 -msgid "Please close the other application e.g. 'aptitude' or 'Synaptic' first." -msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。" - #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:696 +#: ../UpdateManager/UpdateManager.py:751 msgid "Software index is broken" msgstr "軟體索引損壞" -#: ../UpdateManager/UpdateManager.py:697 +#: ../UpdateManager/UpdateManager.py:752 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " @@ -807,7 +842,7 @@ msgstr "" "不能安裝或移除任何套件。請先使用套件管理程式“Synaptic”或在終端機中執行“sudo " "apt-get install -f”來修正問題。" -#: ../data/UpdateManager.glade.h:1 +#: ../data/glade/UpdateManager.glade.h:1 msgid "" "<b><big>You must check for updates manually</big></b>\n" "\n" @@ -818,7 +853,7 @@ msgstr "" "\n" "您的系統不會自動檢查更新。您可以在「系統」→「管理的→「軟體偏好設定」中設定。" -#: ../data/UpdateManager.glade.h:4 +#: ../data/glade/UpdateManager.glade.h:4 msgid "" "<big><b>Examining your system</b></big>\n" "\n" @@ -829,143 +864,184 @@ msgstr "" "\n" "軟體更新會更正錯誤，排除安全弱點，並提功新功能." -#: ../data/UpdateManager.glade.h:7 +#: ../data/glade/UpdateManager.glade.h:7 msgid "<big><b>Keep your system up-to-date</b></big>" msgstr "<big><b>將您的系統維持在最新狀態</b></big>" -#: ../data/UpdateManager.glade.h:8 +#: ../data/glade/UpdateManager.glade.h:8 msgid "Cancel _Download" msgstr "取消下載(_D)" -#: ../data/UpdateManager.glade.h:9 +#: ../data/glade/UpdateManager.glade.h:9 msgid "Changes" msgstr "修改紀錄" -#: ../data/UpdateManager.glade.h:10 +#: ../data/glade/UpdateManager.glade.h:10 +msgid "Changes and description of the update" +msgstr "" + +#: ../data/glade/UpdateManager.glade.h:11 msgid "Chec_k" msgstr "檢查(_K)" -#: ../data/UpdateManager.glade.h:11 +#: ../data/glade/UpdateManager.glade.h:12 msgid "Check the software channels for new updates" msgstr "檢查軟體來源有沒有更新套件" -#: ../data/UpdateManager.glade.h:12 +#: ../data/glade/UpdateManager.glade.h:13 msgid "Description" msgstr "詳細說明" -#: ../data/UpdateManager.glade.h:13 +#: ../data/glade/UpdateManager.glade.h:14 msgid "Release Notes" msgstr "發行說明" -#: ../data/UpdateManager.glade.h:15 +#: ../data/glade/UpdateManager.glade.h:15 msgid "Show progress of single files" msgstr "顯示單一檔案的進度" -#: ../data/UpdateManager.glade.h:16 +#: ../data/glade/UpdateManager.glade.h:16 msgid "Software Updates" msgstr "軟體更新" -#: ../data/UpdateManager.glade.h:17 +#: ../data/glade/UpdateManager.glade.h:17 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "軟體更新會更正錯誤, 排除安全弱點, 並提功新功能." -#: ../data/UpdateManager.glade.h:18 +#: ../data/glade/UpdateManager.glade.h:18 msgid "U_pgrade" msgstr "升級(_P)" -#: ../data/UpdateManager.glade.h:19 +#: ../data/glade/UpdateManager.glade.h:19 msgid "Upgrade to the latest version of Ubuntu" msgstr "升級到最新版本的 Ubuntu" -#: ../data/UpdateManager.glade.h:20 +#: ../data/glade/UpdateManager.glade.h:20 msgid "_Check" msgstr "檢查(_C)" -#: ../data/UpdateManager.glade.h:21 +#: ../data/glade/UpdateManager.glade.h:21 msgid "_Hide this information in the future" msgstr "以後不要再顯示此訊息(_H)" -#: ../data/UpdateManager.glade.h:22 +#: ../data/glade/UpdateManager.glade.h:22 msgid "_Install Updates" msgstr "安裝更新套件(_I)" -#: ../data/SoftwareProperties.glade.h:1 -msgid "<b>Channels</b>" -msgstr "<b>套件來源</b>" +#: ../data/glade/UpdateManager.glade.h:23 +#, fuzzy +msgid "changes" +msgstr "修改紀錄" -#: ../data/SoftwareProperties.glade.h:2 -msgid "<b>Internet updates</b>" +#: ../data/glade/UpdateManager.glade.h:24 +msgid "updates" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:2 +#, fuzzy +msgid "<b>Automatic updates</b>" msgstr "<b>線上更新</b>" -#: ../data/SoftwareProperties.glade.h:3 -msgid "<b>Keys</b>" -msgstr "<b>金鑰</b>" +#: ../data/glade/SoftwareProperties.glade.h:3 +msgid "<b>CDROM/DVD</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:4 +msgid "<b>Downloadable software</b>" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:5 +msgid "<b>Internet updates</b>" +msgstr "<b>線上更新</b>" -#: ../data/SoftwareProperties.glade.h:4 -msgid "Add _Cdrom" -msgstr "加入光碟(_C)" +#: ../data/glade/SoftwareProperties.glade.h:6 +msgid "" +"<i>To improve the user experience of Ubuntu please take part in the " +"popularity contest. If you do so the list of installed software and how " +"often it was used will be collected and sent anonymously to the Ubuntu " +"project on a weekly basis.\n" +"\n" +"The results are used to improve the support for popular applications and to " +"rank applications in the search results.</i>" +msgstr "" -#: ../data/SoftwareProperties.glade.h:5 +#: ../data/glade/SoftwareProperties.glade.h:9 msgid "Authentication" msgstr "認證" -#: ../data/SoftwareProperties.glade.h:6 +#: ../data/glade/SoftwareProperties.glade.h:10 msgid "D_elete downloaded software files:" msgstr "刪除已下載的軟體檔案(_E)：" -#: ../data/SoftwareProperties.glade.h:7 +#: ../data/glade/SoftwareProperties.glade.h:11 +#, fuzzy +msgid "Download from:" +msgstr "下載完成" + +#: ../data/glade/SoftwareProperties.glade.h:12 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 +#: ../data/glade/SoftwareProperties.glade.h:13 msgid "Internet Updates" msgstr "線上更新" -#: ../data/SoftwareProperties.glade.h:10 +#: ../data/glade/SoftwareProperties.glade.h:14 msgid "" "Only security updates from the official Ubuntu servers will be installed " "automatically" msgstr "只有來自 Ubuntu 官方伺服器的安全性更新會自動安裝" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/glade/SoftwareProperties.glade.h:15 msgid "Restore _Defaults" msgstr "還原為預設值(_D)" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/glade/SoftwareProperties.glade.h:16 msgid "Restore the default keys of your distribution" msgstr "還原為發行版本預設的金鑰" -#: ../data/SoftwareProperties.glade.h:13 -msgid "Software Preferences" -msgstr "軟體偏好設定" +#: ../data/glade/SoftwareProperties.glade.h:17 +#: ../data/software-properties.desktop.in.h:2 +#, fuzzy +msgid "Software Sources" +msgstr "軟體屬性" + +#: ../data/glade/SoftwareProperties.glade.h:18 +msgid "Source code" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:19 +msgid "Statistics" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:20 +msgid "Submit statistical information" +msgstr "" + +#: ../data/glade/SoftwareProperties.glade.h:21 +msgid "Third Party" +msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/glade/SoftwareProperties.glade.h:22 msgid "_Check for updates automatically:" msgstr "自動檢查更新(_C)：" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Download updates in the background, but do not install them" +#: ../data/glade/SoftwareProperties.glade.h:23 +#, fuzzy +msgid "_Download updates automatically, but do not install them" msgstr "在背景下載更新套件，但無須安裝(_D)" -#: ../data/SoftwareProperties.glade.h:16 +#: ../data/glade/SoftwareProperties.glade.h:24 msgid "_Import Key File" msgstr "匯入金鑰" -#: ../data/SoftwareProperties.glade.h:17 +#: ../data/glade/SoftwareProperties.glade.h:25 msgid "_Install security updates without confirmation" msgstr "無須確認便安裝安全性更新(_I)" -#: ../data/SoftwarePropertiesDialogs.glade.h:2 -msgid " " -msgstr " " - -#: ../data/SoftwarePropertiesDialogs.glade.h:3 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:1 msgid "" "<b><big>The channel information is out-of-date</big></b>\n" "\n" @@ -981,40 +1057,33 @@ msgstr "" "\n" "您須要連線到網際網路繼續。" -#: ../data/SoftwarePropertiesDialogs.glade.h:8 -msgid "<b>Channel</b>" -msgstr "<b>套件來源</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:9 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:6 msgid "<b>Comment:</b>" msgstr "<b>備註：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:10 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:7 msgid "<b>Components:</b>" msgstr "<b>元件：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:11 -msgid "<b>Components</b>" -msgstr "<b>元件</b>" - -#: ../data/SoftwarePropertiesDialogs.glade.h:12 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:8 msgid "<b>Distribution:</b>" msgstr "<b>發行版本：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:13 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:9 msgid "<b>Type:</b>" msgstr "<b>類型：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:14 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:10 msgid "<b>URI:</b>" msgstr "<b>URI：</b>" -#: ../data/SoftwarePropertiesDialogs.glade.h:15 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:11 +#, fuzzy msgid "" -"<big><b>Enter the complete APT line of the channel that you want to add</b></" +"<big><b>Enter the complete APT line of the source that you want to add</b></" "big>\n" "\n" -"The APT line includes the type, location and components of a channel, for " +"The APT line includes the type, location and components of a source, for " "example <i>\"deb http://ftp.debian.org sarge main\"</i>." msgstr "" "<big><b>請輸入您想加入的完整的 APT 來源列</b></big>\n" @@ -1023,15 +1092,11 @@ msgstr "" "APT 來源列包括了來源的類型、位置及 components，例如 <i>\"deb http://ftp." "debian.org sarge main\"</i>。" -#: ../data/SoftwarePropertiesDialogs.glade.h:18 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:14 msgid "APT line:" msgstr "APT 套件庫位置：" -#: ../data/SoftwarePropertiesDialogs.glade.h:19 -msgid "Add Channel" -msgstr "加入套件來源" - -#: ../data/SoftwarePropertiesDialogs.glade.h:20 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:15 msgid "" "Binary\n" "Source" @@ -1039,24 +1104,19 @@ msgstr "" "可執行檔\n" "源程式碼" -#: ../data/SoftwarePropertiesDialogs.glade.h:22 -msgid "Edit Channel" -msgstr "編輯套件來源" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:17 +msgid "Edit Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:23 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:18 msgid "Scanning CD-ROM" msgstr "正在掃描光碟" -#: ../data/SoftwarePropertiesDialogs.glade.h:24 -#, fuzzy -msgid "_Add Channel" -msgstr "加入套件來源(_A)" - -#: ../data/SoftwarePropertiesDialogs.glade.h:25 -msgid "_Custom" -msgstr "自訂(_C)" +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:19 +msgid "_Add Source" +msgstr "" -#: ../data/SoftwarePropertiesDialogs.glade.h:26 +#: ../data/glade/SoftwarePropertiesDialogs.glade.h:20 msgid "_Reload" msgstr "重新載入(_R)" @@ -1110,119 +1170,311 @@ msgid "The window size" msgstr "視窗大小" #: ../data/software-properties.desktop.in.h:1 -msgid "Configure software channels and internet updates" +#, fuzzy +msgid "Configure the sources for installable software and updates" msgstr "設定套件來源及網路更新" -#: ../data/software-properties.desktop.in.h:2 -msgid "Software Properties" -msgstr "軟體屬性" - #. ChangelogURI -#: ../channels/Ubuntu.info.in.h:4 +#: ../data/channels/Ubuntu.info.in.h:4 #, no-c-format msgid "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Ubuntu.info.in:6 -msgid "Ubuntu 6.06 LTS" -msgstr "Ubuntu 6.06 更新" +#: ../data/channels/Ubuntu.info.in:7 +#, fuzzy +msgid "Ubuntu 6.10 'Edgy Eft'" +msgstr "Ubuntu 5.10 更新" #. Description -#: ../channels/Ubuntu.info.in:23 -msgid "Ubuntu 6.06 LTS Security Updates" -msgstr "Ubuntu 6.06 LTS 安全性更新" +#: ../data/channels/Ubuntu.info.in:28 +msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" +msgstr "" #. Description -#: ../channels/Ubuntu.info.in:40 -msgid "Ubuntu 6.06 LTS Updates" -msgstr "Ubuntu 6.06 LTS 更新" +#: ../data/channels/Ubuntu.info.in:62 +#, fuzzy +msgid "Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 ‘Dapper Drake‘" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:66 +msgid "" +"OpenSource software that is officially supported by Canonical Ltd. (main)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:69 +#, fuzzy +msgid "Community maintained (universe)" +msgstr "協力維護軟體 (Universe)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:70 +msgid "OpenSource software that is maintained by the community (universe)" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:73 +#, fuzzy +msgid "Non-free drivers" +msgstr "非自由軟體 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:74 +msgid "Proprietary drivers for devices (restricted) " +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:77 +#, fuzzy +msgid "Restricted software (Multiverse)" +msgstr "非自由軟體 (Multiverse)" + +#. CompDescriptionLong +#: ../data/channels/Ubuntu.info.in:78 +msgid "Software that is restricted by copyright or legal issues (multiverse)" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:83 +#, fuzzy +msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" +msgstr "Ubuntu 6.06 ‘Dapper Drake‘" #. Description -#: ../channels/Ubuntu.info.in:57 -msgid "Ubuntu 6.06 LTS Backports" -msgstr "Ubuntu 6.06 LTS 回移套件" +#: ../data/channels/Ubuntu.info.in:97 +#, fuzzy +msgid "Important security updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:104 +msgid "Recommended updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:111 +msgid "Backported updates" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:117 +msgid "Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../channels/Ubuntu.info.in:60 ../channels/Debian.info.in:51 +#: ../data/channels/Ubuntu.info.in:120 ../data/channels/Debian.info.in:51 msgid "Officially supported" msgstr "官方支援" -#. CompDescription -#: ../channels/Ubuntu.info.in:63 -msgid "Restricted copyright" -msgstr "版權受限制" +#. Description +#: ../data/channels/Ubuntu.info.in:134 +#, fuzzy +msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" +msgstr "Ubuntu 5.10 ‘Breezy Badger’" + +#. Description +#: ../data/channels/Ubuntu.info.in:148 +msgid "Ubuntu 5.10 Security Updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:155 +msgid "Ubuntu 5.10 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:162 +msgid "Ubuntu 5.10 Backports" +msgstr "Ubuntu 5.10 回移套件" + +#. Description +#: ../data/channels/Ubuntu.info.in:168 +#, fuzzy +msgid "Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "Ubuntu 5.10 ‘Breezy Badger’" + +#. Description +#: ../data/channels/Ubuntu.info.in:185 +msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +msgstr "" + +#. Description +#: ../data/channels/Ubuntu.info.in:199 +#, fuzzy +msgid "Ubuntu 5.04 Security Updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:206 +#, fuzzy +msgid "Ubuntu 5.04 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:213 +#, fuzzy +msgid "Ubuntu 5.04 Backports" +msgstr "Ubuntu 5.10 回移套件" + +#. Description +#: ../data/channels/Ubuntu.info.in:219 +#, fuzzy +msgid "Ubuntu 4.10 'Warty Warthog'" +msgstr "Ubuntu 5.10 ‘Breezy Badger’" #. CompDescription -#: ../channels/Ubuntu.info.in:66 +#: ../data/channels/Ubuntu.info.in:228 msgid "Community maintained (Universe)" msgstr "協力維護軟體 (Universe)" #. CompDescription -#: ../channels/Ubuntu.info.in:69 +#: ../data/channels/Ubuntu.info.in:231 msgid "Non-free (Multiverse)" msgstr "非自由軟體 (Multiverse)" +#. Description +#: ../data/channels/Ubuntu.info.in:236 +msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" +msgstr "" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:240 +#, fuzzy +msgid "Oficially supported" +msgstr "官方支援" + +#. CompDescription +#: ../data/channels/Ubuntu.info.in:243 +msgid "Restricted copyright" +msgstr "版權受限制" + +#. Description +#: ../data/channels/Ubuntu.info.in:250 +#, fuzzy +msgid "Ubuntu 4.10 Security Updates" +msgstr "Ubuntu 5.10 安全性更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:257 +#, fuzzy +msgid "Ubuntu 4.10 Updates" +msgstr "Ubuntu 5.10 更新" + +#. Description +#: ../data/channels/Ubuntu.info.in:264 +#, fuzzy +msgid "Ubuntu 4.10 Backports" +msgstr "Ubuntu 5.10 回移套件" + #. ChangelogURI -#: ../channels/Debian.info.in.h:4 +#: ../data/channels/Debian.info.in.h:4 #, no-c-format msgid "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" msgstr "http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog" #. Description -#: ../channels/Debian.info.in:6 +#: ../data/channels/Debian.info.in:6 msgid "Debian 3.1 \"Sarge\"" msgstr "Debian 3.1 “Sarge”" #. BaseURI -#: ../channels/Debian.info.in:19 +#: ../data/channels/Debian.info.in:19 msgid "http://security.debian.org/" msgstr "http://security.debian.org/" #. Description -#: ../channels/Debian.info.in:20 +#: ../data/channels/Debian.info.in:20 msgid "Debian 3.1 \"Sarge\" Security Updates" msgstr "Debian 3.1 “Sarge” 安全性更新" #. Description -#: ../channels/Debian.info.in:34 +#: ../data/channels/Debian.info.in:34 msgid "Debian \"Etch\" (testing)" msgstr "Debian “Etch”（測試版）" #. BaseURI -#: ../channels/Debian.info.in:47 +#: ../data/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 +#: ../data/channels/Debian.info.in:48 msgid "Debian \"Sid\" (unstable)" msgstr "Debian “Sid”（不穩定版）" #. CompDescription -#: ../channels/Debian.info.in:54 +#: ../data/channels/Debian.info.in:54 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "符合 DFSG 的軟體，但有依賴於非自由軟體" #. CompDescription -#: ../channels/Debian.info.in:57 +#: ../data/channels/Debian.info.in:57 msgid "Non-DFSG-compatible Software" msgstr "不符合 DFSG 的軟體" -#~ msgid "Ubuntu 6.06 'Dapper Drake'" -#~ msgstr "Ubuntu 6.06 ‘Dapper Drake‘" +#~ msgid "Hide details" +#~ msgstr "隱藏詳細資料" + +#~ msgid "Show details" +#~ msgstr "顯示詳細資料" + +#~ msgid "Only one software management tool is allowed to run at the same time" +#~ msgstr "同時間只允許執行一個套件管理程式" + +#~ msgid "" +#~ "Please close the other application e.g. 'aptitude' or 'Synaptic' first." +#~ msgstr "請先關閉其它程式，如‘aptitude’ 或‘Synaptic’。" + +#~ msgid "<b>Channels</b>" +#~ msgstr "<b>套件來源</b>" + +#~ msgid "<b>Keys</b>" +#~ msgstr "<b>金鑰</b>" + +#~ msgid "Add _Cdrom" +#~ msgstr "加入光碟(_C)" + +#~ msgid "Installation Media" +#~ msgstr "安裝媒體" + +#~ msgid "Software Preferences" +#~ msgstr "軟體偏好設定" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "<b>Channel</b>" +#~ msgstr "<b>套件來源</b>" + +#~ msgid "<b>Components</b>" +#~ msgstr "<b>元件</b>" + +#~ msgid "Add Channel" +#~ msgstr "加入套件來源" + +#~ msgid "Edit Channel" +#~ msgstr "編輯套件來源" + +#, fuzzy +#~ msgid "_Add Channel" +#~ msgstr "加入套件來源(_A)" + +#~ msgid "_Custom" +#~ msgstr "自訂(_C)" -#~ msgid "Ubuntu 5.10 'Breezy Badger'" -#~ msgstr "Ubuntu 5.10 ‘Breezy Badger’" +#~ msgid "Ubuntu 6.06 LTS" +#~ msgstr "Ubuntu 6.06 更新" -#~ msgid "Ubuntu 5.10 Security Updates" -#~ msgstr "Ubuntu 5.10 安全性更新" +#~ msgid "Ubuntu 6.06 LTS Security Updates" +#~ msgstr "Ubuntu 6.06 LTS 安全性更新" -#~ msgid "Ubuntu 5.10 Updates" -#~ msgstr "Ubuntu 5.10 更新" +#~ msgid "Ubuntu 6.06 LTS Updates" +#~ msgstr "Ubuntu 6.06 LTS 更新" -#~ msgid "Ubuntu 5.10 Backports" -#~ msgstr "Ubuntu 5.10 回移套件" +#~ msgid "Ubuntu 6.06 LTS Backports" +#~ msgstr "Ubuntu 6.06 LTS 回移套件" #~ msgid "No valid entry found" #~ msgstr "找不到有效的項目" @@ -36,6 +36,12 @@ for size in glob.glob("data/icons/*"): print ICONS +for template in glob.glob("data/channels/*.info.in"): + os.system("sed s/^_// data/channels/%s" + " > build/%s" % (os.path.basename(template), + os.path.basename(template)[:-3])) +os.system("intltool-merge -d po data/mime/apt.xml.in"\ + " build/apt.xml") os.system("intltool-merge -d po data/update-manager.schemas.in"\ " build/update-manager.schemas") @@ -45,7 +51,7 @@ os.system("cd po; make update-po") # do the same for the desktop files os.system("cd data; make") # and channels -os.system("cd channels; make") +os.system("cd data/channels; make") setup(name='update-manager', version='0.42.2', @@ -60,10 +66,13 @@ setup(name='update-manager', ], data_files=[ ('share/update-manager/glade', - glob.glob("data/*.glade") + glob.glob("data/glade/*.glade") + ), + ('share/doc/update-manager', + glob.glob("data/channels/README.channels") ), ('share/update-manager/channels', - glob.glob("channels/*") + glob.glob("build/*.info") ), ('share/applications', ["data/update-manager.desktop", @@ -72,7 +81,9 @@ setup(name='update-manager', ('share/gconf/schemas', glob.glob("build/*.schemas") ), + ('share/mime/packages', + ["build/apt.xml"] + ) + ] + I18NFILES + HELPFILES + ICONS, ) - - diff --git a/software-properties b/software-properties index d447ebbc..129c3085 100644 --- a/software-properties +++ b/software-properties @@ -34,6 +34,8 @@ import sys from optparse import OptionParser +import UpdateManager.Common.aptsources as aptsources + #sys.path.append("@prefix@/share/update-manager/python") from SoftwareProperties import SoftwareProperties @@ -51,6 +53,10 @@ if __name__ == "__main__": action="store", type="string", dest="toplevel", help="Set x-window-id of the toplevel parent for the "\ "dialog (usefull for embedding)") + parser.add_option("-e", "--enable-component", + action="store", type="string", dest="enable_component", + help="Enable the specified component of the distro's "\ + "repositories") (options, args) = parser.parse_args() @@ -74,7 +80,14 @@ if __name__ == "__main__": #data_dir="/tmp/xxx/share/update-manager/" file = None if len(args) > 0: - file = args[0] - app = SoftwareProperties.SoftwareProperties(data_dir, options, file) - app.run() - sys.exit(app.modified) + file = args[0] + if options.enable_component: + sourceslist = aptsources.SourcesList() + distro = aptsources.Distribution() + distro.get_sources(sourceslist) + distro.enable_component(sourceslist, options.enable_component) + sourceslist.save() + else: + app = SoftwareProperties.SoftwareProperties(data_dir, options, file) + app.run() + sys.exit(app.modified) |