From a79e4fc80ef854844e560e5b547d1398ab149360 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 29 Nov 2005 17:31:21 +0100 Subject: * make the software preferences work again completely --- SoftwareProperties/SoftwareProperties.py | 10 +++++++--- SoftwareProperties/__init__.py | 1 + SoftwareProperties/aptsources.py | 6 ++++-- SoftwareProperties/dialog_edit.py | 2 +- channels/Ubuntu.info.in | 25 +++++++++++++------------ data/SoftwareProperties.glade | 3 ++- gnome-software-properties | 8 ++++---- po/da.po | 12 ++++++------ po/de.po | 12 ++++++------ po/el.po | 12 ++++++------ po/en_CA.po | 12 ++++++------ po/es.po | 12 ++++++------ po/fi.po | 12 ++++++------ po/fr.po | 12 ++++++------ po/hu.po | 12 ++++++------ po/ja.po | 12 ++++++------ po/pl.po | 12 ++++++------ po/pt_BR.po | 12 ++++++------ po/ro.po | 12 ++++++------ po/rw.po | 12 ++++++------ po/sv.po | 12 ++++++------ po/xh.po | 12 ++++++------ po/zh_CN.po | 12 ++++++------ setup.py | 4 +++- 24 files changed, 131 insertions(+), 120 deletions(-) diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 86586cc1..5c6e8fef 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -29,6 +29,7 @@ import apt_pkg import gobject import shutil import gettext +import os #sys.path.append("@prefix/share/update-manager/python") @@ -101,9 +102,12 @@ class SoftwareProperties(SimpleGladeApp): self.treeview1.set_model(self.source_store) tr = gtk.CellRendererText() + tr.set_property("xpad", 10) + tr.set_property("ypad", 10) source_col = gtk.TreeViewColumn("Description", tr, markup=LIST_MARKUP) source_col.set_max_width(500) + self.treeview1.append_column(source_col) self.sourceslist = aptsources.SourcesList() @@ -123,13 +127,13 @@ class SoftwareProperties(SimpleGladeApp): for source in self.sourceslist.list: if source.invalid or source.disabled: continue - (a_type, dists, comps) = self.matcher.match(source) + (a_type, dist, comps) = self.matcher.match(source) contents = "" if source.comment != "": contents += "%s\n\n" % (source.comment) - contents += "%s (%s)" % (dists, a_type) - + contents +="%s (%s) \n%s" % (dist,a_type, comps) + self.source_store.append([contents, not source.disabled, source]) def reload_keyslist(self): diff --git a/SoftwareProperties/__init__.py b/SoftwareProperties/__init__.py index e69de29b..1e6834bd 100644 --- a/SoftwareProperties/__init__.py +++ b/SoftwareProperties/__init__.py @@ -0,0 +1 @@ +from SoftwareProperties import SoftwareProperties diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 640a70b4..aa3cbb5a 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -27,12 +27,12 @@ import re import apt_pkg import glob -from DistInfo import DistInfo +from UpdateManager.Common.DistInfo import DistInfo # actual source.list entries class SourceEntry: - def __init__(self, line,file): + def __init__(self, line,file=None): self.invalid = False self.disabled = False self.type = "" @@ -41,6 +41,8 @@ class SourceEntry: self.comps = [] self.comment = "" self.line = line + if file == None: + file = apt_pkg.Config.FindDir("Dir::Etc")+apt_pkg.Config.Find("Dir::Etc::sourcelist") self.file = file self.parse(line) diff --git a/SoftwareProperties/dialog_edit.py b/SoftwareProperties/dialog_edit.py index 32e6ac0c..87cc9799 100644 --- a/SoftwareProperties/dialog_edit.py +++ b/SoftwareProperties/dialog_edit.py @@ -38,7 +38,7 @@ class dialog_edit: if os.path.exists("../data/SoftwarePropertiesDialogs.glade"): self.gladexml = gtk.glade.XML("../data/SoftwarePropertiesDialogs.glade") else: - self.gladexml = gtk.glade.XML("%s/SoftwarePropertiesDialogs.glade" % datadir) + self.gladexml = gtk.glade.XML("%s/glade/SoftwarePropertiesDialogs.glade" % datadir) self.main = self.gladexml.get_widget("dialog_edit") self.main.set_transient_for(parent) diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index 79d0ca2e..344ce243 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -1,9 +1,10 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog -Suite: hoary + +Suite: breezy RepositoryType: deb _BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.04 "Hoary Hedgehog" +_Description: Breezy 5.10 "Breezy Badger" Component: main Enabled: 1 _CompDescription: Oficially supported @@ -17,10 +18,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: hoary-security +Suite: breezy-security RepositoryType: deb _BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.04 Security Updates +_Description: Ubuntu 5.10 Security Updates Component: main Enabled: 1 _CompDescription: Oficially supported @@ -34,10 +35,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy +Suite: breezy-updates RepositoryType: deb _BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Breezy 5.10 "Breezy Badger" +_Description: Ubuntu 5.10 Updates Component: main Enabled: 1 _CompDescription: Oficially supported @@ -51,10 +52,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy-security +Suite: hoary RepositoryType: deb -_BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 Security Updates +_BaseURI: http://archive.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 "Hoary Hedgehog" Component: main Enabled: 1 _CompDescription: Oficially supported @@ -68,10 +69,10 @@ Component: multiverse Enabled: 0 _CompDescription: Non-free (Multiverse) -Suite: breezy-updates +Suite: hoary-security RepositoryType: deb -_BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 5.10 Updates +_BaseURI: http://security.ubuntu.com/ubuntu/ +_Description: Ubuntu 5.04 Security Updates Component: main Enabled: 1 _CompDescription: Oficially supported diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index b78d150f..045e234a 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -12,7 +12,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False - False + True False True False @@ -20,6 +20,7 @@ GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True + False diff --git a/gnome-software-properties b/gnome-software-properties index a1b61ced..2bc04755 100644 --- a/gnome-software-properties +++ b/gnome-software-properties @@ -35,9 +35,9 @@ import sys from optparse import OptionParser -sys.path.append("@prefix@/share/update-manager/python") +#sys.path.append("@prefix@/share/update-manager/python") -from SoftwareProperties import * +import SoftwareProperties if __name__ == "__main__": _ = gettext.gettext @@ -72,7 +72,7 @@ if __name__ == "__main__": gtk.glade.bindtextdomain(localesApp, localesDir) gtk.glade.textdomain(localesApp) -# data_dir="/usr/share/update-manager/" + #data_dir="/usr/share/update-manager/" data_dir="/tmp/xxx/share/update-manager/" - app = SoftwareProperties(data_dir,options) + app = SoftwareProperties.SoftwareProperties(data_dir,options) app.run() diff --git a/po/da.po b/po/da.po index a7bbc09d..e1e4c428 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-28 11:31+0200\n" "Last-Translator: Martin Willemoes Hansen \n" "Language-Team: Danish \n" @@ -377,23 +377,23 @@ msgstr "Opdateringer" msgid "_Install" msgstr "_Installér" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/de.po b/po/de.po index 487b6ac1..b70cec28 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-04-02 08:46+0200\n" "Last-Translator: Frank Arnold \n" "Language-Team: German GNOME Translations \n" @@ -382,25 +382,25 @@ msgstr "Software-Aktualisierungen" msgid "_Install" msgstr "_Installieren" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Eine Schlüsseldatei wählen" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Fehler beim Importieren der gewählten Datei" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Fehler beim Entfernen des Schlüssels" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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 " diff --git a/po/el.po b/po/el.po index 54ad76bc..da9bef04 100644 --- a/po/el.po +++ b/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-05 14:33+0200\n" "Last-Translator: Kostas Papadimas \n" "Language-Team: Greek \n" @@ -361,22 +361,22 @@ msgstr "" msgid "_Install" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/en_CA.po b/po/en_CA.po index f4a8810b..b9dc7aa8 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-04-03 01:26-0500\n" "Last-Translator: Adam Weinberger \n" "Language-Team: Canadian English \n" @@ -376,23 +376,23 @@ msgstr "Software Updates" msgid "_Install" msgstr "_Install" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Choose a key-file" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Error importing selected file" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Error removing the key" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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." diff --git a/po/es.po b/po/es.po index d84851e4..5ff444fa 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-04-04 15:00+0200\n" "Last-Translator: Jorge Bernal \n" "Language-Team: Spanish \n" @@ -379,25 +379,25 @@ msgstr "Actualizaciones de software" msgid "_Install" msgstr "_Instalar" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Elija un fichero de clave" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Hubo un error al importar el fichero seleccionado" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Hubo un error al quitar la clave" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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 " diff --git a/po/fi.po b/po/fi.po index 947bae35..db7aa0ca 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-30 08:30+0200\n" "Last-Translator: Timo Jyrinki \n" "Language-Team: Finnish \n" @@ -375,23 +375,23 @@ msgstr "Ohjelmapäivitykset" msgid "_Install" msgstr "_Asenna" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Valitse avaintiedosto" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Virhe tuotaessa valittua avainta" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Virhe poistettaessa avainta" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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." diff --git a/po/fr.po b/po/fr.po index 31aedf4b..eb4a44f3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager 0.37.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-04-04 19:43+0200\n" "Last-Translator: \n" "Language-Team: French \n" @@ -378,25 +378,25 @@ msgstr "Mises à jour des logiciels" msgid "_Install" msgstr "_Installer" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Choisir un fichier de clé" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Erreur lors du chargement du fichier sélectionné" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Erreur lors de la suppression de la clé" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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 " diff --git a/po/hu.po b/po/hu.po index 589ca786..c136accf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-04-03 12:32+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -377,23 +377,23 @@ msgstr "Szoftverfrissítések" msgid "_Install" msgstr "_Telepítés" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Válasszon egy kulcsfájlt" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Hiba a kiválasztott fájl importálása közben" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Hiba a kulcs eltávolítása közben" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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." diff --git a/po/ja.po b/po/ja.po index fe451caa..33ab8198 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-23 10:23+0900\n" "Last-Translator: Hiroyuki Ikezoe \n" "Language-Team: LANGUAGE \n" @@ -376,23 +376,23 @@ msgstr "ソフトウェアのアップデート" msgid "_Install" msgstr "インストール(I)" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/pl.po b/po/pl.po index b9152855..b31fc896 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager cvs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-25 17:23+0100\n" "Last-Translator: Zygmunt Krynicki \n" "Language-Team: Polish \n" @@ -376,23 +376,23 @@ msgstr "Aktualizacje oprogramowania" msgid "_Install" msgstr "_Instaluj" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "Wybierz plik z kluczem" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "Błąd podczas importu wybranego pliku" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 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:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "Błąd podczas usuwania klucza" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 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." diff --git a/po/pt_BR.po b/po/pt_BR.po index 181fd772..5a3bff1d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-29 13:36-0300\n" "Last-Translator: Raphael Higino \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: Romanian \n" @@ -378,23 +378,23 @@ msgstr "Actualizări software" msgid "_Install" msgstr "_Instalează" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/rw.po b/po/rw.po index 77eb4c9b..e5bac161 100644 --- a/po/rw.po +++ b/po/rw.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-31 20:55-0700\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -411,27 +411,27 @@ msgstr "Ibihuzagihe bya porogaramumudasobwa " msgid "_Install" msgstr "Kwinjiza porogaramu" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 #, fuzzy msgid "Choose a key-file" msgstr "a Urufunguzo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 #, fuzzy msgid "Error importing selected file" msgstr "Kuzaza Byahiswemo IDOSIYE" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 #, fuzzy msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "Byahiswemo IDOSIYE Gicurasi OYA a Urufunguzo IDOSIYE Cyangwa" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 #, fuzzy msgid "Error removing the key" msgstr "i Urufunguzo" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 #, fuzzy msgid "The key you selected could not be removed. Please report this as a bug." msgstr "Urufunguzo Byahiswemo OYA Cyavanyweho Icyegeranyo iyi Nka a" diff --git a/po/sv.po b/po/sv.po index 7fa1b236..4bb216c7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-26 15:14+0100\n" "Last-Translator: Christian Rose \n" "Language-Team: Swedish \n" @@ -360,24 +360,24 @@ msgstr "Programvaruuppdateringar" msgid "_Install" msgstr "_Installera" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 #, fuzzy msgid "Choose a key-file" msgstr "Välj en spegel" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/xh.po b/po/xh.po index 80ddfe38..2c125a89 100644 --- a/po/xh.po +++ b/po/xh.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: update-notifier\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-30 13:25+0200\n" "Last-Translator: Canonical Ltd \n" "Language-Team: Xhosa \n" @@ -348,23 +348,23 @@ msgstr "Bonisa izihlaziyo" msgid "_Install" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index fbb2e86c..44ce0169 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: update-manager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 17:30+0100\n" +"POT-Creation-Date: 2005-11-29 17:26+0100\n" "PO-Revision-Date: 2005-03-21 22:00+0800\n" "Last-Translator: Funda Wang \n" "Language-Team: zh_CN \n" @@ -352,23 +352,23 @@ msgstr "软件更新" msgid "_Install" msgstr "安装(_I)" -#: ../SoftwareProperties/SoftwareProperties.py:218 +#: ../SoftwareProperties/SoftwareProperties.py:222 msgid "Choose a key-file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:227 +#: ../SoftwareProperties/SoftwareProperties.py:231 msgid "Error importing selected file" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:228 +#: ../SoftwareProperties/SoftwareProperties.py:232 msgid "The selected file may not be a GPG key file or it might be corrupt." msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:240 +#: ../SoftwareProperties/SoftwareProperties.py:244 msgid "Error removing the key" msgstr "" -#: ../SoftwareProperties/SoftwareProperties.py:241 +#: ../SoftwareProperties/SoftwareProperties.py:245 msgid "The key you selected could not be removed. Please report this as a bug." msgstr "" diff --git a/setup.py b/setup.py index b1e567e6..1ab49af7 100755 --- a/setup.py +++ b/setup.py @@ -20,7 +20,9 @@ os.system("cd channels; make") setup(name='update-manager', version='0.1', - packages=['SoftwareProperties','UpdateManager'], + packages=['SoftwareProperties', + 'UpdateManager', + 'UpdateManager.Common'], scripts=['gnome-software-properties','src/update-manager'], data_files=[('share/update-manager/glade', glob.glob("data/*.glade")), -- cgit v1.2.3