Hello community, here is the log from the commit of package fwzs for openSUSE:Factory checked in at Thu Apr 28 03:27:59 CEST 2011. -------- --- fwzs/fwzs.changes 2009-09-30 11:12:20.000000000 +0200 +++ fwzs/fwzs.changes 2011-04-27 18:12:59.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 27 16:06:32 UTC 2011 - lnussel@suse.de + +- new version 0.4: + * polkit1 support + * better firewall status detection + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fwzs-0.3.tar.bz2 New: ---- fwzs-0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwzs.spec ++++++ --- /var/tmp/diff_new_pack.Cw5fgq/_old 2011-04-28 03:25:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Cw5fgq/_new 2011-04-28 03:25:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fwzs (Version 0.3) +# spec file for package fwzs # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ Name: fwzs Url: http://gitorious.org/opensuse/fwzs Summary: Tray applet that allows to switch firewall zones of interfaces -Version: 0.3 +Version: 0.4 Release: 1 -License: GPL v2 only +License: GPLv2 Group: System/GUI/Other Source: fwzs-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +46,11 @@ %install make DESTDIR="%{buildroot}" install +%if 0%{?suse_version} < 1130 +rm %{buildroot}%{_datadir}/polkit-1/actions/org.opensuse.zoneswitcher.policy +%else +rm %{buildroot}%{_datadir}/PolicyKit/policy/org.opensuse.zoneswitcher.policy +%endif # %find_lang fwzsd %find_lang fwzsapp @@ -65,7 +70,11 @@ %{_datadir}/applications/fwzsapp.desktop %dir %{_datadir}/PolicyKit %dir %{_datadir}/PolicyKit/policy +%if 0%{?suse_version} < 1130 %{_datadir}/PolicyKit/policy/org.opensuse.zoneswitcher.policy +%else +%{_datadir}/polkit-1/actions/org.opensuse.zoneswitcher.policy +%endif %{_bindir}/fwzsapp %config %{_sysconfdir}/dbus-1/system.d/org.opensuse.zoneswitcher.conf ++++++ fwzs-0.3.tar.bz2 -> fwzs-0.4.tar.bz2 ++++++ ++++ 5296 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/Makefile.am new/fwzs-0.4/Makefile.am --- old/fwzs-0.3/Makefile.am 2009-08-27 10:49:27.000000000 +0200 +++ new/fwzs-0.4/Makefile.am 2011-04-27 18:11:25.000000000 +0200 @@ -1,5 +1,5 @@ -sbin_SCRIPTS = fwzsd -bin_SCRIPTS = fwzsapp +pkgdata_SCRIPTS = fwzsd fwzsapp +pkgdata_DATA = PolkitAuth.py icondir = $(pkgdatadir)/icons icon_DATA = firewall.png firewall_g.png firewall_x.png firewall_y.png @@ -17,6 +17,9 @@ policydir = $(datadir)/PolicyKit/policy policy_DATA = org.opensuse.zoneswitcher.policy +policy1dir = $(datadir)/polkit-1/actions +policy1_DATA = org.opensuse.zoneswitcher.policy + do_subst = sed -e 's,[@]sbindir[@],$(sbindir),' \ -e 's,[@]bindir[@],$(bindir),' \ -e 's,[@]icondir[@],$(icondir),' @@ -40,12 +43,27 @@ @echo "creating $@" @$(do_subst) $(srcdir)/$< > $@ -CLEANFILES = $(sbin_SCRIPTS) $(bin_SCRIPTS) $(dbussystemservice_DATA) $(desktopdata_DATA) +CLEANFILES = $(pkgdata_SCRIPTS) $(dbussystemservice_DATA) $(desktopdata_DATA) EXTRA_DIST = fwzsd.py fwzsapp.py \ org.opensuse.zoneswitcher.service.in \ fwzsapp.desktop.in \ $(icon_DATA) \ + $(pkgdata_DATA) \ org.opensuse.zoneswitcher.policy \ org.opensuse.zoneswitcher.conf +install-exec-local: + $(INSTALL_SCRIPT) -d -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) + rm -f $(DESTDIR)$(bindir)/fwzsapp + rm -f $(DESTDIR)$(sbindir)/fwzsd + ln -s $(pkgdatadir)/fwzsapp $(DESTDIR)$(bindir) + ln -s $(pkgdatadir)/fwzsd $(DESTDIR)$(sbindir) + +install-data-local: install-policyDATA + sed -i -e 's/auth_admin_keep/auth_admin_keep_always/g' $(DESTDIR)$(policydir)/org.opensuse.zoneswitcher.policy + +uninstall-local: + rm -f $(DESTDIR)$(bindir)/fwzsapp + rm -f $(DESTDIR)$(sbindir)/fwzsd + SUBDIRS = po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/PolkitAuth.py new/fwzs-0.4/PolkitAuth.py --- old/fwzs-0.3/PolkitAuth.py 1970-01-01 01:00:00.000000000 +0100 +++ new/fwzs-0.4/PolkitAuth.py 2011-04-27 17:49:36.000000000 +0200 @@ -0,0 +1,58 @@ +#!/usr/bin/python + +import dbus + +class PolicyKitNotPrivilegedException(dbus.DBusException): + _dbus_error_name = 'org.freedesktop.PolicyKit.NotPrivilegedException' + +class PolkitAuth: + + def _pk1_result_is_authorized(self, r): + auth = r[0] + chal = r[1] + adetail = r[2] + return auth == True + + def _pk_result_is_authorized(self, action, r, reply_handler = None, error_handler = None): + if (r and r == "yes"): + if(reply_handler != None): + reply_handler(True) + else: + return True + + if (error_handler != None): + error_handler(PolicyKitNotPrivilegedException(action)) + else: + raise PolicyKitNotPrivilegedException(action) + + def check(self, sender, action, reply_handler = None, error_handler = None): + polkit1 = True + try: + pko = dbus.SystemBus().get_object("org.freedesktop.PolicyKit1", + "/org/freedesktop/PolicyKit1/Authority") + except: + polkit1 = False + + if(polkit1): + pki = dbus.Interface(pko, "org.freedesktop.PolicyKit1.Authority") + + subj = ("system-bus-name", { 'name': sender}) + details = {} + flags = 1 # user interaction = 1, no user interaction = 0 + cancelid = "" + if (reply_handler and error_handler): + pki.CheckAuthorization(subj, action, details, flags, cancelid, + reply_handler=lambda result: reply_handler(self._pk1_result_is_authorized(result)), error_handler=error_handler) + return + else: + r = pki.CheckAuthorization(subj, action, details, flags, cancelid) + return self._pk1_result_is_authorized(r) + else: + pko = dbus.SystemBus().get_object("org.freedesktop.PolicyKit", "/") + pki = dbus.Interface(pko, "org.freedesktop.PolicyKit") + if (reply_handler and error_handler): + pki.IsSystemBusNameAuthorized(action, sender, True, + reply_handler=lambda result: self._pk_result_is_authorized(action, result, reply_handler, error_handler), error_handler=error_handler) + else: + result = pki.IsSystemBusNameAuthorized(action, sender, True) + return self._pk_result_is_authorized(action, result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/configure.ac new/fwzs-0.4/configure.ac --- old/fwzs-0.3/configure.ac 2009-09-30 11:02:51.000000000 +0200 +++ new/fwzs-0.4/configure.ac 2011-04-27 18:11:25.000000000 +0200 @@ -1,6 +1,6 @@ define([dbusdatadirdefault],[${datadir}/dbus-1])dnl dnl -AC_INIT([fwzs],[0.3],[ludwig.nussel@suse.de]) +AC_INIT([fwzs],[0.4],[ludwig.nussel@suse.de]) AC_CONFIG_SRCDIR([fwzsd.py]) AC_PREREQ(2.53) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/fwzsapp.py new/fwzs-0.4/fwzsapp.py --- old/fwzs-0.3/fwzsapp.py 2009-09-30 09:58:12.000000000 +0200 +++ new/fwzs-0.4/fwzsapp.py 2011-04-27 18:24:49.000000000 +0200 @@ -43,7 +43,9 @@ xdg_configdir = os.path.expanduser(os.getenv('XDG_CONFIG_HOME', '~/.config')) -txt_no_zones_found = _("No zones found.\nFirewall not running or fwzs not supported?") +txt_no_zones_found_on = _("No zones found but Firewall is running.\nFwzs is probably not supported.") +txt_not_running = _("The firewall is not running.") +txt_service_not_running = _("zoneswitcher service not running or broken") class DesktopAutoStart: def __init__(self): @@ -189,7 +191,7 @@ v.set_border_width(6) group = None for z in zones: - txt = zones[z] + txt = zones[z]['desc'] if not txt: txt = z rb = gtk.RadioButton(group, txt) @@ -257,17 +259,14 @@ if self.icon: self.icon.set_from_file(self.iconfile) - def grey(self): - self._set_icon(icon_grey) - - def green(self): - self._set_icon(icon_green) - - def red(self): - self._set_icon(icon_red) - - def yellow(self): - self._set_icon(icon_yellow) + def update(self): + if self.app.running == None: + self._set_icon(icon_grey) + elif self.app.running == True: + self._set_icon(icon_green) + else: + self._set_icon(icon_red) + #self._set_icon(icon_yellow) def _menu_error(self, menu, txt): item = gtk.MenuItem(txt) @@ -286,8 +285,8 @@ menu = gtk.Menu() self.app.check_status() - if(not self.app.getzsiface()): - item = gtk.MenuItem(_("zoneswitcher service not running")) + if(self.app.running == None): + item = gtk.MenuItem(txt_service_not_running) item.set_sensitive(False) item.show() menu.append(item) @@ -295,7 +294,7 @@ else: zones = self.app.iface.Zones() - if zones: + if zones and self.app.running == True: ifaces = self.app.iface.Interfaces() if ifaces: @@ -311,7 +310,7 @@ group = None submenu = gtk.Menu() for z in zones: - txt = zones[z] + txt = zones[z]['desc'] if not txt: txt = z zitem = gtk.RadioMenuItem(group, txt) @@ -330,7 +329,10 @@ menu.append(item) else: - self._menu_error(menu, txt_no_zones_found) + if self.app.running == True: + self._menu_error(menu, txt_no_zones_found_on) + else: + self._menu_error(menu, txt_not_running) item = gtk.MenuItem(_("Run Firewall")) item.connect('activate', lambda *args: self.app.run_firewall()) @@ -381,16 +383,23 @@ w = gtk.Label("DBus not running") vbox.pack_start(w) - elif(not self.app.getzsiface()): - w = gtk.Label(_("zoneswitcher service not running")) + elif(self.app.running == None): + w = gtk.Label(txt_service_not_running) vbox.pack_start(w) else: - self.zones = self.app.iface.Zones() + try: + self.zones = self.app.iface.Zones() + except Exception, e: + print e + pass - if not self.zones: + if not self.zones or not self.app.running: vbox.set_border_width(6) vbox.set_spacing(6) - w = gtk.Label(txt_no_zones_found) + if self.app.running == True: + w = gtk.Label(txt_no_zones_found_on) + else: + w = gtk.Label(txt_not_running) vbox.pack_start(w, False, False) w = gtk.Button(_("Run Firewall")) w.connect('clicked', lambda *args: self.app.run_firewall()) @@ -411,8 +420,8 @@ def make_label(self, i, z): if z: - if self.zones[z]: - z = self.zones[z] + if 'desc' in self.zones[z] and self.zones[z]['desc'] != '': + z = self.zones[z]['desc'] else: z = _("Unknown") txt = '%s - %s' % (i, z) @@ -480,6 +489,7 @@ self.config = Config() self.icon = StatusIcon(self) self.overview_dialog = None + self.running = None; if delay: glib.timeout_add_seconds(delay, self.startup_timer) @@ -503,7 +513,8 @@ if(not new and old): self.obj = self.iface = None - self.icon.grey() + self.running = None + self.icon.update() elif(not old and new): self.check_status() @@ -521,14 +532,21 @@ self.getzsiface() try: if self.iface.Status(): - self.icon.green() + self.running = True; + self.icon.update() + return else: - self.icon.red() + self.running = False; + self.icon.update() + return except Exception, e: print e - self.icon.grey() + except: - self.icon.grey() + pass + + self.running = None + self.icon.update() def getzsiface(self): if(not self.bus): @@ -550,7 +568,6 @@ except dbus.DBusException, e: print "can't connect to bus:", str(e) self.bus = self.obj = self.iface = None - self.icon.grey() return None if(not (self.obj and self.iface)): @@ -584,12 +601,12 @@ while repeat: repeat = False try: - self.iface.setZone(iface, zone) - self.run_firewall() - if self.overview_dialog: - self.overview_dialog.zone_changed(iface, zone) + if self.iface.setZone(iface, zone) == True: + self.run_firewall() + if self.overview_dialog: + self.overview_dialog.zone_changed(iface, zone) except dbus.DBusException, e: - if e.get_dbus_name() == 'org.opensuse.zoneswitcher.FirewallNotPrivilegedException': + if e.get_dbus_name() == 'org.freedesktop.PolicyKit.NotPrivilegedException': if self.polkitauth(Exception.__str__(e)): repeat = True else: @@ -606,7 +623,7 @@ try: ret = self.iface.Run() except dbus.DBusException, e: - if e.get_dbus_name() == 'org.opensuse.zoneswitcher.FirewallNotPrivilegedException': + if e.get_dbus_name() == 'org.freedesktop.PolicyKit.NotPrivilegedException': if self.polkitauth(Exception.__str__(e)): repeat = True else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/fwzsd.py new/fwzs-0.4/fwzsd.py --- old/fwzs-0.3/fwzsd.py 2009-09-30 10:51:19.000000000 +0200 +++ new/fwzs-0.4/fwzsd.py 2011-04-27 15:47:08.000000000 +0200 @@ -23,6 +23,7 @@ import dbus import dbus.service import dbus.mainloop.glib +from PolkitAuth import PolkitAuth import os import subprocess @@ -118,7 +119,7 @@ return False @dbus.service.method(interface, - in_signature='', out_signature='a{ss}', sender_keyword='sender') + in_signature='', out_signature='a{sa{ss}}', sender_keyword='sender') def Zones(self, sender=None): """Return {"ZONE": "human readable name", ... }""" self._add_client(sender) @@ -132,22 +133,24 @@ return self.impl.Interfaces(sender=sender) @dbus.service.method(interface, - in_signature='ss', out_signature='b', sender_keyword='sender') - def setZone(self, interface, zone, sender=None): + in_signature='ss', out_signature='b', sender_keyword='sender', async_callbacks=('return_cb', 'error_cb')) + def setZone(self, interface, zone, sender, return_cb, error_cb): """Put the specified interface in the specified zone on next Firewall run Return True|False""" self._add_client(sender) - self._check_polkit(sender) - return self.impl.setZone(interface, zone, sender) + self._check_polkit(sender, "org.opensuse.zoneswitcher.control", + return_cb, error_cb, + lambda interface, zone, sender: self.impl.setZone(interface, zone, sender), interface, zone, sender) @dbus.service.method(interface, - in_signature='', out_signature='b', sender_keyword='sender') - def Run(self, sender=None): + in_signature='', out_signature='b', sender_keyword='sender', async_callbacks=('return_cb', 'error_cb')) + def Run(self, sender, return_cb, error_cb): """Run the Firewall to apply settings. Return True|False""" self._add_client(sender) - self._check_polkit(sender) - return self.impl.Run(sender) + self._check_polkit(sender, "org.opensuse.zoneswitcher.control", + return_cb, error_cb, + lambda sender: self.impl.Run(sender), sender) @dbus.service.method(interface, in_signature='', out_signature='b', sender_keyword='sender') @@ -171,24 +174,34 @@ self._update_timeout() self.impl.nameowner_changed_handler(name, old, new) - def _check_polkit(self, sender, action = "org.opensuse.zoneswitcher.control"): - try: - pko = self._connection.get_object("org.freedesktop.PolicyKit", "/") - pki = dbus.Interface(pko, "org.freedesktop.PolicyKit") - result = pki.IsSystemBusNameAuthorized(action, sender, True) - if result and result == "yes": - return True - except Exception, e: - raise e + def _check_polkit(self, sender, action, return_cb, error_cb, func, *args ): + #print return_cb, error_cb, func, args + pk = PolkitAuth() + pk.check(sender, action, + lambda result: self._pk_auth_done(result, return_cb, error_cb, func, *args), + lambda e: self._pk_auth_except(error_cb, e)) + + def _pk_auth_done(self, result, return_cb, error_cb, func, *args): + #print return_cb, error_cb, func, args + r = False + if(result): + try: + r = func(*args) + except Exception, e: + error_cb(e) + return + + return_cb(r) - raise FirewallNotPrivilegedException(action) + def _pk_auth_except(self, error_cb, e): + error_cb(e) class ZoneSwitcherSuSEfirewall2(ZoneSwitcher): ZONES = { - 'int': N_('Not Protected'), - 'dmz': N_('Partially Protected'), - 'ext': N_('Protected'), + 'int': N_('Trusted'), + 'dmz': N_('DMZ'), + 'ext': N_('Untrusted'), } STATUSDIR = '/var/run/SuSEfirewall2/status' @@ -210,12 +223,11 @@ ret = {} for z in self._listzones(): + ret[z] = { 'desc' : '' } if z in self.ZONES: - ret[z] = self.ZONES[z] + ret[z]['desc'] = self.ZONES[z] if sender in self.trans: - ret[z] = self.trans[sender].gettext(ret[z]) - else: - ret[z] = None + ret[z]['desc'] = self.trans[sender].gettext(ret[z]['desc']) return ret diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/org.opensuse.zoneswitcher.policy new/fwzs-0.4/org.opensuse.zoneswitcher.policy --- old/fwzs-0.3/org.opensuse.zoneswitcher.policy 2009-08-25 11:00:45.000000000 +0200 +++ new/fwzs-0.4/org.opensuse.zoneswitcher.policy 2010-06-18 11:56:16.000000000 +0200 @@ -13,8 +13,8 @@ <description>allow to switch firewall zones</description> <message>System policy prevents changing firewall zones</message> <defaults> - <allow_any>auth_admin_keep_always</allow_any> - <allow_inactive>auth_admin_keep_always</allow_inactive> + <allow_any>auth_admin_keep</allow_any> + <allow_inactive>auth_admin_keep</allow_inactive> <allow_active>yes</allow_active> </defaults> </action> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/po/Makefile.am new/fwzs-0.4/po/Makefile.am --- old/fwzs-0.3/po/Makefile.am 2009-08-27 12:09:18.000000000 +0200 +++ new/fwzs-0.4/po/Makefile.am 2011-04-27 17:48:09.000000000 +0200 @@ -1,4 +1,4 @@ -# gettext/intltool automake ingeration really sucks. I do it myself. +# gettext/intltool automake integration really sucks. I do it myself. # XGETTEXT = xgettext --keyword=_ --keyword=N_ MSGFMT = msgfmt @@ -6,6 +6,13 @@ LINGUAS = de DOMAINS = fwzsapp fwzsd +mos = $(foreach lang,$(LINGUAS),$(addsuffix _$(lang).mo,$(DOMAINS))) + +all-local: $(mos) + +%.mo: %.po + $(MSGFMT) -o $@ $< + update-po: @for d in $(DOMAINS); do \ $(MAKE) $$d.pot; \ @@ -21,12 +28,11 @@ done; \ done -install-data-local: +install-data-local: $(mos) @for d in $(DOMAINS); do \ for i in $(LINGUAS); do \ n=$${d}_$$i; \ test -e $$n.po || continue; \ - $(MSGFMT) -o $$n.mo $$n.po; \ set -- install -D -m 644 $$n.mo $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/$$d.mo; \ echo "$$@"; \ "$$@"; rm -f $$n.mo; \ @@ -42,6 +48,9 @@ done; \ done +clean-local: + rm -f $(mos) + fwzsapp.pot: $(top_srcdir)/fwzsapp.py $(XGETTEXT) $? -o $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/po/fwzsapp_de.po new/fwzs-0.4/po/fwzsapp_de.po --- old/fwzs-0.3/po/fwzsapp_de.po 2009-08-27 12:11:04.000000000 +0200 +++ new/fwzs-0.4/po/fwzsapp_de.po 2011-04-27 17:27:03.000000000 +0200 @@ -4,92 +4,97 @@ # Copyright (C) 2009 THE fwzs'S COPYRIGHT HOLDER # This file is distributed under the same license as the fwzs package. # -# Ludwig Nussel <ludwig.nussel@suse.de>, 2009. +# Ludwig Nussel <ludwig.nussel@suse.de>, 2009, 2011. # Ludwig Nussel <lnussel@suse.de>, 2009. msgid "" msgstr "" "Project-Id-Version: fwzsapp_de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-27 12:06+0200\n" -"PO-Revision-Date: 2009-08-27 12:11+0200\n" -"Last-Translator: Ludwig Nussel <lnussel@suse.de>\n" -"Language-Team: Deutsch\n" +"POT-Creation-Date: 2011-04-27 15:52+0200\n" +"PO-Revision-Date: 2011-04-27 17:27+0200\n" +"Last-Translator: Ludwig Nussel <ludwig.nussel@suse.de>\n" +"Language-Team: German <kde-i18n-de@kde.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" #: ../fwzsapp.py:46 msgid "" -"No zones found.\n" -"Firewall not running or fwzs not supported?" +"No zones found but Firewall is running.\n" +"Fwzs is probably not supported." msgstr "" "Keine Zonen gefunden\n" -"Läuft die Firewall nicht oder wird fwzs nicht unterstützt?" +"Fwzs wird möglicherweise nicht unterstützt." -#: ../fwzsapp.py:129 +#: ../fwzsapp.py:47 +msgid "The firewall is not running." +msgstr "Die Firewall läuft nicht." + +#: ../fwzsapp.py:48 +msgid "zoneswitcher service not running or broken" +msgstr "zoneswitcher Dienst läuft nicht oder ist kaputt" + +#: ../fwzsapp.py:132 msgid "Settings" msgstr "Einstellungen" -#: ../fwzsapp.py:134 +#: ../fwzsapp.py:138 msgid "System Tray Icon" msgstr "System Tray Icon" -#: ../fwzsapp.py:139 +#: ../fwzsapp.py:143 msgid "Start on Log-in" msgstr "Beim Einloggen starten" -#: ../fwzsapp.py:179 +#: ../fwzsapp.py:183 msgid "Can't get list of interfaces or zones" msgstr "Liste der Schnittstellen kann nicht abgerufen werden" -#: ../fwzsapp.py:182 +#: ../fwzsapp.py:186 #, python-format msgid "Choose Zone for %s" msgstr "Zone für %s wählen" -#: ../fwzsapp.py:287 ../fwzsapp.py:379 -msgid "zoneswitcher service not running" -msgstr "zoneswitcher Dienst läuft nicht" - -#: ../fwzsapp.py:299 +#: ../fwzsapp.py:301 msgid "Firewall interfaces" msgstr "Firewall Schnittstellen" -#: ../fwzsapp.py:324 +#: ../fwzsapp.py:326 msgid "No interfaces found." msgstr "Keine Schnittstellen gefunden." -#: ../fwzsapp.py:332 ../fwzsapp.py:389 +#: ../fwzsapp.py:337 ../fwzsapp.py:404 msgid "Run Firewall" msgstr "Firewall ausführen" -#: ../fwzsapp.py:341 +#: ../fwzsapp.py:346 msgid "Quit" msgstr "Beenden" -#: ../fwzsapp.py:359 ../fwzsapp.py:421 +#: ../fwzsapp.py:366 ../fwzsapp.py:450 msgid "Firewall Zone Switcher" msgstr "Firewall Zonen-Umschalter" -#: ../fwzsapp.py:402 +#: ../fwzsapp.py:426 msgid "Unknown" msgstr "Unbekannt" -#: ../fwzsapp.py:427 +#: ../fwzsapp.py:456 msgid "Interfaces" msgstr "Schnittstellen" -#: ../fwzsapp.py:432 +#: ../fwzsapp.py:461 msgid "Settings..." msgstr "Einstellungen..." -#: ../fwzsapp.py:556 +#: ../fwzsapp.py:593 msgid "Firewall Error" msgstr "Firewall Fehler" -#: ../fwzsapp.py:612 +#: ../fwzsapp.py:651 msgid "" "The PolicyKit Authentication Agent is not available.\n" "Try installing 'PolicyKit-gnome'." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fwzs-0.3/po/fwzsd_de.po new/fwzs-0.4/po/fwzsd_de.po --- old/fwzs-0.3/po/fwzsd_de.po 2009-08-27 10:24:05.000000000 +0200 +++ new/fwzs-0.4/po/fwzsd_de.po 2011-04-27 17:29:50.000000000 +0200 @@ -3,34 +3,42 @@ # This file is distributed under the same license as the fwzs package. # # Ludwig Nussel <lnussel@suse.de>, 2009. +# Ludwig Nussel <ludwig.nussel@suse.de>, 2011. msgid "" msgstr "" "Project-Id-Version: fwzsd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-26 14:36+0200\n" -"PO-Revision-Date: 2009-08-25 16:14+0200\n" +"POT-Creation-Date: 2011-04-27 15:52+0200\n" +"PO-Revision-Date: 2011-04-27 17:29+0200\n" "Last-Translator: Ludwig Nussel <ludwig.nussel@suse.de>\n" -"Language-Team: German\n" +"Language-Team: German <kde-i18n-de@kde.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../fwzsd.py:110 -msgid "Not Protected" -msgstr "Ungeschützt" - -#: ../fwzsd.py:111 -msgid "Partially Protected" -msgstr "Teilweise Geschützt" - -#: ../fwzsd.py:112 -msgid "Protected" -msgstr "Geschützt" +#: ../fwzsd.py:202 +msgid "Trusted" +msgstr "Vertrauenswürdig" -#~ msgid "Trusted Network" -#~ msgstr "Vertrauenswürdiges Netz" +#: ../fwzsd.py:203 +msgid "DMZ" +msgstr "DMZ" + +#: ../fwzsd.py:204 +msgid "Untrusted" +msgstr "Nicht Vertrauenswürdig" + +#~ msgid "Not Protected" +#~ msgstr "Ungeschützt" + +#~ msgid "Partially Protected" +#~ msgstr "Teilweise Geschützt" + +#~ msgid "Protected" +#~ msgstr "Geschützt" #~ msgid "Foreign Network" #~ msgstr "Fremdes Netz " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org