From dd6f28d2f8ea41131f8e059556de194ed5e8e9f4 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 17 Feb 2006 20:38:33 +0100 Subject: * Allow to open URLs in the release notes using a browser * Change the label of the button ok in the release notes dialog to "Upgrade" --- UpdateManager/ReleaseNotesViewer.py | 117 ++++++++++++++++++++++++++++++++++++ UpdateManager/UpdateManager.py | 5 +- data/UpdateManager.glade | 24 ++------ 3 files changed, 125 insertions(+), 21 deletions(-) create mode 100644 UpdateManager/ReleaseNotesViewer.py diff --git a/UpdateManager/ReleaseNotesViewer.py b/UpdateManager/ReleaseNotesViewer.py new file mode 100644 index 00000000..9cecc895 --- /dev/null +++ b/UpdateManager/ReleaseNotesViewer.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python + +import pygtk +import gtk +import pango +import subprocess +import os + +class ReleaseNotesViewer(gtk.TextView): + def __init__(self, notes): + gtk.TextView.__init__(self) + self.hovering = False + self.buffer = gtk.TextBuffer() + self.set_buffer(self.buffer) + self.buffer.set_text(notes) + self.connect("event-after", self.event_after) + self.connect("motion-notify-event", self.motion_notify_event) + self.connect("visibility-notify-event", self.visibility_notify_event) + self.search_links() + self.set_property("editable", False) + self.set_cursor_visible(False) + + def tag_link(self, start, end, url): + tag = self.buffer.create_tag(None, foreground="blue", + underline=pango.UNDERLINE_SINGLE) + tag.set_data("url", url) + self.buffer.apply_tag(tag , start, end) + + def search_links(self): + iter = self.buffer.get_iter_at_offset(0) + while 1: + ret = iter.forward_search("http://", gtk.TEXT_SEARCH_VISIBLE_ONLY, + None) + if not ret: + break + (match_start, match_end) = ret + match_tmp = match_end.copy() + while 1: + if match_tmp.forward_char(): + text = match_end.get_text(match_tmp) + if text in (" ", ")", "]", "\n", "\t"): + break + else: + break + match_end = match_tmp.copy() + url = match_start.get_text(match_end) + self.tag_link(match_start, match_end, url) + iter = match_end + + def event_after(self, text_view, event): + if event.type != gtk.gdk.BUTTON_RELEASE: + return False + if event.button != 1: + return False + + try: + (start, end) = self.buffer.get_selection_bounds() + except ValueError: + pass + else: + if start.get_offset() != end.get_offset(): + return False + + (x, y) = self.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, + int(event.x), int(event.y)) + iter = self.get_iter_at_location(x, y) + + tags = iter.get_tags() + for tag in tags: + url = tag.get_data("url") + if url != "": + self.open_url(url) + break + + def open_url(self, url): + if os.path.exists('usr/bin/gnome-open'): + command = ['gnome-open', url] + else: + command = ['x-www-browser', url] + + if os.getuid() == 0 and os.environ.has_key('SUDO_USER'): + command = ['sudo', '-u', os.environ['SUDO_USER']] + command + + subprocess.Popen(command) + + def motion_notify_event(self, text_view, event): + x, y = text_view.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, + int(event.x), int(event.y)) + self.check_hovering(x, y) + self.window.get_pointer() + return False + + def visibility_notify_event(self, text_view, event): + (wx, wy, mod) = text_view.window.get_pointer() + (bx, by) = text_view.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, wx, + wy) + self.check_hovering(bx, by) + return False + + def check_hovering(self, x, y): + _hovering = False + iter = self.get_iter_at_location(x, y) + + tags = iter.get_tags() + for tag in tags: + url = tag.get_data("url") + if url != "": + _hovering = True + break + + if _hovering != self.hovering: + self.hovering = _hovering + + if self.hovering: + self.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2)) + else: + self.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.XTERM)) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 6f9e117f..f73f790a 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -55,6 +55,7 @@ from gettext import gettext as _ from Common.utils import * from Common.SimpleGladeApp import SimpleGladeApp +from ReleaseNotesViewer import ReleaseNotesViewer import GtkProgress from MetaRelease import Dist, MetaRelease @@ -644,7 +645,9 @@ class UpdateManager(SimpleGladeApp): try: release_notes = urllib2.urlopen(uri) notes = release_notes.read() - self.textview_release_notes.get_buffer().set_text(notes) + textview_release_notes = ReleaseNotesViewer(notes) + textview_release_notes.show() + self.scrolled_notes.add(textview_release_notes) self.dialog_release_notes.set_transient_for(self.window_main) res = self.dialog_release_notes.run() self.dialog_release_notes.hide() diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index e9f2b32d..400a4f75 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -981,8 +981,8 @@ Need to get the changes from the central server True True True - gtk-ok - True + _Upgrade + True GTK_RELIEF_NORMAL True -5 @@ -998,7 +998,7 @@ Need to get the changes from the central server - + 6 True True @@ -1008,23 +1008,7 @@ Need to get the changes from the central server GTK_CORNER_TOP_LEFT - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - False - 6 - 0 - 0 - 6 - 6 - 0 - - + -- cgit v1.2.3 From cf64db47c8e2192041df35c6dd056fe6ae91cacc Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 18 Feb 2006 11:20:11 +0100 Subject: * Added michaels email address as msgid bug contact * Updated the po files --- po/Makefile | 5 +++-- po/bg.po | 49 ++++++++++++++++++++++++++++--------------------- po/da.po | 49 ++++++++++++++++++++++++++++--------------------- po/de.po | 49 ++++++++++++++++++++++++++++--------------------- po/el.po | 49 ++++++++++++++++++++++++++++--------------------- po/en_CA.po | 49 ++++++++++++++++++++++++++++--------------------- po/en_GB.po | 49 ++++++++++++++++++++++++++++--------------------- po/es.po | 49 ++++++++++++++++++++++++++++--------------------- po/fi.po | 49 ++++++++++++++++++++++++++++--------------------- po/fr.po | 49 ++++++++++++++++++++++++++++--------------------- po/gl.po | 49 ++++++++++++++++++++++++++++--------------------- po/he.po | 49 ++++++++++++++++++++++++++++--------------------- po/hu.po | 49 ++++++++++++++++++++++++++++--------------------- po/it.po | 49 ++++++++++++++++++++++++++++--------------------- po/ja.po | 49 ++++++++++++++++++++++++++++--------------------- po/lt.po | 49 ++++++++++++++++++++++++++++--------------------- po/mk.po | 49 ++++++++++++++++++++++++++++--------------------- po/nb.po | 49 ++++++++++++++++++++++++++++--------------------- po/ne.po | 49 ++++++++++++++++++++++++++++--------------------- po/nl.po | 49 ++++++++++++++++++++++++++++--------------------- po/no.po | 49 ++++++++++++++++++++++++++++--------------------- po/pa.po | 49 ++++++++++++++++++++++++++++--------------------- po/pl.po | 49 ++++++++++++++++++++++++++++--------------------- po/pt_BR.po | 49 ++++++++++++++++++++++++++++--------------------- po/ro.po | 49 ++++++++++++++++++++++++++++--------------------- po/rw.po | 49 ++++++++++++++++++++++++++++--------------------- po/sv.po | 49 ++++++++++++++++++++++++++++--------------------- po/uk.po | 49 ++++++++++++++++++++++++++++--------------------- po/vi.po | 49 ++++++++++++++++++++++++++++--------------------- po/xh.po | 49 ++++++++++++++++++++++++++++--------------------- po/zh_CN.po | 49 ++++++++++++++++++++++++++++--------------------- po/zh_HK.po | 49 ++++++++++++++++++++++++++++--------------------- po/zh_TW.po | 49 ++++++++++++++++++++++++++++--------------------- 33 files changed, 899 insertions(+), 674 deletions(-) diff --git a/po/Makefile b/po/Makefile index 667f574d..b33d5697 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,16 +1,17 @@ DOMAIN=update-manager PO_FILES := $(wildcard *.po) +CONTACT=michael.vogt@canonical.com all: update-po # update the pot $(DOMAIN).pot: - intltool-update -p -g $(DOMAIN) + XGETTEXT_ARGS=--msgid-bugs-address=$(CONTACT) intltool-update -p -g $(DOMAIN) # merge the new stuff into the po files merge-po: $(PO_FILES) - intltool-update -r -g $(DOMAIN); + XGETTEXT_ARGS=--msgid-bugs-address=$(CONTACT) intltool-update -r -g $(DOMAIN); # create mo from the pos %.mo : %.po diff --git a/po/bg.po b/po/bg.po index a6e0758f..5043cebd 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-07-22 19:24+0300\n" "Last-Translator: Rostislav \"zbrox\" Raykov \n" "Language-Team: Bulgarian \n" @@ -58,65 +58,72 @@ msgid "Internet Updates" msgstr "Обноввявания по Интернет" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Връщане на стандартните стойности" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Възвръщане на стандартните ключове" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Настройки за софтуера" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Проверка за обновления на всеки" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Грешка при внасяне на избрания файл" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Избраният файл или не е GPG файл или е повреден." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Грешка при премахване на ключа" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Ключа, който сте избрали, не може да бъде премахнат. Докладвайте това като " "грешка." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -124,11 +131,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -329,7 +336,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -339,7 +346,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -452,7 +459,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/da.po b/po/da.po index 3f8f671b..64870c6b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-28 11:31+0200\n" "Last-Translator: Martin Willemoes Hansen \n" "Language-Team: Danish \n" @@ -60,61 +60,68 @@ msgid "Internet Updates" msgstr "Internet-opdateringer" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Genopret de forvalgte nøgler" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Indstillinger" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -122,11 +129,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -320,7 +327,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -330,7 +337,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -443,7 +450,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/de.po b/po/de.po index f6333632..bc806853 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-02 08:46+0200\n" "Last-Translator: Frank Arnold \n" "Language-Team: German GNOME Translations \n" @@ -63,65 +63,72 @@ msgid "Internet Updates" msgstr "Internet-Aktualisierungen" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Vorgabeschlüssel wiederherstellen" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Software-Einstellungen" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Die gewählte Datei ist möglicherweise keine GPG-Schlüsseldatei oder ist " "beschädigt." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Der gewählte Schlüssel konnte nicht entfernt werden. Bitte erstellen Sie " "hierfür einen Fehlerbericht." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -129,11 +136,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -335,7 +342,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -345,7 +352,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -459,7 +466,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/el.po b/po/el.po index fbc096f9..3e30c84e 100644 --- a/po/el.po +++ b/po/el.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: el\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-05 14:33+0200\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -58,61 +58,68 @@ msgid "Internet Updates" msgstr "Αναβαθμίσεις διαδικτύου" #: ../data/SoftwareProperties.glade.h:10 -msgid "Restore _Defaults" +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" msgstr "" #: ../data/SoftwareProperties.glade.h:11 -msgid "Restore the default keys of your distribution" +msgid "Restore _Defaults" msgstr "" #: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:13 #, fuzzy msgid "Software Preferences" msgstr "Πηγές λογισμικού" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -120,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -315,7 +322,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -325,7 +332,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -437,7 +444,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/en_CA.po b/po/en_CA.po index 6e667b61..73fbb751 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-03 01:26-0500\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -61,62 +61,69 @@ msgid "Internet Updates" msgstr "Internet Updates" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Software Preferences" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -124,11 +131,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -328,7 +335,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -338,7 +345,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -451,7 +458,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/en_GB.po b/po/en_GB.po index b5a59b79..b07078fb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-19 22:51-0400\n" "Last-Translator: Abigail Brady \n" "Language-Team: \n" @@ -61,64 +61,71 @@ msgid "Internet Updates" msgstr "Internet Updates" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Restore default keys" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Restore default keys" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Software Preferences" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installing updates..." -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "The selected file may not be a GPG key file or it might be corrupt." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -330,7 +337,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -340,7 +347,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -453,7 +460,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/es.po b/po/es.po index 8373a246..8bf2252a 100644 --- a/po/es.po +++ b/po/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: es\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-04 15:00+0200\n" "Last-Translator: Jorge Bernal \n" "Language-Team: Spanish \n" @@ -64,65 +64,72 @@ msgid "Internet Updates" msgstr "Actualizaciones por Internet" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Recuperar claves predeterminadas" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Preferencias de software" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Hubo un error al importar el fichero seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Puede que el fichero seleccionado no sea un fichero de clave GPG o que esté " "corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -130,11 +137,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -336,7 +343,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -346,7 +353,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -459,7 +466,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/fi.po b/po/fi.po index d0210f1d..de3b8083 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-30 08:30+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -60,62 +60,69 @@ msgid "Internet Updates" msgstr "Internet-päivitykset" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Palauta oletusavaimet" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Asetukset" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Valittua tedosto ei ole kelvollinen GPG:n avaintiedosto" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -123,11 +130,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -327,7 +334,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -337,7 +344,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -449,7 +456,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/fr.po b/po/fr.po index c4a7adf0..761ef791 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French \n" @@ -61,65 +61,72 @@ msgid "Internet Updates" msgstr "Mise à jour par Internet" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurer les clés par défaut" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Préférences du logiciel" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Erreur lors du chargement du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Le fichier sélectionné n'est peut-être pas un clé GPG ou alors il est " "corrompu." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La clé que vous avez sélectionné ne peut être supprimé. Veuillez envoyer " "ceci comme étant un bug." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -333,7 +340,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -343,7 +350,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -456,7 +463,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/gl.po b/po/gl.po index d024035e..8b8333a3 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: gl\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-12-02 15:59+0100\n" "Last-Translator: Ignacio Casal Quinteiro \n" "Language-Team: Galego\n" @@ -58,67 +58,74 @@ msgid "Internet Updates" msgstr "Actualizacións por Internet" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurar predeterminados" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Restaurar as claves predeterminadas" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Preferencias de software" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Comprobar se hai actualizacións cada" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Erro importando o ficheiro seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "O ficheiro seleccionado pode que non sexa un ficheiro de clave GPG ou que " "esté corrupto." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Erro ao quitar a clave" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -331,7 +338,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -341,7 +348,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -454,7 +461,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/he.po b/po/he.po index 1eb73441..bcd4c7a6 100644 --- a/po/he.po +++ b/po/he.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-08-07 14:49+0300\n" "Last-Translator: Yuval Tanny\n" "Language-Team: Hebrew \n" @@ -61,63 +61,70 @@ msgid "Internet Updates" msgstr "עדכוני אינטרנט" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "שחזר ברירת מחדל" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "שחזר מפתחות ברירת מחדל" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "העדפות תוכנה" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "בדוק לעדכונים כל" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "שגיאה בייבוא קובץ נבחר" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "הקובץ הנבחר הוא לא מפתח GPG או שהוא לא תקין." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "שגיאה בהסרת המפתח" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "לא ניתן להסיר את המפתח שבחרת. אנא דווח על זה כבאג." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -125,11 +132,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -326,7 +333,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -336,7 +343,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -449,7 +456,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/hu.po b/po/hu.po index 1cdfbc32..49657680 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-04-03 12:32+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -62,62 +62,69 @@ msgid "Internet Updates" msgstr "Internetes frissítések" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Alapértelmezett kulcsok visszaállítása" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Szoftver beállításai" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "A kiválasztott fájl vagy nem GPG kulcsfájl, vagy sérült." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -125,11 +132,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -329,7 +336,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -339,7 +346,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -452,7 +459,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/it.po b/po/it.po index 9540ffc1..3a513937 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-10-26 12:25+0200\n" "Last-Translator: Fabio Marzocca \n" "Language-Team: Italian \n" @@ -58,67 +58,74 @@ msgid "Internet Updates" msgstr "Aggiornamenti Internet" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Ripristina valori iniziali" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Ripristina le chiavi di default" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Preferenze software" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Verifica aggiornamenti ogni" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Errore nell'importazione del file selezionato" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Il file selezionato potrebbe non essere un file di chiave GPG o potrebbe " "essere corrotto." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Errore rimuovendo la chiave" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "La chiave selezionata non può essere rimossa. Per favore riporta questo come " "bug." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -331,7 +338,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -341,7 +348,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -454,7 +461,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/ja.po b/po/ja.po index 8afdb4ee..b427a66f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-10-12 17:28+0900\n" "Last-Translator: Ikuya Awashiro \n" "Language-Team: Ubuntu-ja \n" @@ -61,63 +61,70 @@ msgid "Internet Updates" msgstr "インターネットアップデート" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "デフォルトの鍵を元に戻す" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "デフォルトの鍵を元に戻す" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "ソフトウェアの設定" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "選択したファイルのインポートエラー" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "選択したファイルはGPGキーファイルではないか、壊れている可能性があります。" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "キー削除のエラー" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "選択したキーを削除できませんでした。バグとして報告してください。" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -125,11 +132,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -326,7 +333,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -336,7 +343,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -449,7 +456,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/lt.po b/po/lt.po index be4d5c61..d3df3fae 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-09-15 15:06+0300\n" "Last-Translator: Žygimantas Beručka \n" "Language-Team: Lithuanian \n" @@ -58,64 +58,71 @@ msgid "Internet Updates" msgstr "Internetiniai atnaujinimai" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Atkurti numatytuosius" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Atkurti numatytuosius raktus" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Programinės įrangos nustatymai" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Tikrinti atnaujinimus kas" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Importuojant pasirinktą bylą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Pasirinkta byla gali būti ne GPG rakto byla arba sugadinta byla." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Šalinant raktą įvyko klaida" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -123,11 +130,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -326,7 +333,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -336,7 +343,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -449,7 +456,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/mk.po b/po/mk.po index 82d13fb8..3a58cbc6 100644 --- a/po/mk.po +++ b/po/mk.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: mk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-07-20 01:21+0200\n" "Last-Translator: Арангел Ангов \n" "Language-Team: Macedonian \n" @@ -58,66 +58,73 @@ msgid "Internet Updates" msgstr "Надградби од интернет" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Врати стандардно" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Врати ги стандардните клучеви" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Софтверски преференци" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Проверувај за надградби на секои" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Грешка при увоз на избраната датотека" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" "Избраната датотека може да не е GPG датотека или пак може да е расипана." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Грешка при отстранување на клучот" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" "Клучот што го избравте не може да биде отстранет. Ве молам пријавете го ова " "како бубачка." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -125,11 +132,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -330,7 +337,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -340,7 +347,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -453,7 +460,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/nb.po b/po/nb.po index fc07d72b..c3d6ff1a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -61,64 +61,71 @@ msgid "Internet Updates" msgstr "Oppdateringer fra Internett" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Brukervalg for programvare" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -330,7 +337,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -340,7 +347,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -453,7 +460,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/ne.po b/po/ne.po index 9a097946..029346ed 100755 --- a/po/ne.po +++ b/po/ne.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-07-03 16:06+0545\n" "Last-Translator: Jaydeep Bhusal \n" "Language-Team: Nepali \n" @@ -63,63 +63,70 @@ msgid "Internet Updates" msgstr "इन्टरनेट अद्यावधिकहरु" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "पुर्वनिर्धारित कुञ्जिहरु पुर्वावस्थामा ल्याउनुहोस" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "सफ्टवेयर प्राथमिकताहरु" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "स्तरवृद्धिहरु स्थापना गर्दै" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "चयन गरिएको फाइल आयात गर्दा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "चयन गरिएको फाइल जिपिजि कुञ्जि फइल नहुन सक्छ अथवा यो दुषित हुन सक्दछ" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "कुञ्जि हटाउँदा त्रुटि" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "तपाईंले चयन गरेको कुञ्जि हटाउन सकिएन. कृपया यसको प्रतिवेदन त्रुटिको रुपमा दिनुहोस" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -127,11 +134,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -328,7 +335,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -338,7 +345,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -451,7 +458,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/nl.po b/po/nl.po index 1770c08b..f91c094b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-07-13 06:24+0100\n" "Last-Translator: Michiel Sikkes \n" "Language-Team: Nederlands \n" @@ -53,60 +53,67 @@ msgid "Internet Updates" msgstr "" #: ../data/SoftwareProperties.glade.h:10 -msgid "Restore _Defaults" +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" msgstr "" #: ../data/SoftwareProperties.glade.h:11 -msgid "Restore the default keys of your distribution" +msgid "Restore _Defaults" msgstr "" #: ../data/SoftwareProperties.glade.h:12 -msgid "Software Preferences" +msgid "Restore the default keys of your distribution" msgstr "" #: ../data/SoftwareProperties.glade.h:13 -msgid "_Check for updates automatically:" +msgid "Software Preferences" msgstr "" #: ../data/SoftwareProperties.glade.h:14 -msgid "_Download updates in the backgound, but do not install them" +msgid "_Check for updates automatically:" msgstr "" #: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" +msgstr "" + +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -114,11 +121,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -309,7 +316,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -319,7 +326,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -430,7 +437,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/no.po b/po/no.po index fc07d72b..c3d6ff1a 100644 --- a/po/no.po +++ b/po/no.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: nb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-06-08 23:10+0200\n" "Last-Translator: Terance Edward Sola \n" "Language-Team: Norwegian Bokmal \n" @@ -61,64 +61,71 @@ msgid "Internet Updates" msgstr "Oppdateringer fra Internett" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Gjenopprettt forvalgte nøkler" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Brukervalg for programvare" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Installerer oppdateringer..." -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Feil under importering av fil" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Den valgte filen er ikke en GPG-fil eller så er den skadet." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Feil under fjerning av nøkkel" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -126,11 +133,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -330,7 +337,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -340,7 +347,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -453,7 +460,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/pa.po b/po/pa.po index f27f122f..734e4a4d 100644 --- a/po/pa.po +++ b/po/pa.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: pa\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-10-23 10:48-0200\n" "Last-Translator: Amanpreet Singh Alam \n" "Language-Team: Punjabi \n" @@ -60,61 +60,68 @@ msgid "Internet Updates" msgstr "ਇੰਟਰਨੈਟ ਅੱਪਡੇਟ" #: ../data/SoftwareProperties.glade.h:10 -msgid "Restore _Defaults" +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" msgstr "" #: ../data/SoftwareProperties.glade.h:11 -msgid "Restore the default keys of your distribution" +msgid "Restore _Defaults" msgstr "" #: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "ਸਾਫਟਵੇਅਰ ਪਸੰਦ" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -122,11 +129,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -318,7 +325,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -328,7 +335,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -441,7 +448,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/pl.po b/po/pl.po index 875297d1..1b825169 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-25 17:23+0100\n" "Last-Translator: Zygmunt Krynicki \n" "Language-Team: Polish \n" @@ -60,61 +60,68 @@ msgid "Internet Updates" msgstr "Aktualizacje internetowe" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Przywraca domyślne klucze" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Ustawienia oprogramowania" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Błąd podczas importu wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Wybrany plik może nie być kluczem GPG lub może być uszkodzony." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -122,11 +129,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -324,7 +331,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -334,7 +341,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -447,7 +454,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/pt_BR.po b/po/pt_BR.po index 52276127..cd09b29c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-29 13:36-0300\n" "Last-Translator: Raphael Higino \n" "Language-Team: Brazilian Portuguese Error scaning the CD\n" @@ -117,11 +124,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -314,7 +321,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -324,7 +331,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -435,7 +442,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/ro.po b/po/ro.po index d0378f20..63a276fb 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-03 19:28+0200\n" "Last-Translator: Dan Damian \n" "Language-Team: Romanian \n" @@ -59,61 +59,68 @@ msgid "Internet Updates" msgstr "Actualizări de pe Internet" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Restaurează cheile implicite." -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Preferinţe software" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -121,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -319,7 +326,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -329,7 +336,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -441,7 +448,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/rw.po b/po/rw.po index 25d9a0a7..28c9fe55 100644 --- a/po/rw.po +++ b/po/rw.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-31 20:55-0700\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -66,65 +66,72 @@ msgid "Internet Updates" msgstr "Error scaning the CD\n" @@ -132,11 +139,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -334,7 +341,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -344,7 +351,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -456,7 +463,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/sv.po b/po/sv.po index 1b1b38ab..bed3c655 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-26 15:14+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -58,62 +58,69 @@ msgid "Internet Updates" msgstr "Internet-uppdateringar" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Systemets standardalternativ" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Programvaruinställningar" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 #, fuzzy msgid "Import key" msgstr "Viktighet" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -121,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -323,7 +330,7 @@ msgstr "Hämtning misslyckades" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -333,7 +340,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -447,7 +454,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/uk.po b/po/uk.po index 19f0bceb..eca18a64 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-08-08 11:46+0300\n" "Last-Translator: Maxim Dziumanenko \n" "Language-Team: Ukrainian \n" @@ -56,63 +56,70 @@ msgid "Internet Updates" msgstr "Оновлення через Інтернет" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Відновити початкові параметри" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Відновити початкові ключі" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Параметри програм" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Перевіряти оновлення кожні" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Помилка імпорту вибраного файлу" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Вибраний файл, можливо, не є файлом GPG ключа або він пошкоджений." -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Помилка видалення ключа" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Вибраний ключ неможливо видалити. Сповістіть про це як про помилку." -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -120,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -321,7 +328,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -331,7 +338,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -444,7 +451,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/vi.po b/po/vi.po index 6b8d6f1d..52c16d4e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager Gnome HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-08-26 18:15+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -57,63 +57,70 @@ msgid "Internet Updates" msgstr "Cập nhật dùng Mạng" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "Phục hồi mặc định" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "Phục hồi các khóa mặc định" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "Sở thích phần mềm" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "Kiểm tra có cập nhật sau mỗi" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "Gặp lỗi khi nhập tâp tin đã chọn" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "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:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "Gặp lỗi khi gỡ bỏ khóa" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 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:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -121,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -322,7 +329,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -332,7 +339,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -445,7 +452,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/xh.po b/po/xh.po index 2efee144..42dc06bf 100644 --- a/po/xh.po +++ b/po/xh.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-30 13:25+0200\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -57,61 +57,68 @@ msgid "Internet Updates" msgstr "Bonisa izihlaziyo" #: ../data/SoftwareProperties.glade.h:10 -msgid "Restore _Defaults" +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" msgstr "" #: ../data/SoftwareProperties.glade.h:11 -msgid "Restore the default keys of your distribution" +msgid "Restore _Defaults" msgstr "" #: ../data/SoftwareProperties.glade.h:12 +msgid "Restore the default keys of your distribution" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:13 #, fuzzy msgid "Software Preferences" msgstr "Uluhlu lwezinto ezikhethwayo zeenkqubo zekhompyutha" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -119,11 +126,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -314,7 +321,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -324,7 +331,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -436,7 +443,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/zh_CN.po b/po/zh_CN.po index 82e9dc57..51ba61c4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-03-21 22:00+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: zh_CN \n" @@ -59,61 +59,68 @@ msgid "Internet Updates" msgstr "Internet 更新" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "恢复默认密钥" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 msgid "Restore the default keys of your distribution" msgstr "" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "软件首选项" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 msgid "_Check for updates automatically:" msgstr "" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -121,11 +128,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -319,7 +326,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -329,7 +336,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -441,7 +448,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/zh_HK.po b/po/zh_HK.po index c99b9547..f152a2e2 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -56,63 +56,70 @@ msgid "Internet Updates" msgstr "線上更新" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "還原為預設值" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "還原為預設密碼匙" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "軟件偏好設定" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "檢查軟件更新間隔：" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 密碼匙，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "移除密碼匙時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "你選定的密碼匙無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -120,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -321,7 +328,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -331,7 +338,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -444,7 +451,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 diff --git a/po/zh_TW.po b/po/zh_TW.po index 8d115439..a3661044 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.41.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-13 10:48+0100\n" +"Report-Msgid-Bugs-To: michael.vogt@canonical.com\n" +"POT-Creation-Date: 2006-02-18 11:18+0100\n" "PO-Revision-Date: 2005-12-14 01:58+0800\n" "Last-Translator: Abel Cheung \n" "Language-Team: Chinese (traditional) \n" @@ -56,63 +56,70 @@ msgid "Internet Updates" msgstr "線上更新" #: ../data/SoftwareProperties.glade.h:10 +msgid "" +"Only security updates from the official Ubuntu servers will be installed " +"automatically. The software package \"unattended-upgrades\" needs to be " +"installed therefor" +msgstr "" + +#: ../data/SoftwareProperties.glade.h:11 #, fuzzy msgid "Restore _Defaults" msgstr "還原為預設值" -#: ../data/SoftwareProperties.glade.h:11 +#: ../data/SoftwareProperties.glade.h:12 #, fuzzy msgid "Restore the default keys of your distribution" msgstr "還原為預設金鑰" -#: ../data/SoftwareProperties.glade.h:12 +#: ../data/SoftwareProperties.glade.h:13 msgid "Software Preferences" msgstr "軟體偏好設定" -#: ../data/SoftwareProperties.glade.h:13 +#: ../data/SoftwareProperties.glade.h:14 #, fuzzy msgid "_Check for updates automatically:" msgstr "檢查軟體更新間隔：" -#: ../data/SoftwareProperties.glade.h:14 +#: ../data/SoftwareProperties.glade.h:15 msgid "_Download updates in the backgound, but do not install them" msgstr "" -#: ../data/SoftwareProperties.glade.h:15 -msgid "_Install new updates without confirmation" +#: ../data/SoftwareProperties.glade.h:16 +msgid "_Install security updates without confirmation" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:102 +#: ../SoftwareProperties/SoftwareProperties.py:101 #, python-format msgid "Every %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:132 +#: ../SoftwareProperties/SoftwareProperties.py:131 #, python-format msgid "After %s days" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:330 +#: ../SoftwareProperties/SoftwareProperties.py:354 msgid "Import key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:340 +#: ../SoftwareProperties/SoftwareProperties.py:364 msgid "Error importing selected file" msgstr "匯入指定檔案時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:341 +#: ../SoftwareProperties/SoftwareProperties.py:365 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "選定的檔案可能不是 GPG 金鑰，或者內容已損壞。" -#: ../SoftwareProperties/SoftwareProperties.py:353 +#: ../SoftwareProperties/SoftwareProperties.py:377 msgid "Error removing the key" msgstr "移除金鑰時發生錯誤" -#: ../SoftwareProperties/SoftwareProperties.py:354 +#: ../SoftwareProperties/SoftwareProperties.py:378 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "您選定的金鑰無法移除，請匯報問題。" -#: ../SoftwareProperties/SoftwareProperties.py:397 +#: ../SoftwareProperties/SoftwareProperties.py:421 #, python-format msgid "" "Error scaning the CD\n" @@ -120,11 +127,11 @@ msgid "" "%s" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:447 +#: ../SoftwareProperties/SoftwareProperties.py:471 msgid "Please enter a name for the disc" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:463 +#: ../SoftwareProperties/SoftwareProperties.py:487 msgid "Please insert a disc in the drive:" msgstr "" @@ -321,7 +328,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:105 #, python-format -msgid "Downloading file %li of %li with %s/s" +msgid "Downloading file %li of %li at %s/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:106 @@ -331,7 +338,7 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:108 #, python-format -msgid "Downloading file %li of %li with unknown speed" +msgid "Downloading file %li of %li at unknown speed" msgstr "" #. FIXME: add support for the timeout @@ -444,7 +451,7 @@ msgid "Downloading and installing the upgrades" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:8 -msgid "Modifing the software channels" +msgid "Modifying the software channels" msgstr "" #: ../DistUpgrade/DistUpgrade.glade.h:9 -- cgit v1.2.3 From 8abb01fb328c6e0c3da3263af149934b02949b8a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sat, 18 Feb 2006 16:06:37 +0100 Subject: * Do not disable the update dialog during downloading of the changelog * Show step 5 "Restarting the system" in the ui, since users asked me, how and when they should reboot. this should provide a better picture of the upgrade process * Fixed the parent of the change media dialog * Converted the abort DistUpgrade dialog to a nice glade dialog * Disabled the abortion of the DistUpgrade. it is currently not supported. --- DistUpgrade/DistUpgrade.glade | 129 +++++++++++++++++++++++++++++++++++++- DistUpgrade/DistUpgradeViewGtk.py | 24 ++++--- UpdateManager/UpdateManager.py | 2 - 3 files changed, 142 insertions(+), 13 deletions(-) diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 5b59fb4d..55b439c1 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -12,7 +12,6 @@ False False False - update-manager.png True False False @@ -293,6 +292,7 @@ 18 18 + True 0.5 0.5 0 @@ -309,7 +309,8 @@ - + True + Restarting the system False False GTK_JUSTIFY_LEFT @@ -1285,4 +1286,128 @@ This is you last chance to cancel the upgrade. + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Cancel Upgrade + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + _Resume Upgrade + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + <b><big>Cancel the running upgrade?</big></b> + +The system could be in an unusable state if you cancel the upgrade. You are strongly adviced to resume the upgrade. + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 6013200b..c36d8dac 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -74,7 +74,7 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): def mediaChange(self, medium, drive): #print "mediaChange %s %s" % (medium, drive) msg = _("Please insert '%s' into the drive '%s'" % (medium,drive)) - dialog = gtk.MessageDialog(parent=self.main, + dialog = gtk.MessageDialog(parent=self.window_main, flags=gtk.DIALOG_MODAL, type=gtk.MESSAGE_QUESTION, buttons=gtk.BUTTONS_OK_CANCEL) @@ -182,9 +182,13 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): # FIXME: i18n must be somewhere relative do this dir bindtextdomain("update-manager",os.path.join(os.getcwd(),"mo")) + icons = gtk.icon_theme_get_default() + gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0)) SimpleGladeApp.__init__(self, "DistUpgrade.glade", None, domain="update-manager") self.window_main.set_keep_above(True) + self.window_main.realize() + self.window_main.window.set_functions(gtk.gdk.FUNC_MOVE) self._opCacheProgress = GtkOpProgress(self.progressbar_cache) self._fetchProgress = GtkFetchProgressAdapter(self) self._installProgress = GtkInstallProgressAdapter(self) @@ -328,6 +332,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): def confirmRestart(self): self.dialog_restart.set_transient_for(self.window_main) + self.dialog_restart.realize() + self.dialog_restart.window.set_functions(gtk.gdk.FUNC_MOVE) res = self.dialog_restart.run() self.dialog_restart.hide() if res == gtk.RESPONSE_YES: @@ -335,14 +341,14 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): return False def on_window_main_delete_event(self, widget, event): - #print "on_window_main_delete_event()" - summary = _("Are you sure you want cancel?") - msg = _("Canceling during a upgrade can leave the system in a " - "unstable state. It is strongly adviced to continue " - "the operation. ") - if self.askYesNoQuestion(summary, msg): - self.exit(1) - return True + self.dialog_cancel.set_transient_for(self.window_main) + self.dialog_cancel.realize() + self.dialog_cancel.window.set_functions(gtk.gdk.FUNC_MOVE) + res = self.dialog_cancel.run() + self.dialog_cancel.hide() + if res == gtk.RESPONSE_CANCEL: + self.destroy() + return True if __name__ == "__main__": view = GtkDistUpgradeView() diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index f73f790a..8b757bd1 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -356,7 +356,6 @@ class UpdateManager(SimpleGladeApp): self.set_changes_buffer(changes_buffer, changes[0], name, changes[1]) else: if self.expander_details.get_expanded(): - self.hbox_footer.set_sensitive(False) lock = thread.allocate_lock() lock.acquire() t=thread.start_new_thread(self.cache.get_changelog,(name,lock)) @@ -373,7 +372,6 @@ class UpdateManager(SimpleGladeApp): # download finished (or canceld, or time-out) button.hide() button.disconnect(id); - self.hbox_footer.set_sensitive(True) if self.cache.all_changes.has_key(name): changes = self.cache.all_changes[name] -- cgit v1.2.3 From 53e9180e0aaafae7f93d939b5f97d377990aaeb5 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 19 Feb 2006 11:20:21 +0100 Subject: * ReleaseNotesViewer: - Add copyright, license, comments - Use the normal cursor instead of the xterm one - Set the cursor only if the hovering state changed to avoid flickering --- UpdateManager/ReleaseNotesViewer.py | 84 ++++++++++++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 11 deletions(-) diff --git a/UpdateManager/ReleaseNotesViewer.py b/UpdateManager/ReleaseNotesViewer.py index 9cecc895..33122be9 100644 --- a/UpdateManager/ReleaseNotesViewer.py +++ b/UpdateManager/ReleaseNotesViewer.py @@ -1,4 +1,28 @@ -#!/usr/bin/env python +# ReleaseNotesViewer.py +# +# Copyright (c) 2006 Sebastian Heinlein +# +# Author: Sebastian Heinlein +# +# This modul provides an inheritance of the gtk.TextView that is +# aware of http URLs and allows to open them in a browser. +# It is based on the pygtk-demo "hypertext". +# +# 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 pygtk import gtk @@ -8,34 +32,49 @@ import os class ReleaseNotesViewer(gtk.TextView): def __init__(self, notes): + """Init the ReleaseNotesViewer as an Inheritance of the gtk.TextView. + Load the notes into the buffer and make links clickable""" + # init the parent gtk.TextView.__init__(self) + # global hovering over link state self.hovering = False + self.first = True + # setup the buffer and signals + self.set_property("editable", False) + self.set_cursor_visible(False) self.buffer = gtk.TextBuffer() self.set_buffer(self.buffer) self.buffer.set_text(notes) self.connect("event-after", self.event_after) self.connect("motion-notify-event", self.motion_notify_event) self.connect("visibility-notify-event", self.visibility_notify_event) + # search for links in the notes and make them clickable self.search_links() - self.set_property("editable", False) - self.set_cursor_visible(False) def tag_link(self, start, end, url): + """Apply the tag that marks links to the specified buffer selection""" tag = self.buffer.create_tag(None, foreground="blue", underline=pango.UNDERLINE_SINGLE) tag.set_data("url", url) self.buffer.apply_tag(tag , start, end) def search_links(self): + """Search for http URLs in the buffer and call the tag_link method + for each one to tag them as links""" + # start at the beginning of the buffer iter = self.buffer.get_iter_at_offset(0) while 1: + # search for the next URL in the buffer ret = iter.forward_search("http://", gtk.TEXT_SEARCH_VISIBLE_ONLY, None) + # if we reach the end break the loop if not ret: break + # get the position of the protocol prefix (match_start, match_end) = ret match_tmp = match_end.copy() while 1: + # extend the selection to the complete URL if match_tmp.forward_char(): text = match_end.get_text(match_tmp) if text in (" ", ")", "]", "\n", "\t"): @@ -43,16 +82,21 @@ class ReleaseNotesViewer(gtk.TextView): else: break match_end = match_tmp.copy() + # call the tagging method for the complete URL url = match_start.get_text(match_end) self.tag_link(match_start, match_end, url) + # set the starting point for the next search iter = match_end def event_after(self, text_view, event): + """callback for mouse click events""" + # we only react on left mouse clicks if event.type != gtk.gdk.BUTTON_RELEASE: return False if event.button != 1: return False + # try to get a selection try: (start, end) = self.buffer.get_selection_bounds() except ValueError: @@ -61,10 +105,12 @@ class ReleaseNotesViewer(gtk.TextView): if start.get_offset() != end.get_offset(): return False + # get the iter at the mouse position (x, y) = self.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, int(event.x), int(event.y)) iter = self.get_iter_at_location(x, y) + # call open_url if an URL is assigned to the iter tags = iter.get_tags() for tag in tags: url = tag.get_data("url") @@ -73,17 +119,22 @@ class ReleaseNotesViewer(gtk.TextView): break def open_url(self, url): + """Open the specified URL in a browser""" + # Find an appropiate browser if os.path.exists('usr/bin/gnome-open'): command = ['gnome-open', url] else: command = ['x-www-browser', url] + # Avoid to run the browser as user root if os.getuid() == 0 and os.environ.has_key('SUDO_USER'): command = ['sudo', '-u', os.environ['SUDO_USER']] + command subprocess.Popen(command) def motion_notify_event(self, text_view, event): + """callback for the mouse movement event, that calls the + check_hovering method with the mouse postition coordiantes""" x, y = text_view.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, int(event.x), int(event.y)) self.check_hovering(x, y) @@ -91,6 +142,9 @@ class ReleaseNotesViewer(gtk.TextView): return False def visibility_notify_event(self, text_view, event): + """callback if the widgets gets visible (e.g. moves to the foreground) + that calls the check_hovering method with the mouse position + coordinates""" (wx, wy, mod) = text_view.window.get_pointer() (bx, by) = text_view.window_to_buffer_coords(gtk.TEXT_WINDOW_WIDGET, wx, wy) @@ -98,20 +152,28 @@ class ReleaseNotesViewer(gtk.TextView): return False def check_hovering(self, x, y): + """Check if the mouse is above a tagged link and if yes show + a hand cursor""" _hovering = False + # get the iter at the mouse position iter = self.get_iter_at_location(x, y) - + + # set _hovering if the iter has the tag "url" tags = iter.get_tags() for tag in tags: url = tag.get_data("url") if url != "": _hovering = True break - - if _hovering != self.hovering: - self.hovering = _hovering - if self.hovering: - self.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2)) - else: - self.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor(gtk.gdk.Cursor(gtk.gdk.XTERM)) + # change the global hovering state + if _hovering != self.hovering or self.first == True: + self.first = False + self.hovering = _hovering + # Set the appropriate cursur icon + if self.hovering: + self.get_window(gtk.TEXT_WINDOW_TEXT).\ + set_cursor(gtk.gdk.Cursor(gtk.gdk.HAND2)) + else: + self.get_window(gtk.TEXT_WINDOW_TEXT).\ + set_cursor(gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)) -- cgit v1.2.3 From d87c4020340ed0c869346c5b569a3b2e261b7be2 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 19 Feb 2006 20:39:45 +0100 Subject: * dialog_confirm_changes: - Show a question mark icon in the confirm changes dialog - Fixed some spacing in the confirm changes dialog - Use a more informative label for the ob button and the summary - Do not show the close button of the wm - Use plural gettext in the summary - Include the summary into the alert message * common error dialogs: - Do not show the close button of the wm - Hopefully made the wording of some error dialogs clearer - Show the missing free space on the corresponding error dialog --- DistUpgrade/DistUpgrade.glade | 180 +++++++++++++++++++++--------------- DistUpgrade/DistUpgradeControler.py | 37 ++++---- DistUpgrade/DistUpgradeViewGtk.py | 65 +++++++++---- 3 files changed, 173 insertions(+), 109 deletions(-) diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index 55b439c1..c28b20ad 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -520,7 +520,7 @@ GTK_BUTTONBOX_END - + True True True @@ -533,11 +533,11 @@ - + True True True - _Continue + _Start Upgrade True GTK_RELIEF_NORMAL True @@ -554,106 +554,70 @@ - + 6 True False - 6 - - - - True - - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + 12 - + True - - False - False - GTK_JUSTIFY_LEFT - False - False + gtk-dialog-question + 6 0 - 0.5 + 0 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 0 False - False + True - + True - True - False - 0 + False + 12 - - 400 - 200 + True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - + + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + 0 + False + False + - + True - Details + False - False + True GTK_JUSTIFY_LEFT - False + True False - 0.5 + 0 0.5 0 0 @@ -663,7 +627,73 @@ 0 - label_item + 0 + False + False + + + + + + True + True + False + 6 + + + + 400 + 200 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + False + False + False + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 9fa717fe..6dcc0e2a 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -187,13 +187,16 @@ class DistUpgradeControler(object): st = os.statvfs(archivedir) free = st[statvfs.F_BAVAIL]*st[statvfs.F_FRSIZE] if self.cache.requiredDownload > free: - self._view.error(_("Not enough free space"), - _("There is not enough free space on your " - "system to download the required pacakges. " - "Please free some space before trying again " - "with e.g. 'sudo apt-get clean'")) - return False - res = self._view.confirmChanges(_("Perform Upgrade?"),changes, + free_at_least = apt_pkg.SizeToStr(self.cache.requiredDownload-free) + self._view.error(_("Not enough free disk space"), + _("The upgrade aborts now. " + "Please free at least %s of disk space. " + "Empty your trash and remove temporary " + "packages of former installations using " + "'sudo apt-get clean'." % free_at_least )) + return False + res = self._view.confirmChanges(_("Do you want to start the upgrade?"), + changes, self.cache.requiredDownload) return res @@ -208,12 +211,11 @@ class DistUpgradeControler(object): res = self.cache.commit(fprogress,iprogress) except SystemError, e: # installing the packages failed, can't be retried - self._view.error(_("Error during commit"), - _("Some problem occured during the upgrade. " - "Most likely packages failed to install. " - "Try 'sudo apt-get install -f' or synaptic " - "to fix your system."), - "%s" % e) + self._view.error(_("Could not install the upgrades"), + _("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."), "%s" % e) return False except IOError, e: # fetch failed, will be retried @@ -225,11 +227,10 @@ class DistUpgradeControler(object): # maximum fetch-retries reached without a successful commit logging.debug("giving up on fetching after maximum retries") - self._view.error(_("Error fetching the packages"), - _("Some problem occured during the fetching " - "of the packages. This is most likely a network " - "problem. Please check your network and try " - "again. "), + self._view.error(_("Could not download the upgrades"), + _("The upgrade aborts now. Please check your "\ + "internet connection or "\ + "installation media and try again. "), "%s" % e) # abort here because we want our sources.list back self.abort() diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index c36d8dac..7fd39a32 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -39,6 +39,7 @@ from apt.progress import InstallProgress from DistUpgradeView import DistUpgradeView from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp, bindtextdomain +import gettext from gettext import gettext as _ def utf8(str): @@ -138,17 +139,20 @@ class GtkInstallProgressAdapter(InstallProgress): "APT_LISTCHANGES_FRONTEND=none"] def error(self, pkg, errormsg): - logging.error("got a error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) + logging.error("got an error from dpkg for pkg: '%s': '%s'" % (pkg, errormsg)) #self.expander_terminal.set_expanded(True) self.parent.dialog_error.set_transient_for(self.parent.window_main) summary = _("Could not install '%s'" % pkg) - msg = _("The upgrade will abort. Please report the bug.") + msg = _("The upgrade aborts now. Please report this bug.") markup="%s\n\n%s" % (summary, msg) + self.parent.dialog_error.realize() + self.parent.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) self.parent.label_error.set_markup(markup) self.parent.textview_error.get_buffer().set_text(utf8(errormsg)) self.parent.scroll_error.show() self.parent.dialog_error.run() self.parent.dialog_error.hide() + def conffile(self, current, new): logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) self.expander.set_expanded(True) @@ -218,10 +222,9 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): lines = traceback.format_exception(type, value, tb) logging.error("not handled expection:\n%s" % "\n".join(lines)) self.error(_("A fatal error occured"), - _("During the operation a fatal error occured. " - "Please report this as a bug and include the " + _("Please report this as a bug and include the " "files ~/dist-upgrade.log and ~/dist-upgrade-apt.log " - "in your report. The upgrade will abort now. "), + "in your report. The upgrade aborts now. "), "\n".join(lines)) def create_terminal(self, arg1,arg2,arg3,arg4): @@ -284,8 +287,9 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): self.scroll_error.show() else: self.scroll_error.hide() + self.dialog_error.realize() + self.dialog_error.window.set_functions(gtk.gdk.FUNC_MOVE) self.dialog_error.run() - self.dialog_error.show() self.dialog_error.destroy() return False @@ -293,24 +297,51 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): # FIXME: add a whitelist here for packages that we expect to be # removed (how to calc this automatically?) DistUpgradeView.confirmChanges(self, summary, changes, downloadSize) + pkgs_remove = len(self.toRemove) + pkgs_inst = len(self.toInstall) + pkgs_upgrade = len(self.toUpgrade) + msg = "" + + if pkgs_remove > 0: + msg += gettext.ngettext("%s package is going to be removed." %\ + pkgs_remove, + "%s packages are going to be removed." %\ + pkgs_remove, pkgs_remove) + msg +=" " + if pkgs_inst > 0: + msg += gettext.ngettext("%s new package is going to be "\ + "installed." % pkgs_inst, + "%s new packages are going to be "\ + "installed." % pkgs_inst, pkgs_inst) + msg +=" " + if pkgs_upgrade > 0: + msg += gettext.ngettext("%s package is going to be upgraded." %\ + pkgs_upgrade, + "%s packages are going to be upgraded." %\ + pkgs_upgrade, pkgs_upgrade) + msg +=" " + if msg == "": + # FIXME: this should go into DistUpgradeController + summary = _("Could not find any upgrades") + msg = _("Your system has already been upgraded.") + self.error(summary, msg) + return False + else: + msg += _("You have to download a total of %s." %\ + apt_pkg.SizeToStr(downloadSize)) self.label_summary.set_markup("%s" % summary) - msg = _("%s packages are going to be removed.\n" - "%s packages are going to be newly installed.\n" - "%s packages are going to be upgraded.\n\n" - "%s needs to be fetched" % (len(self.toRemove), - len(self.toInstall), - len(self.toUpgrade), - apt_pkg.SizeToStr(downloadSize))) self.label_changes.set_text(msg) # fill in the details self.details_list.clear() for rm in self.toRemove: - self.details_list.append([_("To be removed: %s" % rm)]) + self.details_list.append([_("Remove %s" % rm)]) for inst in self.toInstall: - self.details_list.append([_("To be installed: %s" % inst)]) + self.details_list.append([_("Install %s" % inst)]) for up in self.toUpgrade: - self.details_list.append([_("To be upgraded: %s" % up)]) + self.details_list.append([_("Upgrade %s" % up)]) self.dialog_changes.set_transient_for(self.window_main) + self.dialog_changes.realize() + self.dialog_changes.window.set_functions(gtk.gdk.FUNC_MOVE) res = self.dialog_changes.run() self.dialog_changes.hide() if res == gtk.RESPONSE_YES: @@ -347,6 +378,8 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): res = self.dialog_cancel.run() self.dialog_cancel.hide() if res == gtk.RESPONSE_CANCEL: + #FIXME: this does not work correctly and leaves a stalled + # dist-upgrade.py process self.destroy() return True -- cgit v1.2.3