summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--NEWS22
-rwxr-xr-xmgaapplet203
-rwxr-xr-xmgaapplet-config10
-rwxr-xr-xmgaapplet-update-checker111
-rwxr-xr-xmgaapplet-upgrade-helper34
-rw-r--r--mgaapplet.pm47
-rw-r--r--mgaapplet_gui.pm18
-rw-r--r--mgaonline.pm6
-rwxr-xr-xmgaupdate2
-rw-r--r--po/.tx/config8
-rw-r--r--po/el.po16
-rw-r--r--po/es.po779
-rw-r--r--po/et.po18
-rw-r--r--po/id.po111
-rw-r--r--po/nl.po20
-rw-r--r--po/pl.po34
-rw-r--r--po/tr.po25
-rw-r--r--po/zh_TW.po219
-rw-r--r--polkit/Makefile2
20 files changed, 431 insertions, 1270 deletions
diff --git a/Makefile b/Makefile
index a1811700..3afddced 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-PACKAGE = mgaonline
-VERSION:=2.83
-
NAME = mgaonline
+VERSION:=3.3
+
MGAUPDATE = mgaupdate
MGAAPPLET = mgaapplet
SUBDIRS = po polkit
@@ -33,7 +32,7 @@ clean:
install: all
install -d $(PREFIX)/usr/{bin,libexec,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
install -m755 $(MGAUPDATE) $(MGAAPPLET)-config $(MGAAPPLET)-upgrade-helper $(LIBEXECDIR)
- install -m755 $(MGAAPPLET) $(BINDIR)
+ install -m755 $(MGAAPPLET) $(MGAAPPLET)-update-checker $(BINDIR)
install -d $(SYSCONFDIR)
install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet
install -m644 icons/$(NAME)16.png $(ICONSDIR)/mini/$(NAME).png
@@ -42,6 +41,7 @@ install: all
install -m644 pixmaps/*.png $(PIXDIR)/pixmaps
perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm
install -m644 mgaonline.pm $(FBLIBDIR)
+ install -m644 mgaapplet.pm $(FBLIBDIR)
install -m644 mgaapplet_gui.pm $(FBLIBDIR)
install -m644 mgaapplet_urpm.pm $(FBLIBDIR)
for d in $(SUBDIRS); do make -C $$d $@; done
@@ -50,13 +50,7 @@ install: all
mkdir -p $(DATADIR)/mimelnk/application/
install -m644 x-mga-exec.desktop $(DATADIR)/mimelnk/application/
-cleandist:
- rm -rf $(PACKAGE)-$(VERSION) ../$(PACKAGE)-$(VERSION).tar.bz2
-
-
dis: dist
dist:
- @make cleandist
- rm -rf ../$(NAME)-$(VERSION).tar*
- @git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz >../$(NAME)-$(VERSION).tar.xz;
+ @git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz > $(NAME)-$(VERSION).tar.xz;
$(info $(NAME)-$(VERSION).tar.xz is ready)
diff --git a/NEWS b/NEWS
index 54de34cd..96d7c99a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+Version 3.3 - 21 December 2013, Thierry Vignaud
+
+- fix doing nothing when clicking on notifications buttons (mga#12041)
+- split mgaapplet-update-checker
+ (prevents segfault due to mixing glib threads with secular forks)
+
+Version 3.2 - 16 December 2013, Thierry Vignaud
+
+- fix crashing when displaying about dialog (mga#12009)
+
+Version 3.1 - 6 December 2013, Thierry Vignaud
+
+- fix using Notifications introspection API (mga#11897)
+
+Version 3.0 - 5 December 2013, Thierry Vignaud
+
+- convert from gtk2 to gtk3 (needs rpmdrake >= 6.0)
+
+Version 2.84 - 16 November 2013, Colin Guthrie
+
+- polkit: only use pkexec when not already root
+
Version 2.83 - 13 October 2013, Colin Guthrie
- re-add polkit wrapper for urpmi.update (mga#11125)
diff --git a/mgaapplet b/mgaapplet
index 967b0889..2af525ff 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -5,7 +5,7 @@
# Copyright (C) 2003-2010 Mandriva #
# #
# Daouda Lo #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
@@ -31,12 +31,13 @@ use feature 'state';
BEGIN { unshift @::textdomains, 'mgaonline' }
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:all);
use lib qw(/usr/lib/libDrakX/drakfirsttime);
use mgaonline;
+use mgaapplet;
use mgaapplet_gui;
-use Gtk2::Notify '-init', 'mgaapplet';
+use Gtk3::Notify '-init', 'mgaapplet';
use Net::DBus qw(:typing);
use Rpmdrake::open_db;
@@ -158,43 +159,6 @@ Then, restart \"%s\".", N("Enabled"), 'mgaapplet') ],
},
);
-my %comm_codes = (
- locked => {
- code => 2,
- status => 'locked',
- log => "urpmi database locked, skipping updating urpmi database",
- },
- error_updating => {
- code => 3,
- status => 'critical',
- log => N_("Error updating media"),
- },
- no_update_medium => {
- code => 4,
- status => 'no_update_medium',
- log => "no update media configured",
- },
- no_enabled_medium => {
- code => 5,
- status => 'no_enabled_medium',
- log => "all update media are disabled",
- },
- updates => {
- code => 6,
- status => 'updates',
- log => "Checking... Updates are available\n\n",
- },
- uptodate => {
- code => 7,
- status => 'okay',
- log => "Packages are up to date\n",
- },
- db_not_open => {
- code => 8,
- status => 'critical',
- log => "Failed to open urpmi database\n",
- },
-);
my %actions = (
'update' => { name => N("Install updates"), launch => \&installUpdates },
@@ -203,7 +167,7 @@ my %actions = (
'upgrade_distro' => { name => N("Upgrade the system"), launch => \&upgrade },
);
-my $icon = Gtk2::StatusIcon->new;
+my $icon = Gtk3::StatusIcon->new;
#$icon->shape_combine_mask($img, 0, 0);
$icon->signal_connect(popup_menu => sub {
my ($_icon, $button, $time) = @_;
@@ -260,9 +224,9 @@ $SIG{HUP} = \&restart_applet;
run_program::raw({ detach => 1 }, 'ionice', '-p', $$, '-n7');
-Gtk2->main;
+Gtk3->main;
-ugtk2::exit(0);
+ugtk3::exit(0);
sub gnome_shell_exit_overview() {
eval { Net::DBus->session->get_service('org.gnome.Shell')->get_object('/org/gnome/Shell', 'org.freedesktop.DBus.Properties')->Set('org.gnome.Shell', 'OverviewActive', dbus_boolean(0)) };
@@ -384,14 +348,14 @@ sub configNetwork() {
}
sub confirm_upgrade() {
- local $mygtk2::left_padding = 0;
+ local $mygtk3::left_padding = 0;
my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE});
my $w = new_portable_dialog(N("New version of Mageia distribution"));
my ($temp_dir, $box);
my $browse;
$browse = gtksignal_connect(
- Gtk2::FileChooserButton->new(N("Browse"), 'select-folder'),
+ Gtk3::FileChooserButton->new(N("Browse"), 'select-folder'),
'current-folder-changed' => sub {
$temp_dir = $_[0]->get_current_folder;
my $ok = -d $temp_dir && ! -l $temp_dir && ((stat($temp_dir))[4] == 0);
@@ -453,7 +417,7 @@ sub refresh_no_more_supported_msg() {
}
sub no_more_supported_choice() {
- local $mygtk2::left_padding = 0;
+ local $mygtk3::left_padding = 0;
my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_NO_MORE_SUPPORTED});
# FIXME: just tell radio buttons' children to wrap instead:
local $mgaapplet_gui::width = 580;
@@ -490,9 +454,9 @@ sub no_more_supported_choice() {
# explicitely wrap too long message:
foreach ($b1, $b2) {
- next if !$_ || !$_->child;
- $_->child->set_line_wrap(1);
- $_->child->set_size_request($width-50, -1);
+ next if !$_ || !$_->get_child;
+ $_->get_child->set_line_wrap(1);
+ $_->get_child->set_size_request($width-50, -1);
}
my $res = fill_n_run_portable_dialog($w, \@widgets);
@@ -522,8 +486,8 @@ sub no_more_supported() {
}
sub really_confirm_upgrade() {
- local $mygtk2::left_padding = 0;
- my $w = ugtk2->new(N("New version of Mageia distribution"), width => $width + 20);
+ local $mygtk3::left_padding = 0;
+ my $w = ugtk3->new(N("New version of Mageia distribution"), width => $width + 20);
# estimated package size:
my $c;
@@ -588,22 +552,6 @@ sub installUpdates() {
silentCheck(); gtkflush();
}
-sub checker_exit {
- my ($state) = @_;
- POSIX::_exit($comm_codes{$state}{code});
-}
-
-sub update_backport_media {
- my ($urpm) = @_;
- # update inactive backport media:
- my @inactive_backport_media = Rpmdrake::open_db::get_inactive_backport_media($urpm);
- return if !@inactive_backport_media;
- log::explanations("updating inactive backport media " . join(', ', @inactive_backport_media));
- foreach (@inactive_backport_media) {
- run_program::run('urpmi.update', if_($root, "--urpmi-root=$root"), $_);
- }
-}
-
sub silentCheck() {
state $check_time;
my $new_time = time();
@@ -619,83 +567,8 @@ sub silentCheck() {
# are there any updates ?
- $checker_pid = fork();
- if (defined $checker_pid) {
- return if $checker_pid; # parent
-
- # immediate exit, else forked gtk+ object destructors will badly catch up parent applet
- my $_safe = before_leaving {
- my $err = $@;
- log::explanations("mgaapplet check crashed: $err ");
- warn "Error: $err\n" . common::backtrace();
- POSIX::_exit(0);
- };
-
- # be nice with other processes:
- setpriority(0, $$, 7); # 0 is PRIO_PROCESS
-
- my $will_not_update_media;
- require urpm;
- require urpm::lock;
- # so that get_inactive_backport_media() doesn't vivify $urpm->{media}:
- my $urpm = Rpmdrake::open_db::fast_open_urpmi_db();
- {
- local $urpm->{fatal} = sub {
- print "Fatal: @_\n";
- $will_not_update_media = 1;
- };
- local $urpm->{error} = $urpm->{fatal};
-
- urpm::lock::urpmi_db($urpm, 'exclusive', 1);
- }
- checker_exit('locked') if $will_not_update_media;
-
- my $is_it_a_devel_distro = is_it_a_devel_distro();
-
- my $media = $is_it_a_devel_distro ? '-a' : '--update';
- if (!run_program::run('urpmi.update', $media, if_($root, "--urpmi-root=$root"))) {
- checker_exit('error_updating') if $will_not_update_media;
- }
-
- update_backport_media($urpm);
-
- require urpm::select;
- require urpm::media;
- # this eats 52Mb of RAM on 64bit:
- # (hence we do it in the forked helper so that the applet doesn't eat too much RAM)
- urpm::media::configure($urpm, if_(!$is_it_a_devel_distro, update => 1));
-
- my @update_medias = get_update_medias($urpm);
-
- if (!@update_medias) {
- checker_exit('no_update_medium');
- } elsif (!any { ! $_->{ignore} } @update_medias) {
- checker_exit('no_enabled_medium');
- }
-
- if (my $_db = urpm::db_open_or_die($urpm)) {
- my $requested = {};
- my $state = {};
- my $need_restart = urpm::select::resolve_dependencies(
- $urpm, $state, $requested,
- callback_choices => sub { 0 },
- priority_upgrade => $urpm->{options}{'priority-upgrade'},
- auto_select => 1,
- );
- my @requested_strict = map { scalar $_->fullname } @{$urpm->{depslist}}[keys %{$state->{selected}}];
-
- if ($need_restart || @requested_strict) {
- # FIXME: log first found pkgs?
- warn ">> need_restart=$need_restart, updates=" . join(', ', @requested_strict) . "\n";
- checker_exit('updates');
- } else {
- checker_exit('uptodate');
- }
- } else {
- checker_exit('db_not_open');
- }
- checker_exit('updates');
- } else {
+ $checker_pid = fork_exec('mgaapplet-update-checker', $root);
+ if (!$checker_pid) {
log::explanations("cannot fork: %s", "update checker ($!)");
go2State('critical');
}
@@ -762,8 +635,7 @@ sub about_dialog() {
comments => N("Mageia Online gives access to Mageia web services."),
website => $url,
website_label => N("Online WebSite"),
- authors => 'Thierry Vignaud <vignaud@mandriva.com>',
- artists => 'Hlne Durosini',
+ authors => [ 'Thierry Vignaud <thierry.vignaud@gmail.com>' ],
translator_credits =>
#-PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
N("_: Translator(s) name(s) & email(s)\n"),
@@ -782,7 +654,7 @@ sub setState {
my @arr = @{$state{$state}{menu}};
my $tmp = eval { gtkcreate_pixbuf($state{$state}{colour}[0]) };
$icon->set_from_pixbuf($tmp) if $tmp;
- $icon->set_tooltip(formatAlaTeX(translate($state{$state}{tt}[0])));
+ $icon->set_tooltip_text(formatAlaTeX(translate($state{$state}{tt}[0])));
my @invisible_states = qw(delayed okay disconnected locked);
$icon->set_visible(!member($state, @invisible_states));
@@ -793,45 +665,50 @@ sub setState {
gtkflush(); # so that bubbles are displayed on right icon
- if ($state{$state}{tt}[0] && $icon->isa('Gtk2::StatusIcon') && !$state{$state}{do_not_use_bubble}) {
- my $bubble = Gtk2::Notify->new(N("Warning"), formatAlaTeX(translate($state{$state}{tt}[0])) . "\n",
+ if ($state{$state}{tt}[0] && $icon->isa('Gtk3::StatusIcon') && !$state{$state}{do_not_use_bubble}) {
+ my $bubble = Gtk3::Notify::Notification->new(N("Warning"), formatAlaTeX(translate($state{$state}{tt}[0])) . "\n",
'/usr/share/icons/mgaonline.png');
if ($state eq 'new_distribution') {
- $bubble->add_action('clicked', N("More Information"), \&upgrade);
+ $bubble->add_action('upgrade', N("More Information"), sub { upgrade(); Gtk3->main_quit });
+ $bubble->signal_connect('closed' => \&Gtk3::main_quit);
if ($sub_state eq 'updates') {
push @arr, 'update';
}
} elsif ($state eq 'no_more_supported') {
- $bubble->add_action('clicked', N("More Information"), \&no_more_supported);
+ $bubble->add_action('no_more', N("More Information"), sub { no_more_supported(); Gtk3->main_quit });
+ $bubble->signal_connect('closed' => \&Gtk3::main_quit);
if ($sub_state eq 'updates') {
push @arr, 'update';
}
} elsif ($state eq 'updates') {
unshift @arr, 'upgrade_distro' if $new_distro;
- $bubble->add_action('clicked', N("Install updates"), \&installUpdates);
+ $bubble->add_action('updates', N("Install updates"), sub { installUpdates(); Gtk3->main_quit });
+ $bubble->signal_connect('closed' => \&Gtk3::main_quit);
} elsif (member($state, qw(no_enabled_medium no_update_medium))) {
- $bubble->add_action('clicked', N("Add media"), \&add_media);
+ $bubble->add_action('add_med', N("Add media"), sub { add_media(); Gtk3->main_quit });
+ $bubble->signal_connect('closed' => \&Gtk3::main_quit);
}
$bubble->set_urgency($state{$state}{urgency}) if $state{$state}{urgency};
$bubble->set_timeout(5000);
- eval { $bubble->show };
+ eval { $bubble->show; Gtk3->main };
+ warn ">> ERR:$@" if $@;
}
- my $menu = Gtk2::Menu->new;
+ my $menu = Gtk3::Menu->new;
foreach (@arr) {
my $action = $actions{$_};
next if !ref($action->{launch});
- $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label($action->{name})), activate => $action->{launch}));
+ $menu->append(gtksignal_connect(gtkshow(Gtk3::MenuItem->new_with_label($action->{name})), activate => $action->{launch}));
}
- $menu->append(gtkshow(Gtk2::SeparatorMenuItem->new));
- $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("About..."))),
+ $menu->append(gtkshow(Gtk3::SeparatorMenuItem->new));
+ $menu->append(gtksignal_connect(gtkshow(Gtk3::MenuItem->new_with_label(N("About..."))),
activate => \&about_dialog));
- $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("Updates Configuration"))),
+ $menu->append(gtksignal_connect(gtkshow(Gtk3::MenuItem->new_with_label(N("Updates Configuration"))),
activate => sub { run_program::raw({ detach => 1 }, 'mgaapplet-config') }));
- $menu->append(gtksignal_connect(gtkset_active($checkme = Gtk2::CheckMenuItem->new_with_label(N("Always launch on startup")), shouldStart()), toggled => sub { setAutoStart(uc(bool2text($checkme->get_active))) }));
+ $menu->append(gtksignal_connect(gtkset_active($checkme = Gtk3::CheckMenuItem->new_with_label(N("Always launch on startup")), shouldStart()), toggled => sub { setAutoStart(uc(bool2text($checkme->get_active))) }));
$checkme->show;
- $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("Quit"))), activate => sub { mainQuit() }));
+ $menu->append(gtksignal_connect(gtkshow(Gtk3::MenuItem->new_with_label(N("Quit"))), activate => sub { mainQuit() }));
$menu;
}
@@ -852,5 +729,5 @@ sub mainQuit() {
# setAutoStart('FALSE');
Glib::Source->remove($timeout) if $timeout;
Glib::Source->remove($network_timeout) if $network_timeout;
- Gtk2->main_quit;
+ Gtk3->main_quit;
}
diff --git a/mgaapplet-config b/mgaapplet-config
index cd3e121b..fe89a4c9 100755
--- a/mgaapplet-config
+++ b/mgaapplet-config
@@ -4,7 +4,7 @@
# #
# Copyright (C) 2008 Mandriva #
# #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
@@ -27,8 +27,8 @@ use common;
BEGIN { unshift @::textdomains, 'mgaonline' }
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:all);
use mgaonline;
use mgaapplet_gui;
use interactive;
@@ -36,11 +36,11 @@ use interactive;
get_product_id();
configure();
-ugtk2::exit(0);
+ugtk3::exit(0);
sub configure() {
- my $w = ugtk2->new(N("Adding an additional package medium"), width => -1);
+ my $w = ugtk3->new(N("Adding an additional package medium"), width => -1);
my %config = getVarsFromSh($config_file);
diff --git a/mgaapplet-update-checker b/mgaapplet-update-checker
new file mode 100755
index 00000000..41ffb739
--- /dev/null
+++ b/mgaapplet-update-checker
@@ -0,0 +1,111 @@
+#!/usr/bin/perl
+################################################################################
+# Mandriva Online #
+# #
+# Copyright (C) 2003-2010 Mandriva #
+# #
+# Daouda Lo #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
+# #
+# This program is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License Version 2 as #
+# published by the Free Software Foundation. #
+# #
+# 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. #
+################################################################################
+use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
+use standalone; # for explanations
+use MDK::Common;
+use Rpmdrake::open_db;
+use mgaapplet;
+use urpm;
+use urpm::lock;
+use urpm::select;
+use urpm::media;
+
+# be nice with other processes:
+setpriority(0, $$, 7); # 0 is PRIO_PROCESS
+
+my $root = $ARGV[0];
+
+my $will_not_update_media;
+# so that get_inactive_backport_media() doesn't vivify $urpm->{media}:
+my $urpm = Rpmdrake::open_db::fast_open_urpmi_db();
+{
+ local $urpm->{fatal} = sub {
+ print "Fatal: @_\n";
+ $will_not_update_media = 1;
+ };
+ local $urpm->{error} = $urpm->{fatal};
+
+ urpm::lock::urpmi_db($urpm, 'exclusive', 1);
+}
+checker_exit('locked') if $will_not_update_media;
+
+my $is_it_a_devel_distro = is_it_a_devel_distro();
+
+my $media = $is_it_a_devel_distro ? '-a' : '--update';
+if (!run_program::run('urpmi.update', $media, if_($root, "--urpmi-root=$root"))) {
+ checker_exit('error_updating') if $will_not_update_media;
+}
+
+update_backport_media($urpm);
+
+# this eats 52Mb of RAM on 64bit:
+# (hence we do it in the forked helper so that the applet doesn't eat too much RAM)
+urpm::media::configure($urpm, if_(!$is_it_a_devel_distro, update => 1));
+
+my @update_medias = get_update_medias($urpm);
+
+if (!@update_medias) {
+ checker_exit('no_update_medium');
+} elsif (!any { ! $_->{ignore} } @update_medias) {
+ checker_exit('no_enabled_medium');
+}
+
+if (my $_db = urpm::db_open_or_die($urpm)) {
+ my $requested = {};
+ my $state = {};
+ my $need_restart = urpm::select::resolve_dependencies(
+ $urpm, $state, $requested,
+ callback_choices => sub { 0 },
+ priority_upgrade => $urpm->{options}{'priority-upgrade'},
+ auto_select => 1,
+ );
+ my @requested_strict = map { scalar $_->fullname } @{$urpm->{depslist}}[keys %{$state->{selected}}];
+
+ if ($need_restart || @requested_strict) {
+ # FIXME: log first found pkgs?
+ warn ">> need_restart=$need_restart, updates=" . join(', ', @requested_strict) . "\n";
+ checker_exit('updates');
+ } else {
+ checker_exit('uptodate');
+ }
+} else {
+ checker_exit('db_not_open');
+}
+checker_exit('updates');
+
+sub checker_exit {
+ my ($state) = @_;
+ POSIX::_exit($comm_codes{$state}{code});
+}
+
+sub update_backport_media {
+ my ($urpm) = @_;
+ # update inactive backport media:
+ my @inactive_backport_media = Rpmdrake::open_db::get_inactive_backport_media($urpm);
+ return if !@inactive_backport_media;
+ log::explanations("updating inactive backport media " . join(', ', @inactive_backport_media));
+ foreach (@inactive_backport_media) {
+ run_program::run('urpmi.update', if_($root, "--urpmi-root=$root"), $_);
+ }
+}
+
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index a5f19e9b..b93ad061 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -4,7 +4,7 @@
# #
# Copyright (C) 2008-2010 Mandriva #
# #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
@@ -31,8 +31,8 @@ use feature 'state';
BEGIN { unshift @::textdomains, 'mgaonline' }
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:all);
use interactive;
use do_pkgs;
use lib qw(/usr/lib/libDrakX/drakfirsttime);
@@ -41,7 +41,7 @@ use Rpmdrake::open_db;
use lang;
use mgaapplet_gui qw(run_ask_credentials_dialog);
-ugtk2::add_icon_path("/usr/share/mgaonline/pixmaps/");
+ugtk3::add_icon_path("/usr/share/mgaonline/pixmaps/");
my ($log_file);
my ($new_distro_version, $download_dir);
@@ -82,11 +82,11 @@ sub check_available_free_space {
my (undef, $free_KB) = MDK::Common::System::df($dir);
if ($free_KB / 1024 < $wanted_MB) {
- my $msg = ugtk2::escape_text_for_TextView_markup_format(
+ my $msg = ugtk3::escape_text_for_TextView_markup_format(
N("Your system does not have enough space left in %s for upgrade (%dMB < %dMB)",
$dir,
$free_KB / 1024, $wanted_MB));
- ugtk2::ask_warn(N("Error"), $msg);
+ ugtk3::ask_warn(N("Error"), $msg);
0;
} else {
1;
@@ -133,8 +133,8 @@ my @common = (
);
sub create_upgrade_failed_window() {
- local $mygtk2::left_padding = 0;
- my $w = ugtk2->new(N("Error"));
+ local $mygtk3::left_padding = 0;
+ my $w = ugtk3->new(N("Error"));
gtkadd($w->{window},
gtknew('VBox', children_tight => [
get_banner(),
@@ -148,8 +148,8 @@ sub create_upgrade_failed_window() {
}
sub create_upgrade_succeeded_window() {
- local $mygtk2::left_padding = 0;
- my $w = ugtk2->new(N("Congratulations"));
+ local $mygtk3::left_padding = 0;
+ my $w = ugtk3->new(N("Congratulations"));
gtkadd($w->{window},
gtknew('VBox', children_tight => [
get_banner(),
@@ -167,13 +167,13 @@ sub check_preparation() {
# Find the matching new_distro_version
my @distros = get_distro_list();
if (!@distros) {
- ugtk2::ask_warn(N("Error"), N("Unable to download distro list"));
+ ugtk3::ask_warn(N("Error"), N("Unable to download distro list"));
die("unable to retrieve distro list\n");
}
my $new_distro = find { $_->{version} eq $new_distro_version } @distros;
if (!$new_distro) {
- ugtk2::ask_warn(N("Error"), N("Distribution version %s was not found in the update list", $new_distro_version));
+ ugtk3::ask_warn(N("Error"), N("Distribution version %s was not found in the update list", $new_distro_version));
die("could not find version '$new_distro_version' in the distro update list\n");
}
@@ -182,7 +182,7 @@ sub check_preparation() {
my $prepared = -f $statefile && cat_($statefile) =~ /ready/;
if (!$prepared) {
- ugtk2::ask_yesorno(N("Preparation Required"), N("In order to upgrade, your current installation needs to be prepared.\n\nDo you wish to do this preparation now?")) or exit(0);
+ ugtk3::ask_yesorno(N("Preparation Required"), N("In order to upgrade, your current installation needs to be prepared.\n\nDo you wish to do this preparation now?")) or exit(0);
my $in = interactive->vnew;
my $do_pkgs = do_pkgs::do_pkgs($in);
@@ -192,9 +192,9 @@ sub check_preparation() {
$prepared = -f $statefile && cat_($statefile) =~ /ready/;
if (!$prepared) {
my $infofile = "$root/usr/share/doc/mageia-prepare-upgrade/README.prepare";
- my $info = -f $infofile && ugtk2::escape_text_for_TextView_markup_format(join('', cat_($infofile)));
+ my $info = -f $infofile && ugtk3::escape_text_for_TextView_markup_format(join('', cat_($infofile)));
$info ||= N("Further action is required before you can continue.\n\nPlease see %s for more information.", $new_distro->{url});
- ugtk2::ask_warn(N("Next Steps"), $info);
+ ugtk3::ask_warn(N("Next Steps"), $info);
exit(0) if !$::testing;
log::l("I would validate /var/lib/mageia-prepare-upgrade/state == 'ready'");
}
@@ -221,7 +221,7 @@ sub upgrade() {
if (my $err = $@) {
log::explanations(sprintf("locking urpmi database failed: %s"), $err);
- ugtk2::ask_warn(N("Error"),
+ ugtk3::ask_warn(N("Error"),
N("Installation failed"),
'',
formatAlaTeX(N("Packages database is locked. Please close other applications
@@ -280,7 +280,7 @@ packages as well?)."))
log::explanations("restoringing urpmi configuration from $file");
cp_af($file, "$root/etc/urpmi/urpmi.cfg");
update_media();
- ugtk2::ask_warn(N("Error"),
+ ugtk3::ask_warn(N("Error"),
N("Installation failed"),
N("Failure when adding medium"),
);
diff --git a/mgaapplet.pm b/mgaapplet.pm
new file mode 100644
index 00000000..faabfc75
--- /dev/null
+++ b/mgaapplet.pm
@@ -0,0 +1,47 @@
+package mgaapplet;
+
+use Exporter;
+use lib qw(/usr/lib/libDrakX);
+use common;
+our @ISA = 'Exporter';
+our @EXPORT = qw(%comm_codes);
+
+our %comm_codes = (
+ locked => {
+ code => 2,
+ status => 'locked',
+ log => "urpmi database locked, skipping updating urpmi database",
+ },
+ error_updating => {
+ code => 3,
+ status => 'critical',
+ log => N_("Error updating media"),
+ },
+ no_update_medium => {
+ code => 4,
+ status => 'no_update_medium',
+ log => "no update media configured",
+ },
+ no_enabled_medium => {
+ code => 5,
+ status => 'no_enabled_medium',
+ log => "all update media are disabled",
+ },
+ updates => {
+ code => 6,
+ status => 'updates',
+ log => "Checking... Updates are available\n\n",
+ },
+ uptodate => {
+ code => 7,
+ status => 'okay',
+ log => "Packages are up to date\n",
+ },
+ db_not_open => {
+ code => 8,
+ status => 'critical',
+ log => "Failed to open urpmi database\n",
+ },
+);
+
+1;
diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm
index ebec40a3..e5d87b24 100644
--- a/mgaapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -6,7 +6,7 @@ package mgaapplet_gui;
# Copyright (C) 2003-2010 Mandriva #
# #
# Daouda Lo #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
@@ -46,14 +46,14 @@ our @EXPORT_OK = qw(
run_no_rights_dialog
);
-use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
-use ugtk2 qw(:all);
+use mygtk3 qw(gtknew); #- do not import gtkadd which conflicts with ugtk3 version
+use ugtk3 qw(:all);
use mgaonline qw(); # you don't want to polute the namespace
use interactive;
use interactive::gtk;
use lib qw(/usr/lib/libDrakX/drakfirsttime);
-ugtk2::add_icon_path("/usr/share/mgaonline/pixmaps/");
+ugtk3::add_icon_path("/usr/share/mgaonline/pixmaps/");
our $localdir = "$ENV{HOME}/.MgaOnline";
our $localfile = "$localdir/mgaonline";
@@ -62,7 +62,7 @@ our $localfile = "$localdir/mgaonline";
mkdir_p($localdir) if !-d $localdir;
-e "$ENV{HOME}/.mgaonline" and system("mv", "$ENV{HOME}/.mgaonline", $localfile);
-interactive::gtk::add_padding(Gtk2::Label->new);
+interactive::gtk::add_padding(Gtk3::Label->new);
our %local_config;
read_local_config();
@@ -77,7 +77,7 @@ our @common = (
sub new_portable_dialog {
my ($title) = @_;
- ugtk2->new($title, width => $width + 20);
+ ugtk3->new($title, width => $width + 20);
}
sub fill_n_run_portable_dialog {
@@ -113,7 +113,7 @@ sub fill_n_run_portable_dialog {
sub new_link_button {
my ($url, $text) = @_;
- my $link = Gtk2::LinkButton->new($url, $text);
+ my $link = Gtk3::LinkButton->new($url, $text);
$link->set_uri_hook(sub {
my (undef, $url) = @_;
run_program::raw({ detach => 1, setuid => get_parent_uid() }, 'www-browser', $url);
@@ -160,7 +160,7 @@ sub run_ask_credentials_dialog {
$password_text = $password_w->get_text;
$email_text = $email_w->get_text;
$ok_clicked = 1;
- Gtk2->main_quit;
+ Gtk3->main_quit;
};
my @widgets = (
@@ -197,7 +197,7 @@ sub run_ask_credentials_dialog {
)
)
]),
- ugtk2::create_okcancel($w, N("Next"), N("Cancel")),
+ ugtk3::create_okcancel($w, N("Next"), N("Cancel")),
);
fill_n_run_portable_dialog($w, \@widgets);
diff --git a/mgaonline.pm b/mgaonline.pm
index 9288db11..9c407deb 100644
--- a/mgaonline.pm
+++ b/mgaonline.pm
@@ -5,7 +5,7 @@
# 2005-2006 Mandriva #
# #
# Daouda Lo #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
@@ -27,7 +27,7 @@ use strict;
use lib qw(/usr/lib/libDrakX);
use common;
-use ugtk2;
+use ugtk3;
use LWP::UserAgent;
use URI::Escape;
@@ -172,7 +172,7 @@ sub get_banner_icon() {
sub get_banner {
my ($o_title) = @_;
- Gtk2::Banner->new(get_banner_icon(), $o_title || N("Distribution Upgrade"));
+ Gtk3::Banner->new(get_banner_icon(), $o_title || N("Distribution Upgrade"));
}
sub get_urpmi_options() {
diff --git a/mgaupdate b/mgaupdate
index dd8e672f..f8b2b7c1 100755
--- a/mgaupdate
+++ b/mgaupdate
@@ -5,7 +5,7 @@
# Copyright (C) 2002-2006 Mandriva #
# #
# Daouda Lo #
-# Thierry Vignaud <tvignaud at mandriva dot com> #
+# Thierry Vignaud <thierry.vignaud at gmail dot com> #
# #
# This program is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License Version 2 as #
diff --git a/po/.tx/config b/po/.tx/config
new file mode 100644
index 00000000..fd37bfeb
--- /dev/null
+++ b/po/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[mageia.mgaonline]
+file_filter = <lang>.po
+source_file = mgaonline.pot
+source_lang = en
+type = PO
diff --git a/po/el.po b/po/el.po
index 77f90bdd..428ddbe3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: mgaonline-el\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2013-05-26 08:01+0200\n"
+"PO-Revision-Date: 2013-11-30 13:11+0100\n"
"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
"Language-Team: Greek <i18n-el@ml.mageia.org>\n"
"Language: el\n"
@@ -487,30 +487,30 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "Αδύνατη η ενημέρωση των πακέτων από το μέσο update_source.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Διαμόρφωση Ενημερώσεων"
+msgstr "Εκτέλεση της Διαμόρφωσης της Μικροεφαρμογής Ενημερώσεων Mageia"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
msgstr ""
+"Απαιτείται πιστοποίηση για την εκτέλεση της Διαμόρφωσης της Μικροεφαρμογής "
+"Ενημερώσεων Mageia"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Εκτέλεση του Βοηθού Αναβάθμισης Mageia "
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Απαιτείται πιστοποίηση για την εκτέλεση του Βοηθού Αναβάθμισης Mageia "
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr " Εκτέλεση του MageiaUpdate\n"
+msgstr " Εκτέλεση της Ενημέρωσης Mageia"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
+msgstr "Απαιτείται πιστοποίηση για την εκτέλεση της Ενημέρωσης Mageia"
#~ msgid "System is up-to-date\n"
#~ msgstr "Το σύστημα είναι ενημερωμένο\n"
diff --git a/po/es.po b/po/es.po
index d727defa..bb569f1d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,28 +1,26 @@
-# translation of es.po to Spanish
-# spanish translation of Madrake Online (Mandriva Online-es.po).
-# Copyright (C) 2001 Mandriva S.A.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
#
-# Juan Manuel García Molina <juanma_gm@wanadoo.es>, 2001-2002.
-# lis c <liscortes@mi.madritel.es>, 2004.
-# Fabián Mandelbaum <fmandelbaum@gmail.com>, 2004, 2007-2008.
-# Carlos L Pineda <clpinedac@hotmail.com>, 2004.
-# Jaime Crespo <505201@unizar.es>, 2004.
-# Pablo Saratxaga <pablo@mandriva.com>, 2005.
-# Andre Paulo Machado <andre.panm@gmail.com>, 2009.
+# Translators:
+# Andre Paulo Machado <andre.panm@gmail.com>, 2009
+# Carlos L Pineda <clpinedac@hotmail.com>, 2004
+# Miguel Ortega, 2013
+# Jaime Crespo <505201@unizar.es>, 2004
+# lis c <liscortes@mi.madritel.es>, 2004
+# Pablo Saratxaga <pablo@mandriva.com>, 2005
msgid ""
msgstr ""
-"Project-Id-Version: mgaonline_es\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2010-06-08 09:18-0300\n"
-"Last-Translator: Diego Bello Carreño <dbello@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"PO-Revision-Date: 2013-11-17 08:00+0000\n"
+"Last-Translator: Miguel Ortega\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
+"es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.3\n"
-"Plural-Forms: nplurals=2; plural=(n>1);\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
#: ../mgaapplet:79
@@ -55,9 +53,9 @@ msgid "New updates are available for your system"
msgstr "Hay nuevas actualizaciones disponibles para su sistema"
#: ../mgaapplet:109
-#, fuzzy, c-format
+#, c-format
msgid "A new version of Mageia distribution has been released"
-msgstr "Ha sido publicada una nueva versión de Mageia Linux"
+msgstr "Se ha lanzado una nueva versión de la distribución Mageia"
#: ../mgaapplet:120
#, c-format
@@ -148,9 +146,9 @@ msgid "Launching drakconnect\n"
msgstr "Lanzando drakconnect\n"
#: ../mgaapplet:389 ../mgaapplet:465 ../mgaapplet:526
-#, fuzzy, c-format
+#, c-format
msgid "New version of Mageia distribution"
-msgstr "Nueva versión de Mageia Linux"
+msgstr "Nueva versión de la distribución Mageia"
#: ../mgaapplet:394
#, c-format
@@ -165,12 +163,12 @@ msgstr "Error"
#: ../mgaapplet:398
#, c-format
msgid "You must choose a directory owned by the super administrator!"
-msgstr ""
+msgstr "¡Tiene que elegir un directorio cuyo propietario sea el administrador!"
#: ../mgaapplet:405
-#, fuzzy, c-format
+#, c-format
msgid "A new version of Mageia distribution has been released."
-msgstr "Una nueva versión de Mageia Linux está disponible"
+msgstr "Se ha lanzado una nueva versión de la distribución Mageia."
#: ../mgaapplet:407 ../mgaapplet:477
#, c-format
@@ -213,13 +211,13 @@ msgid "Cancel"
msgstr "Cancelar"
#: ../mgaapplet:438
-#, fuzzy, c-format
+#, c-format
msgid ""
"Maintenance for this Mageia version has ended. No more updates will be "
"delivered for this system."
msgstr ""
-"El mantenimiento de esta versión de Mageia Linux ha finalizado. No se "
-"entregarán mas actualizaciones para este sistema."
+"El mantenimiento de esta versión de Mageia ha expirado. No se realizarán más "
+"actualizaciones para este sistema."
#: ../mgaapplet:444
#, c-format
@@ -449,9 +447,9 @@ msgstr ""
"uso:\n"
#: ../mgaupdate:66
-#, fuzzy, c-format
+#, c-format
msgid "Copyright (C) %s %s"
-msgstr "Copyright © %s por %s"
+msgstr "Copyright (C) %s %s"
#: ../mgaupdate:66
#, c-format
@@ -484,735 +482,26 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Configuración de Actualizaciones"
+msgstr "Ejecutar el applet de configuración de actualizaciones de Mageia"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
msgstr ""
+"Se requiere autenticación para configurar el applet de actualizaciones "
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Ayudante de actualizaciones"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Se requiere autenticación para ejecutar el ayudante de actualizaciones"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "Lanzando MageiaUpdate\n"
+msgstr "Actualizar Mageia"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
-
-#~ msgid "System is up-to-date\n"
-#~ msgstr "El sistema está actualizado\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "mgaupdate version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
-#~ "Copyright (C) %s Mageia.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "mdkupdate versión %s\n"
-#~ "Copyright © %s Mageia.\n"
-#~ "Este es software libre y puede volver a ser distribuido bajo los términos "
-#~ "de la GNU GPL.\n"
-#~ "\n"
-#~ "uso:\n"
-
-#~ msgid ""
-#~ "Basic maintenance for this distribution has expired. Thanks to your "
-#~ "subscription to extended maintenance, your system will be kept up to date "
-#~ "until %s"
-#~ msgstr ""
-#~ "El mantenimiento básico para esta distribución ha expirado. Gracias a su "
-#~ "suscripción para ampliar el mantenimiento su sistema seguirá estando "
-#~ "actualizado hasta %s"
-
-#~ msgid "You should get extended maintenance."
-#~ msgstr "Debería obtener una ampliación del mantenimiento."
-
-#~ msgid ""
-#~ "You should either get extended maintenance or upgrade to a newer version "
-#~ "of the %s distribution."
-#~ msgstr ""
-#~ "Debería obtener una ampliación del mantenimiento o actualizar a una "
-#~ "versión más reciente de la distribución %s."
-
-#~ msgid "Extended Maintenance"
-#~ msgstr "Mantenimiento ampliado"
-
-#~ msgid ""
-#~ "Purchase a maintenance extension for this version (%s) and keep it "
-#~ "running until %s."
-#~ msgstr ""
-#~ "Compre una ampliación de mantenimiento para esta versión (%s) y "
-#~ "manténgala operativa hasta %s."
-
-#~ msgid "Supported products are %s, '%s' is not on the list.\n"
-#~ msgstr "Los productos con soporte son %s, '%s' no está en la lista. \n"
-
-#~ msgid "Please fill in your account ID to add an additional package medium"
-#~ msgstr ""
-#~ "Por favor introduzca el nombre de usuario de su cuenta para añadir este "
-#~ "nuevo soporte."
-
-#~ msgid "Failure while retrieving distributions list:"
-#~ msgstr "Error al obtener lista de distribuciones:"
-
-#~ msgid ""
-#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-#~ "base updates (up to the %s) for distributions."
-#~ msgstr ""
-#~ "Mageia provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 "
-#~ "meses de actualizaciones base (hasta el %s) para las distribuciones."
-
-#~ msgid ""
-#~ "Extended maintenance is now available to get 18 months of additional "
-#~ "updates (until %s)."
-#~ msgstr ""
-#~ "La ampliación de mantenimiento está ahora disponible para tener 18 meses "
-#~ "de actualizaciones adicionales (hasta %s)."
-
-#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-#~ msgstr ""
-#~ "Usted puede suscribirse <b>ahora mismo</b> para obtener la ampliación de "
-#~ "mantenimiento:"
-
-#~ msgid "Lifetime policy"
-#~ msgstr "Política de tiempo de vida"
-
-#~ msgid "Online subscription"
-#~ msgstr "Suscripción en línea"
-
-#~ msgid "An error occurred"
-#~ msgstr "Ha ocurrido un error"
-
-#~ msgid "Your Mageia account does not have %s download subscription enabled."
-#~ msgstr "Su cuenta de Mageia no tiene suscripción para descarga %s "
-
-#~ msgid "An error occurred while adding medium"
-#~ msgstr "Ha ocurrido un error al añadir el soporte"
-
-#~ msgid "Successfully added media!"
-#~ msgstr "¡Soporte añadido satisfactoriamente!"
-
-#~ msgid "Successfully added media %s."
-#~ msgstr "Soporte %s añadido satisfactoriamente."
-
-#~ msgid "Ok"
-#~ msgstr "Aceptar"
-
-#~ msgid "An additional package medium is available for your distribution."
-#~ msgstr ""
-#~ "Un soporte adicional de programas está disponible para su distribución"
-
-#~ msgid "Add additional package medium"
-#~ msgstr "Añadir soporte con Programas Adicionales"
-
-#~ msgid "New medium available"
-#~ msgstr "Nuevo soporte disponible"
-
-#~ msgid ""
-#~ "You use '%s' distribution and therefore have privileged access to "
-#~ "additional software."
-#~ msgstr ""
-#~ "Usted utiliza la distribución '%s', y por tanto tiene acceso privilegiado "
-#~ "para programas adicionales."
-
-#~ msgid "Do you want to install this additional software repository?"
-#~ msgstr "¿Desea añadir este soporte para acceder programas adicionales?"
-
-#~ msgid "Mageia Enterprise Server"
-#~ msgstr "Mageia Enterprise Server"
-
-#~ msgid "Check for missing \"%s\" media"
-#~ msgstr "Verificar el medio \"%s\" que falta"
-
-#~ msgid "Restricted"
-#~ msgstr "Restringido"
-
-#~ msgid "Enterprise"
-#~ msgstr "Empresarial"
-
-#~ msgid ""
-#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
-#~ "stability and efficiency of open source solutions together with exclusive "
-#~ "softwares and Mageia official support."
-#~ msgstr ""
-#~ "Mageia Powerpack le brinda la mejor de la experiencia Linux para el "
-#~ "escritorio: estabilidad y eficiencia de soluciones de código abierto "
-#~ "junto con aplicaciones exclusivas y soporte oficial de Mageia."
-
-#, fuzzy
-#~ msgid "Mageia Features"
-#~ msgstr "Características de Mageia Linux"
-
-#~ msgid "Choose your upgrade version"
-#~ msgstr "Seleccione su versión de actualización"
-
-#~ msgid "Your Powerpack access has ended"
-#~ msgstr "Su acceso a Powerpack ha terminado"
-
-#~ msgid "%s is now available, you can upgrade to:"
-#~ msgstr "%s está ahora disponible, puede actualizarlo a:"
-
-#~ msgid "Mageia PowerPack"
-#~ msgstr "Mageia PowerPack"
-
-#, fuzzy
-#~ msgid ""
-#~ "The Mageia distribution with even more softwares and official support."
-#~ msgstr ""
-#~ "La distribución Mageia Linux con incluso más aplicaciones y soporte "
-#~ "oficial."
-
-#~ msgid "Mageia Linux"
-#~ msgstr "Mageia Linux"
-
-#~ msgid ""
-#~ "Please fill in your account ID to add an additional package medium once "
-#~ "you have subscribed online"
-#~ msgstr ""
-#~ "Por favor ingrese el nombre de usuario de su cuenta para añadir un medio "
-#~ "de paquetes adicional una vez que se ha suscrito en línea"
-
-#~ msgid ""
-#~ "Your Mageia account does not have Extended Maintenance subscription "
-#~ "enabled."
-#~ msgstr ""
-#~ "Su cuenta de Mageia no tiene una suscripción de Ampliación de "
-#~ "Mantenimiento habilitada."
-
-#, fuzzy
-#~ msgid "Mandiva Free"
-#~ msgstr "Mageia Free"
-
-#~ msgid "Would you like Powerpack?"
-#~ msgstr "¿Le gustaría obtener Powerpack?"
-
-#~ msgid ""
-#~ "Since you don't have Powerpack rights you may visit mandriva store now "
-#~ "and get Powerpack subscription."
-#~ msgstr ""
-#~ "Ya que usted no cuenta con derechos Powerpack, debería visitar la tienda "
-#~ "Mageia ahora y obtener una suscripción Powerpack."
-
-#~ msgid "Get Powerpack subscription!"
-#~ msgstr "¡Obtenga una suscripción a Powerpack!"
-
-#~ msgid ""
-#~ "Continue to use your new Powerpack account information to upgrade, or "
-#~ "Cancel and upgrade to the Free Edition."
-#~ msgstr ""
-#~ "Continúe para utilizar la información de su nueva cuenta Powerpack para "
-#~ "actualizar, o cancele y actualice a la versión Libre (Free Edition)."
-
-#~ msgid "Continue and Authenticate!"
-#~ msgstr "¿Continúe y autentíquese!"
-
-#~ msgid "Cancel, upgrade to Free Edition"
-#~ msgstr "Cancelar, actualizar a la Edición Free"
-
-#~ msgid ""
-#~ "Your Mageia account does not have Powerpack download subscription enabled."
-#~ msgstr "Su cuenta de Mageia no tiene suscripción para descarga Powerpack "
-
-#~ msgid ""
-#~ "Your system does not have enough space left in %s for upgrade (%dMB < "
-#~ "%dMB)"
-#~ msgstr ""
-#~ "Su sistema no tiene espacio suficiente en %s para actualizar (%dMB < %dMB)"
-
-#~ msgid "Installation failed"
-#~ msgstr "Falló la instalación"
-
-#~ msgid "Installation logs can be found in '%s'"
-#~ msgstr "Los registros de instalación los encontrará en '%s' "
-
-#~ msgid "Retry"
-#~ msgstr "Reintentar"
-
-#~ msgid "Congratulations"
-#~ msgstr "Felicitaciones"
-
-#~ msgid "Upgrade to Mageia %s release was successfull."
-#~ msgstr "La actualización a Mageia %s ha sido exitosa."
-
-#~ msgid "You must restart your system."
-#~ msgstr "Debe reiniciar su sistema."
-
-#~ msgid "Reboot"
-#~ msgstr "Reiniciar"
-
-#~ msgid ""
-#~ "Packages database is locked. Please close other applications\n"
-#~ "working with packages database (do you have another media\n"
-#~ "manager on another desktop, or are you currently installing\n"
-#~ "packages as well?)."
-#~ msgstr ""
-#~ "La base de datos de paquetes está bloqueada. Por favor, cierre otras\n"
-#~ "aplicaciones que trabajen con la misma (¿tiene algún otro\n"
-#~ "administrador de soportes en otro escritorio, o está instalando\n"
-#~ "paquetes en este instante?)"
-
-#~ msgid "Failure when adding medium"
-#~ msgstr "Fallo al añadir soporte"
-
-#, fuzzy
-#~ msgid ""
-#~ "The version of Mageia Linux installed on your system is no longer "
-#~ "supported."
-#~ msgstr "Una nueva versión de Mageia Linux está disponible"
-
-#, fuzzy
-#~ msgid "You are using '%s' distribution."
-#~ msgstr "¿Desea actualizar?"
-
-#~ msgid "Do you want to upgrade?"
-#~ msgstr "¿Desea actualizar?"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
-#~ msgstr ""
-#~ "Mageia Online parece haber sido reinstalado, volviendo a cargar applet..."
-
-#~ msgid "Checking... Updates are available\n"
-#~ msgstr "Verificando... Están disponibles actualizaciones\n"
-
-#~ msgid "Packages are up to date"
-#~ msgstr "Los paquetes están actualizados"
-
-#~ msgid "Failed to open urpmi database"
-#~ msgstr "Falló la apertura de la base de datos urpmi"
-
-#~ msgid "Connecting to"
-#~ msgstr "Conectando con"
-
-#~ msgid "Mageia Linux Updates Applet"
-#~ msgstr "Applet Mageia Linux Update"
-
-#~ msgid "Security error"
-#~ msgstr "Error de seguridad"
-
-#~ msgid "Generic error (machine already registered)"
-#~ msgstr "Error genérico (máquina ya registrada)"
-
-#~ msgid "Database error"
-#~ msgstr "Error en base de datos"
-
-#~ msgid ""
-#~ "Server Database failed\n"
-#~ "Please Try again Later"
-#~ msgstr ""
-#~ "Falló el servidor de la base de datos\n"
-#~ "Inténtelo más luego por favor"
-
-#~ msgid "Registration error"
-#~ msgstr "Error al registrar"
-
-#~ msgid "Some parameters are missing"
-#~ msgstr "Faltan algunos parámetros"
-
-#~ msgid "Password error"
-#~ msgstr "Error de contraseña"
-
-#~ msgid "Login error"
-#~ msgstr "Error de entrada"
-
-#~ msgid ""
-#~ "The email you provided is already in use\n"
-#~ "Please enter another one\n"
-#~ msgstr ""
-#~ "La dirección dada ya está en uso,\n"
-#~ "por favor indique otra\n"
-
-#~ msgid "The email you provided is invalid or forbidden"
-#~ msgstr "La dirección dada no es válida o está prohibida"
-
-#~ msgid ""
-#~ "Email address box is empty\n"
-#~ "Please provide one"
-#~ msgstr ""
-#~ "El campo de la dirección electrónica está vacío,\n"
-#~ "por favor indique una"
-
-#~ msgid "Restriction Error"
-#~ msgstr "Error de restricción"
-
-#~ msgid "Database access forbidden"
-#~ msgstr "Acceso a la base de datos prohibido"
-
-#~ msgid "Service error"
-#~ msgstr "Error del servicio"
-
-#~ msgid ""
-#~ "Mageia web services are currently unavailable\n"
-#~ "Please Try again Later"
-#~ msgstr ""
-#~ "Los servicios web de mandriva están inaccesibles de momento\n"
-#~ "Inténtelo más luego por favor"
-
-#~ msgid "Password mismatch"
-#~ msgstr "Las contraseñas no coinciden"
-
-#~ msgid ""
-#~ "Mageia web services are under maintenance\n"
-#~ "Please Try again Later"
-#~ msgstr ""
-#~ "Los servicios web de mandriva están en mantenimiento\n"
-#~ "Inténtelo más luego por favor"
-
-#~ msgid "User Forbidden"
-#~ msgstr "Nombre de usuario prohibido"
-
-#~ msgid "User account forbidden by Mageia web services"
-#~ msgstr "Cuenta de usuario prohibida por los servicios web de Mageia"
-
-#~ msgid "Connection error"
-#~ msgstr "Error de conexión"
-
-#~ msgid "Mageia web services not reachable"
-#~ msgstr "Los servicios web de mandriva están inaccesibles de momento"
-
-#~ msgid ""
-#~ " --bundle file.bundle\t- parse and install package from .bundle metainfo "
-#~ "file.\n"
-#~ msgstr ""
-#~ " --bundle archivo.bundle\t- interpretar e instalar paquetes a partir de "
-#~ "un archivo .bundle de metainformaciones.\n"
-
-#~ msgid ""
-#~ "You first need to install the system on your harddrive with the 'Live "
-#~ "Install' wizard."
-#~ msgstr ""
-#~ "Necesita primero instalar el sistema en su disco duro con el asistente "
-#~ "«Live Install» (instalación en vivo)."
-
-#~ msgid "Please wait"
-#~ msgstr "Espere, por favor"
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparando..."
-
-#~ msgid ""
-#~ "Failed to authenticate to the bundle server:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Falló la autentificación del conjunto de paquetes servidor:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The version of the Mageia Online client is too old.\n"
-#~ "\n"
-#~ "You need to update to a newer version. You can get a new one from http://"
-#~ "start.mandriva.com"
-#~ msgstr ""
-#~ "La versión del cliente Mageia Online es demasiado antigua.\n"
-#~ "\n"
-#~ "Necesita actualizar a una nueva versión. Puede obtenerla de http://start."
-#~ "mandriva.com"
-
-#~ msgid "This bundle is not well formated. Aborting."
-#~ msgstr "Este conjunto de paquetes no está bien formateado. Abortando."
-
-#~ msgid "Installing packages ...\n"
-#~ msgstr "Instalando paquetes...\n"
-
-#~ msgid "New bundles are available for your system"
-#~ msgstr "Hay nuevos conjuntos de paquetes disponibles para su sistema"
-
-#~ msgid "Service is not configured. Please click on \"Configure the service\""
-#~ msgstr ""
-#~ "El servicio no está configurado. Haga clic sobre \"Configurar el servicio"
-#~ "\""
-
-#~ msgid "Configure the service"
-#~ msgstr "Configurar el servicio"
-
-#~ msgid "Check updates"
-#~ msgstr "Verificar actualizaciones"
-
-#~ msgid "Configure Now!"
-#~ msgstr "¡Configurar ahora!"
-
-#~ msgid "Actions"
-#~ msgstr "Acciones"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "See logs"
-#~ msgstr "Ver registros"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Network Connection: "
-#~ msgstr "Conexión de red: "
-
-#~ msgid "Up"
-#~ msgstr "Activa"
-
-#~ msgid "Down"
-#~ msgstr "Inactiva"
-
-#~ msgid "Last check: "
-#~ msgstr "Última verificación: "
-
-#~ msgid "Machine name:"
-#~ msgstr "Nombre de máquina:"
-
-#~ msgid "Updates: "
-#~ msgstr "Actualizaciones: "
-
-#~ msgid "Development release not supported by service"
-#~ msgstr "Versión de desarrollo no soportada por el servicio"
-
-#~ msgid "Too old release not supported by service"
-#~ msgstr "Versión muy antigua no soportada por el servicio"
-
-#~ msgid "Unknown state"
-#~ msgstr "Estado desconocido"
-
-#~ msgid "Online services disabled. Contact Mageia Online site\n"
-#~ msgstr ""
-#~ "Servicios en línea deshabilitados. Contacte al sitio Mageia Online\n"
-
-#~ msgid "Wrong Password.\n"
-#~ msgstr "Contraseña incorrecta\n"
-
-#~ msgid "Wrong Action or host or login.\n"
-#~ msgstr "Acción, host o login incorrectos.\n"
-
-#~ msgid ""
-#~ "Something is wrong with your network settings (check your route, firewall "
-#~ "or proxy settings)\n"
-#~ msgstr ""
-#~ "Hay algún problema con la configuración de su red (verifique los ajustes "
-#~ "de su ruta, cortafuegos o proxy)\n"
-
-#~ msgid ""
-#~ "Problem occured while connecting to the server, please contact the "
-#~ "support team"
-#~ msgstr ""
-#~ "Un problema ocurrió durante la conexión con el servidor, por favor, "
-#~ "póngase en contacto con el equipo de apoyo"
-
-#~ msgid "Response from Mageia Online server\n"
-#~ msgstr "Respuesta desde el servidor de Mageia Online\n"
-
-#~ msgid "No check"
-#~ msgstr "Sin verificación"
-
-#~ msgid "Checking config file: Not present\n"
-#~ msgstr "Verificando archivo de configuración: No presente\n"
-
-#~ msgid "Logs"
-#~ msgstr "Registros"
-
-#~ msgid "Clear"
-#~ msgstr "Limpiar"
-
-#~ msgid " --box=\t\t\t- hostname.\n"
-#~ msgstr " --box=\t\t\t- nombre de la máquina.\n"
-
-#~ msgid " --country\t\t\t- name of country of the user. \n"
-#~ msgstr " --country\t\t\t- nombre del pays del usuario.\n"
-
-#~ msgid " --interactive\t\t- use the interactive mode.\n"
-#~ msgstr " --interactive\t\t- usar el modo interactivo.\n"
-
-#~ msgid " --nointeractive\t- use the non-interactive mode.\n"
-#~ msgstr " --nointeractive\t- usar el modo no interactivo.\n"
-
-#~ msgid " --login=\t\t - login name of the user.\n"
-#~ msgstr " --login=\t\t - nombre de login del usuario.\n"
-
-#~ msgid " --pass=\t\t\t- password of the user.\n"
-#~ msgstr " --pass=\t\t\t- contraseña del usuario.\n"
-
-#~ msgid "I already have an account"
-#~ msgstr "Ya tengo una cuenta"
-
-#~ msgid "I want to subscribe"
-#~ msgstr "Deseo suscribirme"
-
-#~ msgid "Mr."
-#~ msgstr "Sr"
-
-#~ msgid "Mrs."
-#~ msgstr "Sra"
-
-#~ msgid "Ms."
-#~ msgstr "Srta"
-
-#~ msgid ""
-#~ "This assistant will help you to upload your configuration\n"
-#~ "(packages, hardware configuration) to a centralized database in\n"
-#~ "order to keep you informed about security updates and useful upgrades.\n"
-#~ msgstr ""
-#~ "Este asistente le ayudará a subir su configuración\n"
-#~ "(paquetes, configuración del hardware) a una base de datos centralizada\n"
-#~ "para mantenerle informado de actualizaciones de seguridad y mejoras "
-#~ "útiles.\n"
-
-#~ msgid "Account creation or authentication"
-#~ msgstr "Creación de cuentas o autentificación"
-
-#~ msgid "Enter your Mageia Online login, password and machine name:"
-#~ msgstr ""
-#~ "Introduzca su nombre de usuario, contraseña y nombre de máquina de Mageia "
-#~ "Online:"
-
-#~ msgid "Email address:"
-#~ msgstr "Dirección de correo:"
-
-#~ msgid "Country"
-#~ msgstr "País"
-
-#~ msgid "Password:"
-#~ msgstr "Contraseña:"
-
-#~ msgid "(Ex: My Home Office's Computer)"
-#~ msgstr "(Ej: Ordenador de mi despacho)"
-
-#~ msgid "Machine name must be 1 to 40 alphanumerical characters"
-#~ msgstr ""
-#~ "El nombre de máquina puede sólo contener de 1 a 40 caracteres "
-#~ "alfanuméricos"
-
-#~ msgid "Connecting to Mageia Online website..."
-#~ msgstr "Conectando al sitio web Mageia Online..."
-
-#~ msgid ""
-#~ "In order to benefit from Mageia Online services,\n"
-#~ "we are about to upload your configuration.\n"
-#~ "\n"
-#~ "The Wizard will now send the following information to Mageia:\n"
-#~ "\n"
-#~ "1) the list of packages you have installed on your system,\n"
-#~ "\n"
-#~ "2) your hardware configuration.\n"
-#~ "\n"
-#~ "If you feel uncomfortable by that idea, or do not want to benefit from "
-#~ "this service,\n"
-#~ "please press 'Cancel'. By pressing 'Next', you allow us to keep you "
-#~ "informed\n"
-#~ "about security updates and useful upgrades via personalized email "
-#~ "alerts.\n"
-#~ "Furthermore, you benefit from discounted paid support services on\n"
-#~ "www.mandrivaexpert.com."
-#~ msgstr ""
-#~ "Parar beneficiarse de los servicios de Mageia Online,\n"
-#~ "vamos a transferir su configuración.\n"
-#~ "\n"
-#~ "El asistente enviará ahora la siguiente información a Mageia:\n"
-#~ "\n"
-#~ "1) los paquetes que tiene instalados en su sistema.\n"
-#~ "\n"
-#~ "2) la configuración de su hardware.\n"
-#~ "\n"
-#~ "Si no está cómodo con esta idea o no quiere beneficiarse de este\n"
-#~ "servicio, pulse 'Cancelar'. Si presiona 'Siguiente', nos permitirá\n"
-#~ "mantenerle informado sobre actualizaciones de seguridad y mejoras\n"
-#~ "útiles por medio de alertas de correo.\n"
-#~ "Además, se beneficia de descuentos en los servicios de soporte pagados\n"
-#~ "en www.mandrivaexpert.com."
-
-#~ msgid "Connection problem"
-#~ msgstr "Problema de conexión"
-
-#~ msgid "Problem occurs when uploading files, please try again"
-#~ msgstr ""
-#~ "Ocurrieron problemas al enviar archivos, por favor intentelo de nuevo"
-
-#~ msgid "Create a Mageia Online Account"
-#~ msgstr "Crear una cuenta en Mageia Online"
-
-#~ msgid "Greeting:"
-#~ msgstr "Tratamiento:"
-
-#~ msgid "First name:"
-#~ msgstr "Nombre:"
-
-#~ msgid "Last name:"
-#~ msgstr "Apellido:"
-
-#~ msgid "Confirm Password:"
-#~ msgstr "Confirmar contraseña:"
-
-#~ msgid ""
-#~ "The passwords do not match\n"
-#~ " Please try again\n"
-#~ msgstr ""
-#~ "Las contraseñas no coinciden\n"
-#~ " Por favor, intente de nuevo\n"
-
-#~ msgid "Please fill in each field"
-#~ msgstr "Por favor, rellene todos los campos"
-
-#~ msgid "Not a valid mail address!\n"
-#~ msgstr "¡No es una dirección de correo válida!\n"
-
-#~ msgid "Creating account failed!"
-#~ msgstr "¡Falló la cración de la cuenta!"
-
-#~ msgid ""
-#~ "Mageia Online Account successfully created.\n"
-#~ "Please click \"Next\" to authenticate and upload your configuration\n"
-#~ msgstr ""
-#~ "Cuenta de Mageia Online creada con éxito.\n"
-#~ "Por favor, pulse \"Siguiente\" para autentificarse y enviar su "
-#~ "configuración\n"
-
-#~ msgid "Your upload was successful!"
-#~ msgstr "Actualización exitosa"
-
-#~ msgid ""
-#~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mageia Online."
-#~ msgstr ""
-#~ "Desde ahora, recibirá anuncions de seguridad\n"
-#~ "y actualizaciones gracias a Mageia Online."
-
-#~ msgid ""
-#~ "Mageia Online offers you the ability to automate the updates.\n"
-#~ "A program will run regulary in your system waiting for new updates\n"
-#~ msgstr ""
-#~ "Mageia Online le ofrece la posibilidad de automatizar las "
-#~ "actualizaciones.\n"
-#~ "Se ejecutará regularmente un programa en su sistema a la espera de "
-#~ "nuevas actualizaciones\n"
-
-#~ msgid "Your Mageia Online account has been successfully configured\n"
-#~ msgstr "Su cuenta de Mageia Online se ha configurado con éxito\n"
-
-#~ msgid "Configuration uploaded successfully"
-#~ msgstr "Configuración enviada con éxito"
-
-#~ msgid "Problem uploading configuration"
-#~ msgstr "Problema enviando la configuración"
-
-#~ msgid ""
-#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
-#~ "firewall bad settings"
-#~ msgstr ""
-#~ "No se pudo conectar con el sitio web de mandrivaonline: nombre de usuario/"
-#~ "contraseña incorrectos o configuración errónea del router/firewall"
+msgstr "Se requiere autenticación para actualizar Mageia"
diff --git a/po/et.po b/po/et.po
index 73959ce3..dc286cbc 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,14 +2,14 @@
# Copyright (C) 2003 Free Software Foundation, Inc.
# Riho Kurg <rx@linux.ee>, 2002
# Marek Laane <bald@starman.ee>, 2003-2010
-# Marek Laane <bald@smail.ee>, 2011,2012
+# Marek Laane <bald@smail.ee>, 2011-2013
#
msgid ""
msgstr ""
"Project-Id-Version: mgaonline\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2012-10-19 20:32+0200\n"
+"PO-Revision-Date: 2013-12-06 14:23+0200\n"
"Last-Translator: Marek Laane <bald@smail.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
"Language: et\n"
@@ -477,30 +477,28 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Uuendamise seadistamine"
+msgstr "Mageia uuendamisapleti seadistamise käivitamine"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
-msgstr ""
+msgstr "Mageia uuendamisapleti seadistamiseks on vajalik autentimine"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Mageia uuendamisabilise käivitamine"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Mageia uuendamisabilise käivitamiseks on vajalik autentimine"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "MageiaUpdate'i käivitamine\n"
+msgstr "Mageia uuendaja käivitamine"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
+msgstr "Mageia uuendaja käivitamiseks on vajalik autentimine"
#~ msgid "System is up-to-date\n"
#~ msgstr "Midagi pole uuendada\n"
diff --git a/po/id.po b/po/id.po
index c108e5be..5c2276a8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,29 +1,29 @@
-# MdkOnline Bahasa Indonesia
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# Budi Rachmanto <rac@linux-mandrake.com>, 2002.
-# Willy Sudiarto Raharjo <willysr@gmail.com>, 2004 - 2007.
-# Erwien Samantha <erwiensamantha@gmail.com>, 2005.
-# Bayu Artanto <bayuart@yahoo.com>, 2005.
-# Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>, 2005.
-# Firdaus <dausnux@gmail.com>, 2005.
-# Sofian <sofianhanafi@yahoo.com>, 2005.
-# Kiki Syahadat <kiki.syahadat@yahoo.co.id>, 2012.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+#
+# Translators:
+# Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>, 2005
+# Bayu Artanto <bayuart@yahoo.com>, 2005
+# Budi Rachmanto <rac@linux-mandrake.com>, 2002
+# erwiensamantha <erwiensamantha@gmail.com>, 2005
+# Firdaus <dausnux@gmail.com>, 2005
+# kiki.syahadat <kiki.syahadat@yahoo.co.id>, 2012-2013
+# Sofian <sofianhanafi@yahoo.com>, 2005
msgid ""
msgstr ""
-"Project-Id-Version: mgaonline\n"
+"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2012-12-25 17:22+0700\n"
-"Last-Translator: Kiki Syahadat <kiki.syahadat@yahoo.co.id>\n"
-"Language-Team: Indonesia <mdk-id@yahoogroups.com>, Translation list <mageia-"
-"i18n@mageia.org>\n"
-"Language: id\n"
+"PO-Revision-Date: 2013-11-12 05:06+0000\n"
+"Last-Translator: kiki.syahadat <kiki.syahadat@yahoo.co.id>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-#. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
+#. -PO: here %s will be replaced by the local time (eg: "Will check updates at
+#. 14:03:50"
#: ../mgaapplet:79
#, c-format
msgid "Will check updates at %s"
@@ -39,9 +39,7 @@ msgstr "Sistem Anda up-to-date"
msgid ""
"Service configuration problem. Please check logs and send mail to "
"support@mageiaonline.com"
-msgstr ""
-"Masalah konfigurasi layanan. Silakan periksa log dan kirim surat ke "
-"support@mageiaonline.com"
+msgstr "Masalah konfigurasi layanan. Silakan periksa log dan kirim surat ke support@mageiaonline.com"
#: ../mgaapplet:98
#, c-format
@@ -82,9 +80,7 @@ msgstr "Rilis tidak didukung (terlalu lama, atau rilis pengembangan)"
#, c-format
msgid ""
"No medium found. You must add some media through 'Software Media Manager'."
-msgstr ""
-"Tidak ada media yang ditemukan. Anda harus menambahkan beberapa media "
-"melalui 'Manajer Media Software'."
+msgstr "Tidak ada media yang ditemukan. Anda harus menambahkan beberapa media melalui 'Manajer Media Software'."
#: ../mgaapplet:152
#, c-format
@@ -95,13 +91,7 @@ msgid ""
"column).\n"
"\n"
"Then, restart \"%s\"."
-msgstr ""
-"Anda memiliki setidaknya satu media update terkonfigurasi, tapi\n"
-"saat ini semua dimatikan. Anda harus menjalankan Manajer Media\n"
-"Software untuk menghidupkan setidaknya satu (centang pada kolom\n"
-"\"%s\").\n"
-"\n"
-"Lalu, restart \"%s\"."
+msgstr "Anda memiliki setidaknya satu media update terkonfigurasi, tapi\nsaat ini semua dimatikan. Anda harus menjalankan Manajer Media\nSoftware untuk menghidupkan setidaknya satu (centang pada kolom\n\"%s\").\n\nLalu, restart \"%s\"."
#: ../mgaapplet:157
#, c-format
@@ -213,9 +203,7 @@ msgstr "Batal"
msgid ""
"Maintenance for this Mageia version has ended. No more updates will be "
"delivered for this system."
-msgstr ""
-"Perawatan untuk versi Mageia ini sudah berakhir. Tidak ada lagi update yang "
-"akan disampaikan untuk sistem ini."
+msgstr "Perawatan untuk versi Mageia ini sudah berakhir. Tidak ada lagi update yang akan disampaikan untuk sistem ini."
#: ../mgaapplet:444
#, c-format
@@ -242,9 +230,7 @@ msgstr "Distribusi Anda tidak lagi didukung"
msgid ""
"This upgrade requires high bandwidth network connection (cable, xDSL, ...) "
"and may take several hours to complete."
-msgstr ""
-"Upgrade ini memerlukan koneksi jaringan bandwidth tinggi (kabel, xDSL, ...) "
-"dan mungkin akan memakan waktu berjam-jam untuk selesai."
+msgstr "Upgrade ini memerlukan koneksi jaringan bandwidth tinggi (kabel, xDSL, ...) dan mungkin akan memakan waktu berjam-jam untuk selesai."
#: ../mgaapplet:545
#, c-format
@@ -254,17 +240,14 @@ msgstr "Perkiraan download data adalah %s"
#: ../mgaapplet:546
#, c-format
msgid "You should close all other running applications before continuing."
-msgstr ""
-"Anda harus menutup semua aplikasi lain yang berjalan sebelum melanjutkan."
+msgstr "Anda harus menutup semua aplikasi lain yang berjalan sebelum melanjutkan."
#: ../mgaapplet:549
#, c-format
msgid ""
-"You should put your laptop on AC and favor ethernet connection over wifi, if "
-"available."
-msgstr ""
-"Anda harus meletakkan laptop Anda pada listrik AC dan koneksi ethernet "
-"melalui wifi, jika tersedia."
+"You should put your laptop on AC and favor ethernet connection over wifi, if"
+" available."
+msgstr "Anda harus meletakkan laptop Anda pada listrik AC dan koneksi ethernet melalui wifi, jika tersedia."
#: ../mgaapplet:583
#, c-format
@@ -301,19 +284,12 @@ msgstr "Mageia Online memberikan akses ke layanan web Mageia."
msgid "Online WebSite"
msgstr "Website Online"
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
+#. <jsmith@nowhere.com>")
#: ../mgaapplet:769
#, c-format
msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr ""
-"Budi Rachmanto <rac@linux-mandrake.com>\n"
-"Willy Sudiarto Raharjo <willysr@gmail.com>\n"
-"Erwien Samantha <erwiensamantha@gmail.com>\n"
-"Bayu Artanto <bayuart@yahoo.com>\n"
-"Ahmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>\n"
-"Firdaus <dausnux@gmail.com>\n"
-"Sofian <sofianhanafi@yahoo.com>\n"
-"Kiki Syahadat <kiki.syahadat@yahoo.co.id>\n"
+msgstr "Budi Rachmanto <rac@linux-mandrake.com>\nWilly Sudiarto Raharjo <willysr@gmail.com>\nErwien Samantha <erwiensamantha@gmail.com>\nBayu Artanto <bayuart@yahoo.com>\nAhmad Ramadhana <ahmad_ramadhana@yahoo.com.sg>\nFirdaus <dausnux@gmail.com>\nSofian <sofianhanafi@yahoo.com>\nKiki Syahadat <kiki.syahadat@yahoo.co.id>\n"
#: ../mgaapplet:797
#, c-format
@@ -440,17 +416,10 @@ msgstr "Upgrade Distribusi"
msgid ""
"mgaupdate version %s\n"
"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU GPL.\n"
"\n"
"usage:\n"
-msgstr ""
-"mgaupdate versi %s\n"
-"%s\n"
-"Ini adalah free software dan boleh didistribusikan ulang di bawah ketentuan "
-"GNU GPL.\n"
-"\n"
-"penggunaan:\n"
+msgstr "mgaupdate versi %s\n%s\nIni adalah free software dan boleh didistribusikan ulang di bawah ketentuan GNU GPL.\n\npenggunaan:\n"
#: ../mgaupdate:66
#, c-format
@@ -488,27 +457,25 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "Tidak bisa mengupdate paket dari media sumber_update.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Konfigurasi Update"
+msgstr "Jalankan Konfigurasi Applet Update Mageia"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
-msgstr ""
+msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Applet Update Mageia"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Jalankan Pembantu Upgrade Mageia"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Otentikasi diperlukan untuk menjalankan Pembantu Upgrade Mageia"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "Menjalankan MageiaUpdate\n"
+msgstr "Jalankan Update Mageia"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
+msgstr "Otentikasi diperlukan untuk menjalankan Update Mageia"
diff --git a/po/nl.po b/po/nl.po
index 15a39ce3..1203fdb8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,16 +6,17 @@
# Rob Teng <mandrake.tips@free.fr>, 2004, 2005.
# C. Verschuuren, 2008
# Remco Rijnders <remmy@mageia.org>, 2013
+# Marja van Waes <marja@mageia.org>, 2013
#
msgid ""
msgstr ""
"Project-Id-Version: mgaonline-nl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2013-03-07 18:36+0100\n"
-"Last-Translator: Remco Rijnders <remco@webconquest.com>\n"
+"PO-Revision-Date: 2013-12-01 16:46+0100\n"
+"Last-Translator: Marja van Waes <marja@mageia.org>\n"
"Language-Team: Nederlands\n"
-"Language: \n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -485,30 +486,29 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Stel Updates in"
+msgstr "Start de Mageia Update Applet-configuratie"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
msgstr ""
+"Authenticatie is nodig om de Mageia Update Applet-configuratie te starten"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Start de Mageia Upgrade Helper"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Authenticatei is nodig om de Mageia Upgrade Helper te starten"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "MageiaUpdate wordt gestart\n"
+msgstr "Start Mageia Updater"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
+msgstr "Authenticatie is nodig om Mageia Updater te starten"
#~ msgid "System is up-to-date\n"
#~ msgstr "Systeem is bijgewerkt\n"
diff --git a/po/pl.po b/po/pl.po
index c6b6cb1f..01ab04b6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,19 +10,20 @@
# Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>, 2008.
# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2008.
# Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>, 2009.
+# Daniel Napora <napcok@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: mgaonline\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2010-06-08 08:58+0100\n"
-"Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
-"Language-Team: <pl@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2013-12-21 13:15+0100\n"
+"Last-Translator: Daniel Napora <napcok@gmail.com>\n"
+"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
+"Language: pl\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.5\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
@@ -57,9 +58,9 @@ msgid "New updates are available for your system"
msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
#: ../mgaapplet:109
-#, fuzzy, c-format
+#, c-format
msgid "A new version of Mageia distribution has been released"
-msgstr "Udostępniono nową wersję dystrybucji Mageia Linux"
+msgstr "Udostępniono nową wersję dystrybucji Mageia"
#: ../mgaapplet:120
#, c-format
@@ -148,9 +149,9 @@ msgid "Launching drakconnect\n"
msgstr "Uruchamianie programu drakconnect\n"
#: ../mgaapplet:389 ../mgaapplet:465 ../mgaapplet:526
-#, fuzzy, c-format
+#, c-format
msgid "New version of Mageia distribution"
-msgstr "Nowa wersja dystrybucji Mageia Linux"
+msgstr "Nowa wersja dystrybucji Mageia"
#: ../mgaapplet:394
#, c-format
@@ -165,12 +166,12 @@ msgstr "Błąd"
#: ../mgaapplet:398
#, c-format
msgid "You must choose a directory owned by the super administrator!"
-msgstr ""
+msgstr "Musisz wybrać katalog, którego właścicielem jest root!"
#: ../mgaapplet:405
-#, fuzzy, c-format
+#, c-format
msgid "A new version of Mageia distribution has been released."
-msgstr "Udostępniono nową wersję dystrybucji Mageia Linux."
+msgstr "Udostępniono nową wersję dystrybucji Mageia."
#: ../mgaapplet:407 ../mgaapplet:477
#, c-format
@@ -213,12 +214,12 @@ msgid "Cancel"
msgstr "Anuluj"
#: ../mgaapplet:438
-#, fuzzy, c-format
+#, c-format
msgid ""
"Maintenance for this Mageia version has ended. No more updates will be "
"delivered for this system."
msgstr ""
-"Wsparcie dla tej wersji Mageia Linux wygasło. Aktualizacje dla tego systemu "
+"Wsparcie dla tej wersji Mageia wygasło. Aktualizacje dla tego systemu "
"nie będą dostarczane."
#: ../mgaapplet:444
@@ -485,13 +486,12 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Konfiguracja aktualizacji"
+msgstr "Konfiguracja appletu aktualizacji"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
-msgstr ""
+msgstr "Konfiguracja appletu aktualizacji - wymagane uwierzytelnianie"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
diff --git a/po/tr.po b/po/tr.po
index f0fa58fd..a7cb74bb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,26 +2,26 @@
# mgaonline paketi için Türkçe çeviriler.
# Copyright (C) 2008 Free Software Foundation, Inc.
# Translators:
-#
# Ömer Fadıl USTA <omer_fad@hotmail.com>, 2002, 2003, 2004.
# Tuncay YENİAY <tuncayyeniay@mynet.com>, 2002.
# S. Alp ŞENYER <ssenyer@linux-sevenler.org>, 2004.
# Taha Özket <taha.ozket@obss.net>, 2007.
# Atilla ÖNTAŞ <atilla_ontas@mandriva.com>, 2008-2013.
+# Atilla ÖNTAŞ <tarakbumba@gmail.com>, 2013.
msgid ""
msgstr ""
"Project-Id-Version: mgaonline\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2010-06-08 18:48+0200\n"
+"PO-Revision-Date: 2013-11-05 22:13+0300\n"
"Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
"Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
"Language: tr\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: Lokalize 0.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.7.1\n"
"X-Poedit-Language: Turkish\n"
"X-Poedit-Country: TURKEY\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -306,7 +306,8 @@ msgstr "Çevrimiçi Website"
#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
#: ../mgaapplet:769
#, c-format
-msgid "_: Translator(s) name(s) & email(s)\n"
+msgid ""
+"_: Translator(s) name(s) & email(s)\n"
msgstr "Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
#: ../mgaapplet:797
@@ -481,27 +482,27 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "Güncelleme Ayarları"
+msgstr "Mageia Güncelleme Uygulamacığı Yapılandırması Çalıştır"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
msgstr ""
+"Mageia Güncelleme Uygulamacığı Yapılandırması çalıştırmak için kimlik "
+"doğrulama gerekli"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Mageia Yükseltme Yardımcısı Çalıştır"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "Mageia Yükseltme Yardımcısını çalıştırmak için kimlik doğrulama gerekli"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "Mageia Güncelleme Başlatılıyor.\n"
+msgstr "Mageia Güncelleyici Çalıştır"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
+msgstr "Mageia Güncelleyiciyi çalıştırmak için kimlik doğrulama gerekli"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d1690558..84cb0c1b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,29 +1,28 @@
-# translation of Mandriva Online-zh_TW.po to Chinese Traditional
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Kenduest Lee <kenduest@cynix.com.tw>, 2001
-# Kenduest Lee <kenduest@cynix.com.tw>, 2002
-# Kenduest Lee <kenduest@i18n.linux.org.tw>, 2002
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+#
+# Translators:
# hilbert <freehil@yahoo.com>, 2003
-# Shiva Huang <blueshiva@giga.net.tw>, 2005.
-# Shiva Huang <shivahuang@gmail.com>, 2005, 2008.
-# You-Cheng Hsieh <yochenhsieh@xuite.net>, 2006-2007.
-#
+# Kenduest Lee <kenduest@cynix.com.tw>, 2001-2002
+# Kenduest Lee <kenduest@i18n.linux.org.tw>, 2002
+# Shiva Huang <blueshiva@giga.net.tw>, 2005
+# Shiva Huang <shivahuang@gmail.com>, 2005,2008
+# You-Cheng Hsieh <yochenhsieh@gmail.com>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: mgaonline-zh_TW\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2013-10-12 15:31+0100\n"
-"PO-Revision-Date: 2013-01-14 17:53+0800\n"
+"PO-Revision-Date: 2013-11-29 02:32+0000\n"
"Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
-"Language-Team: Chinese Traditional <zh@li.org>\n"
-"Language: \n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/mageia/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#. -PO: here %s will be replaced by the local time (eg: "Will check updates at 14:03:50"
+#. -PO: here %s will be replaced by the local time (eg: "Will check updates at
+#. 14:03:50"
#: ../mgaapplet:79
#, c-format
msgid "Will check updates at %s"
@@ -39,8 +38,7 @@ msgstr "您的系統處於最新的狀態"
msgid ""
"Service configuration problem. Please check logs and send mail to "
"support@mageiaonline.com"
-msgstr ""
-"服務設定發生問題,請檢查錯誤紀錄並寄封電子郵件至 support@mageiaonline.com"
+msgstr "服務設定發生問題,請檢查錯誤紀錄並寄封電子郵件至 support@mageiaonline.com"
#: ../mgaapplet:98
#, c-format
@@ -92,11 +90,7 @@ msgid ""
"column).\n"
"\n"
"Then, restart \"%s\"."
-msgstr ""
-"您已經設定好了至少一個更新媒體,但它們現在全部都是停用的。\n"
-"您應該執行軟體套件媒體管理員來啟用至少一個媒體 (選取 %s 欄位)。\n"
-"\n"
-"完成後,請重新啟動 %s。"
+msgstr "您已經設定好了至少一個更新媒體,但它們現在全部都是停用的。\n您應該執行軟體套件媒體管理員來啟用至少一個媒體 (選取 %s 欄位)。\n\n完成後,請重新啟動 %s。"
#: ../mgaapplet:157
#, c-format
@@ -235,8 +229,7 @@ msgstr "您的發行版已經不被支援了"
msgid ""
"This upgrade requires high bandwidth network connection (cable, xDSL, ...) "
"and may take several hours to complete."
-msgstr ""
-"這個更新需要寬頻網路聯結 (cable、xDSL、...) 而且可能需要數小時才能完成,"
+msgstr "這個更新需要寬頻網路聯結 (cable、xDSL、...) 而且可能需要數小時才能完成,"
#: ../mgaapplet:545
#, c-format
@@ -251,11 +244,9 @@ msgstr "您應該在繼續之前先關閉所有其他的應用程式。"
#: ../mgaapplet:549
#, c-format
msgid ""
-"You should put your laptop on AC and favor ethernet connection over wifi, if "
-"available."
-msgstr ""
-"您應該將您的筆記型電腦接上 AC 電源,如果可以的話,乙太網路也會優於無線網路連"
-"線。"
+"You should put your laptop on AC and favor ethernet connection over wifi, if"
+" available."
+msgstr "您應該將您的筆記型電腦接上 AC 電源,如果可以的話,乙太網路也會優於無線網路連線。"
#: ../mgaapplet:583
#, c-format
@@ -292,13 +283,12 @@ msgstr "Mageia Online 將引導您連結到 Mageia 網頁服務。"
msgid "Online WebSite"
msgstr "線上網站"
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
+#. <jsmith@nowhere.com>")
#: ../mgaapplet:769
#, c-format
msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr ""
-"Shiva Huang <shivahuang@gmail.com>\n"
-"You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
+msgstr "Shiva Huang <shivahuang@gmail.com>\nYou-Cheng Hsieh <yochenhsieh@gmail.com>\n"
#: ../mgaapplet:797
#, c-format
@@ -425,16 +415,10 @@ msgstr "升級發行版本"
msgid ""
"mgaupdate version %s\n"
"%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU GPL.\n"
"\n"
"usage:\n"
-msgstr ""
-"mgaupdate 版本號 %s\n"
-"%s\n"
-"這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
-"\n"
-"用法:\n"
+msgstr "mgaupdate 版本號 %s\n%s\n這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n\n用法:\n"
#: ../mgaupdate:66
#, c-format
@@ -472,162 +456,25 @@ msgid "Unable to update packages from update_source medium.\n"
msgstr "無法由 update_source 媒體更新套件。\n"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Update Applet Configuration"
-msgstr "更新組態設定"
+msgstr "執行 Mageia 更新小圖示設定"
#: ../polkit/org.mageia.mgaapplet-config.policy.in.h:2
msgid "Authentication is required to run Mageia Update Applet Configuration"
-msgstr ""
+msgstr "執行 Mageia 更新小圖示設定需要認證"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:1
msgid "Run Mageia Upgrade Helper"
-msgstr ""
+msgstr "執行 Mageia 升級協助工具"
#: ../polkit/org.mageia.mgaapplet-upgrade-helper.policy.in.h:2
msgid "Authentication is required to run Mageia Upgrade Helper"
-msgstr ""
+msgstr "執行 Mageia 升級協助工具需要認證"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:1
-#, fuzzy
msgid "Run Mageia Updater"
-msgstr "啟動 MageiaUpdate\n"
+msgstr "執行 Mageia 更新"
#: ../polkit/org.mageia.mgaupdate.policy.in.h:2
msgid "Authentication is required to run Mageia Updater"
-msgstr ""
-
-#~ msgid "System is up-to-date\n"
-#~ msgstr "系統已經在最新狀態了\n"
-
-#~ msgid ""
-#~ "Basic maintenance for this distribution has expired. Thanks to your "
-#~ "subscription to extended maintenance, your system will be kept up to date "
-#~ "until %s"
-#~ msgstr ""
-#~ "本發行版的基本維護已經結束。感謝您訂購了延伸維護,您的系統將持續更新至 %s"
-
-#~ msgid "You should get extended maintenance."
-#~ msgstr "您應該取得延伸維護。"
-
-#~ msgid ""
-#~ "You should either get extended maintenance or upgrade to a newer version "
-#~ "of the %s distribution."
-#~ msgstr "您應該取得延伸維護或升級到新的 %s 發行版版本。"
-
-#~ msgid "Extended Maintenance"
-#~ msgstr "延伸維護"
-
-#~ msgid ""
-#~ "Purchase a maintenance extension for this version (%s) and keep it "
-#~ "running until %s."
-#~ msgstr "購買這個版本 (%s) 的延伸維護並一直使用它直到 %s。"
-
-#~ msgid "Supported products are %s, '%s' is not on the list.\n"
-#~ msgstr "支援的產品為 %s,'%s' 並不在這個清單中。\n"
-
-#~ msgid "Please fill in your account ID to add an additional package medium"
-#~ msgstr "請輸入您的帳號 ID 以新增額外的套件媒介"
-
-#~ msgid "Failure while retrieving distributions list:"
-#~ msgstr "取得發行版本清單時失敗:"
-
-#~ msgid ""
-#~ "Mageia provides 12 months of desktop updates (until %s) and 18 months of "
-#~ "base updates (up to the %s) for distributions."
-#~ msgstr ""
-#~ "Mageia 提供發行版本 12 個月的桌面更新 (直到 %s) 與 18 個月的基礎更新 (直"
-#~ "到 %s)。"
-
-#~ msgid ""
-#~ "Extended maintenance is now available to get 18 months of additional "
-#~ "updates (until %s)."
-#~ msgstr "現在有延伸維護可以取得 18 個月的額外更新 (直到 %s)。"
-
-#~ msgid "You can subscribe <b>right now</b> to get extended maintenance:"
-#~ msgstr "您可以<b>立即</b>訂購以獲得延伸維護:"
-
-#~ msgid "Lifetime policy"
-#~ msgstr "生命週期政策"
-
-#~ msgid "Online subscription"
-#~ msgstr "線上訂購"
-
-#~ msgid "An error occurred"
-#~ msgstr "發生一個錯誤"
-
-#~ msgid "Your Mageia account does not have %s download subscription enabled."
-#~ msgstr "您的 Mageia 帳號並沒有下載 %s 的權限。"
-
-#~ msgid "An error occurred while adding medium"
-#~ msgstr "新增媒體來源時發生錯誤"
-
-#~ msgid "Successfully added media!"
-#~ msgstr "成功加入媒體來源!"
-
-#~ msgid "Successfully added media %s."
-#~ msgstr "成功加入媒體來源 %s。"
-
-#~ msgid "Ok"
-#~ msgstr "確定"
-
-#~ msgid "An additional package medium is available for your distribution."
-#~ msgstr "有可供您發行版使用之額外的套件媒介。"
-
-#~ msgid "Add additional package medium"
-#~ msgstr "新增額外的套件媒介"
-
-#~ msgid "New medium available"
-#~ msgstr "有可用的新媒介"
-
-#~ msgid ""
-#~ "You use '%s' distribution and therefore have privileged access to "
-#~ "additional software."
-#~ msgstr "您使用 '%s' 套件,因此可以取得額外的軟體。"
-
-#~ msgid "Do you want to install this additional software repository?"
-#~ msgstr "您要安裝此額外的套件庫嗎?"
-
-#~ msgid "Mageia Enterprise Server"
-#~ msgstr "Mageia Enterprise Server"
-
-#~ msgid "Check for missing \"%s\" media"
-#~ msgstr "檢查遺失的 \"%s\" 媒體"
-
-#~ msgid "Restricted"
-#~ msgstr "限制的"
-
-#~ msgid "Enterprise"
-#~ msgstr "企業"
-
-#~ msgid ""
-#~ "Mageia Powerpack brings you the best of Linux experience for desktop: "
-#~ "stability and efficiency of open source solutions together with exclusive "
-#~ "softwares and Mageia official support."
-#~ msgstr ""
-#~ "Mageia Powerpack 帶給您最好的 Linux 桌面體驗:開放原始碼的穩定、效率,以及"
-#~ "其他獨家軟體和 Mageia 的正式支援。"
-
-#, fuzzy
-#~ msgid "Mageia Features"
-#~ msgstr "Mageia Linux 特色"
-
-#~ msgid "Choose your upgrade version"
-#~ msgstr "選擇您的升級版本"
-
-#~ msgid "Your Powerpack access has ended"
-#~ msgstr "您的 Powerpack 存取已經截止"
-
-#~ msgid "%s is now available, you can upgrade to:"
-#~ msgstr "%s 已經推出,您可以升級到:"
-
-#~ msgid "Mageia PowerPack"
-#~ msgstr "Mageia PowerPack"
-
-#, fuzzy
-#~ msgid ""
-#~ "The Mageia distribution with even more softwares and official support."
-#~ msgstr "能提供您更多軟體與官方支援的 Mageia Linux 發行版本。"
-
-#~ msgid "Mageia Linux"
-#~ msgstr "Mageia Linux"
+msgstr "執行 Mageia 更新需要認證"
diff --git a/polkit/Makefile b/polkit/Makefile
index a8b5a51d..070f4211 100644
--- a/polkit/Makefile
+++ b/polkit/Makefile
@@ -13,7 +13,7 @@ clean:
rm -f $(WRAPPERS) $(POLICY)
%: org.mageia.%.policy.in
- @echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
+ @echo -e '#!/bin/sh\nif [[ "$$UID" != "0" ]] ; then\n exec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ "$$''@"\nelse\n exec $(LIBEXECDIR)/$@ "$$''@"\nfi\n' > $@
%.policy: %.policy.in
intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache