package Xconfig::xfree; # $Id$

use diagnostics;
use strict;

use common;
use Xconfig::parse;
use Xconfig::xfree3;
use Xconfig::xfree4;
use log;


sub read {
    my ($class, $o_xfree3_file, $o_xfree4_file) = @_;
    bless { xfree3 => eval { Xconfig::xfree3->read($o_xfree3_file) } || [], 
	    xfree4 => eval { Xconfig::xfree4->read($o_xfree4_file) } || [] }, $class;
}
sub write {
    my ($both, $o_xfree3_file, $o_xfree4_file) = @_;
    $both->{xfree3} ? $both->{xfree3}->write($o_xfree3_file) : unlink($o_xfree3_file);
    $both->{xfree4} ? $both->{xfree4}->write($o_xfree4_file) : unlink($o_xfree4_file);
}
sub prepare_write {
    my ($both) = @_;
    ($both->{xfree4} || $both->{xfree3})->prepare_write;
}

sub empty_config {
    my ($class) = @_;
    bless { xfree3 => Xconfig::xfree3->empty_config, 
	    xfree4 => Xconfig::xfree4->empty_config }, $class;
}

sub get_keyboard { get_both('get_keyboard', @_) }
sub set_keyboard { set_both('set_keyboard', @_) }
sub get_mice     { get_both('get_mice', @_) }
sub set_mice     { set_both('set_mice', @_) }

sub get_resolution { get_both('get_resolution', @_) }
sub set_resolution { set_both('set_resolution', @_) }

sub get_device   { get_both('get_device', @_) }
sub get_devices  { get_both('get_devices', @_) }
sub set_devices  { set_both('set_devices', @_) }

sub set_wacoms { set_both('set_wacoms', @_) }

sub get_monitor  { get_both('get_monitor', @_) }
sub get_monitors { get_both('get_monitors', @_) }
sub set_monitors { set_both('set_monitors', @_) }

sub is_fbdev { get_both('is_fbdev', @_) }

#-##############################################################################
#- helpers
#-##############################################################################
sub get_both {
    my ($getter, $both) = @_;

    if (is_empty_array_ref($both->{xfree3})) {
	$both->{xfree4}->$getter;
    } elsif (is_empty_array_ref($both->{xfree4})) {
	$both->{xfree3}->$getter;
    } else {
	my @l3 = $both->{xfree3}->$getter;
	my @l4 = $both->{xfree4}->$getter;
	merge_values(\@l3, \@l4);
    }
}
sub set_both {
    my ($setter, $both, @l) = @_;

    $both->{xfree3}->$setter(@l) if !is_empty_array_ref($both->{xfree3});
    $both->{xfree4}->$setter(@l) if !is_empty_array_ref($both->{xfree4});
}

sub merge_values {
    my ($l3, $l4) = @_;

    sub merge_values__hashes {
	my ($h3, $h4) = @_;
	$h3 || $h4 or return;
	$h3 or return $h4;
	$h4 or return $h3;

	my %h = %$h4;
	foreach (keys %$h3) {
	    if (exists $h{$_}) {
		if (ref($h{$_}) eq 'HASH' && ref($h3->{$_}) eq 'HASH') {
		    #- needed for "Options" of Devices
		    $h{$_} = +{ %{$h3->{$_}}, %{$h{$_}} };
		} else {
		    my $s4  = join(", ", deref_array($h{$_}));
		    my $s3  = join(", ", deref_array($h3->{$_}));
		    my $s3_ = join(", ", map { qq("$_") } deref_array($h3->{$_}));
		    if ($s4 eq $s3_) {
			#- keeping the non-double-quoted value
			$h{$_} = $h3->{$_};
		    } else {
			$s4 eq $s3 or log::l(qq(XFree: conflicting value for $_, "$s4" and "$s3" are different));
		    }
		}
	    } else {
		$h{$_} = $h3->{$_};
	    }
	}
	\%h;
    }

    my @r = mapn_(\&merge_values__hashes, $l3, $l4);

    @r == 1 ? $r[0] : @r;
}

1;
 value='topic/switching_to_urpmi'>topic/switching_to_urpmi</option>
<option value='topic/unlabeled-1.1.1'>topic/unlabeled-1.1.1</option>
<option value='topic/v_webmin_0_87'>topic/v_webmin_0_87</option>
<option value='topic/x86_64-branch'>topic/x86_64-branch</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mageia Installer and base platform for many utilities</td><td class='sub right'>Thierry Vignaud [tv]</td></tr></table>
<table class='tabs'><tr><td>
<a href='/software/drakx-backup-do-not-use/'>summary</a><a href='/software/drakx-backup-do-not-use/refs/?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>refs</a><a href='/software/drakx-backup-do-not-use/log/perl-install/share/po/pt.po'>log</a><a href='/software/drakx-backup-do-not-use/tree/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>tree</a><a class='active' href='/software/drakx-backup-do-not-use/commit/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>commit</a><a href='/software/drakx-backup-do-not-use/diff/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>diff</a><a href='/software/drakx-backup-do-not-use/stats/perl-install/share/po/pt.po'>stats</a></td><td class='form'><form class='right' method='get' action='/software/drakx-backup-do-not-use/log/perl-install/share/po/pt.po'>
<input type='hidden' name='id' value='b8814bf1900523f84c79c4463bee2f73f2d37476'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/software/drakx-backup-do-not-use/commit/?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>root</a>/<a href='/software/drakx-backup-do-not-use/commit/perl-install?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>perl-install</a>/<a href='/software/drakx-backup-do-not-use/commit/perl-install/share?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>share</a>/<a href='/software/drakx-backup-do-not-use/commit/perl-install/share/po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>po</a>/<a href='/software/drakx-backup-do-not-use/commit/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>pt.po</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='b8814bf1900523f84c79c4463bee2f73f2d37476'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2005-05-31 06:00:21 +0000</td></tr>
<tr><th>committer</th><td>Pablo Saratxaga &lt;pablo@mandriva.com&gt;</td><td class='right'>2005-05-31 06:00:21 +0000</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>b8814bf1900523f84c79c4463bee2f73f2d37476</a> (<a href='/software/drakx-backup-do-not-use/patch/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/tree/?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>3bfeeac9c4b644244550b227ae1b19d8b5c36647</a> /<a href='/software/drakx-backup-do-not-use/tree/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>perl-install/share/po/pt.po</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/commit/perl-install/share/po/pt.po?id=181c673fd4c642bbecce865707228d73098ccea9'>181c673fd4c642bbecce865707228d73098ccea9</a> (<a href='/software/drakx-backup-do-not-use/diff/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476&amp;id2=181c673fd4c642bbecce865707228d73098ccea9'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar'>drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.gz'>drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.gz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.bz2'>drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.bz2</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.xz'>drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.tar.xz</a><br/><a href='/software/drakx-backup-do-not-use/snapshot/drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.zip'>drakx-backup-do-not-use-b8814bf1900523f84c79c4463bee2f73f2d37476.zip</a><br/></td></tr></table>
<div class='commit-subject'>updated pot file</div><div class='commit-msg'></div><div class='diffstat-header'><a href='/software/drakx-backup-do-not-use/diff/?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>Diffstat</a> (limited to 'perl-install/share/po/pt.po')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/software/drakx-backup-do-not-use/diff/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>perl-install/share/po/pt.po</a></td><td class='right'>2032</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 54.0%;'/><td class='rem' style='width: 46.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 1098 insertions, 934 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/perl-install/share/po/pt.po b/perl-install/share/po/pt.po<br/>index 9ef168197..9b8b3706d 100644<br/>--- a/<a href='/software/drakx-backup-do-not-use/tree/perl-install/share/po/pt.po?id=181c673fd4c642bbecce865707228d73098ccea9'>perl-install/share/po/pt.po</a><br/>+++ b/<a href='/software/drakx-backup-do-not-use/tree/perl-install/share/po/pt.po?id=b8814bf1900523f84c79c4463bee2f73f2d37476'>perl-install/share/po/pt.po</a></div><div class='hunk'>@@ -22,7 +22,7 @@ msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Project-Id-Version: drakX-pt\n"</div><div class='ctx'> "Report-Msgid-Bugs-To: \n"</div><div class='del'>-"POT-Creation-Date: 2005-05-22 20:07+0200\n"</div><div class='add'>+"POT-Creation-Date: 2005-05-31 13:03+0200\n"</div><div class='ctx'> "PO-Revision-Date: 2005-05-24 22:08+0100\n"</div><div class='ctx'> "Last-Translator: José Melo &lt;mmodem00@netvisao.pt&gt;\n"</div><div class='ctx'> "Language-Team: Português &lt;pt@li.org&gt;\n"</div><div class='hunk'>@@ -94,7 +94,7 @@ msgstr ""</div><div class='ctx'> "Clique no botão para reiniciar o computador, remova-a, retire a protecção\n"</div><div class='ctx'> "de escrita, volte-a a ligar, e execute o Mandriva Move novamente."</div><div class='ctx'> </div><div class='del'>-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1320</div><div class='add'>+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1325</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Reboot"</div><div class='ctx'> msgstr "Reiniciar"</div><div class='hunk'>@@ -193,17 +193,20 @@ msgstr "Por favor aguarde, a detectar e a configurar dispositivos..."</div><div class='ctx'> #: diskdrake/interactive.pm:240 diskdrake/interactive.pm:401</div><div class='ctx'> #: diskdrake/interactive.pm:419 diskdrake/interactive.pm:556</div><div class='ctx'> #: diskdrake/interactive.pm:561 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:182</div><div class='del'>-#: install_any.pm:1698 install_any.pm:1721 install_steps.pm:82</div><div class='add'>+#: install_any.pm:1658 install_any.pm:1681 install_steps.pm:82</div><div class='ctx'> #: install_steps_interactive.pm:38 interactive/http.pm:117</div><div class='ctx'> #: interactive/http.pm:118 network/ndiswrapper.pm:27 network/ndiswrapper.pm:41</div><div class='ctx'> #: network/ndiswrapper.pm:89 network/ndiswrapper.pm:101</div><div class='del'>-#: network/netconnect.pm:1013 network/netconnect.pm:1121</div><div class='del'>-#: network/netconnect.pm:1125 network/netconnect.pm:1129</div><div class='del'>-#: network/netconnect.pm:1134 network/netconnect.pm:1266</div><div class='del'>-#: network/netconnect.pm:1270 network/netconnect.pm:1274</div><div class='del'>-#: network/netconnect.pm:1278 network/netconnect.pm:1386</div><div class='del'>-#: network/netconnect.pm:1391 network/netconnect.pm:1411</div><div class='del'>-#: network/netconnect.pm:1622 printer/printerdrake.pm:244</div><div class='add'>+#: network/netconnect.pm:915 network/netconnect.pm:1021</div><div class='add'>+#: network/netconnect.pm:1025 network/netconnect.pm:1029</div><div class='add'>+#: network/netconnect.pm:1034 network/netconnect.pm:1166</div><div class='add'>+#: network/netconnect.pm:1170 network/netconnect.pm:1174</div><div class='add'>+#: network/netconnect.pm:1178 network/netconnect.pm:1287</div><div class='add'>+#: network/netconnect.pm:1292 network/netconnect.pm:1312</div><div class='add'>+#: network/netconnect.pm:1523 network/thirdparty.pm:265</div><div class='add'>+#: network/thirdparty.pm:272 network/thirdparty.pm:308</div><div class='add'>+#: network/thirdparty.pm:310 network/thirdparty.pm:331</div><div class='add'>+#: network/thirdparty.pm:355 printer/printerdrake.pm:244</div><div class='ctx'> #: printer/printerdrake.pm:251 printer/printerdrake.pm:276</div><div class='ctx'> #: printer/printerdrake.pm:422 printer/printerdrake.pm:427</div><div class='ctx'> #: printer/printerdrake.pm:440 printer/printerdrake.pm:450</div><div class='hunk'>@@ -242,14 +245,15 @@ msgstr "Por favor aguarde, a detectar e a configurar dispositivos..."</div><div class='ctx'> #: standalone/drakconnect:692 standalone/drakconnect:707</div><div class='ctx'> #: standalone/drakfloppy:297 standalone/drakfloppy:300</div><div class='ctx'> #: standalone/drakfloppy:306 standalone/drakfont:210 standalone/drakfont:223</div><div class='del'>-#: standalone/drakfont:261 standalone/drakroam:41 standalone/draksplash:26</div><div class='add'>+#: standalone/drakfont:261 standalone/drakgw:51 standalone/drakgw:191</div><div class='add'>+#: standalone/drakgw:220 standalone/drakgw:261 standalone/drakgw:295</div><div class='add'>+#: standalone/drakgw:400 standalone/drakroam:41 standalone/draksplash:15</div><div class='ctx'> #: standalone/drakxtv:107 standalone/finish-install:39 standalone/logdrake:169</div><div class='ctx'> #: standalone/logdrake:438 standalone/logdrake:443 standalone/scannerdrake:59</div><div class='ctx'> #: standalone/scannerdrake:202 standalone/scannerdrake:261</div><div class='ctx'> #: standalone/scannerdrake:715 standalone/scannerdrake:726</div><div class='ctx'> #: standalone/scannerdrake:865 standalone/scannerdrake:876</div><div class='ctx'> #: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121</div><div class='del'>-#: wizards2.pm:95 wizards2.pm:99 wizards2.pm:121</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Error"</div><div class='ctx'> msgstr "Erro"</div><div class='hunk'>@@ -466,7 +470,8 @@ msgstr "Xorg %s com aceleração hardware 3D"</div><div class='ctx'> #: Xconfig/card.pm:411</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Your card can have 3D hardware acceleration support with Xorg %s."</div><div class='del'>-msgstr "A sua placa pode ter suporte para aceleração hardware 3D com o Xorg %s."</div><div class='add'>+msgstr ""</div><div class='add'>+"A sua placa pode ter suporte para aceleração hardware 3D com o Xorg %s."</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/card.pm:417</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -482,15 +487,16 @@ msgstr ""</div><div class='ctx'> "A sua placa pode ter suporte para aceleração hardware 3D com o Xorg%s,\n"</div><div class='ctx'> "ATENÇÃO ESTE SUPORTE É EXPERIMENTAL E PODE BLOQUEAR O COMPUTADOR."</div><div class='ctx'> </div><div class='del'>-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:921</div><div class='add'>+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:926</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Custom"</div><div class='ctx'> msgstr "Personalizado"</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14</div><div class='del'>-#: install_steps_interactive.pm:86 printer/printerdrake.pm:744</div><div class='del'>-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4857</div><div class='del'>-#: standalone/draksplash:83 standalone/logdrake:174 standalone/net_applet:229</div><div class='add'>+#: install_steps_interactive.pm:86 install_steps_interactive.pm:1325</div><div class='add'>+#: printer/printerdrake.pm:744 printer/printerdrake.pm:4405</div><div class='add'>+#: printer/printerdrake.pm:4857 standalone/draksplash:85</div><div class='add'>+#: standalone/logdrake:174 standalone/net_applet:230</div><div class='ctx'> #: standalone/scannerdrake:477</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Quit"</div><div class='hunk'>@@ -632,7 +638,7 @@ msgid "Resolutions"</div><div class='ctx'> msgstr "Resoluções"</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/resolution_and_depth.pm:310 diskdrake/hd_gtk.pm:339</div><div class='del'>-#: install_steps_gtk.pm:283 mouse.pm:168 services.pm:162</div><div class='add'>+#: install_steps_gtk.pm:284 mouse.pm:168 services.pm:162</div><div class='ctx'> #: standalone/drakbackup:1581 standalone/drakperm:251</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Other"</div><div class='hunk'>@@ -649,7 +655,7 @@ msgid "Graphics card: %s"</div><div class='ctx'> msgstr "Placa Gráfica: %s"</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/resolution_and_depth.pm:374 interactive.pm:433</div><div class='del'>-#: interactive/gtk.pm:767 interactive/http.pm:103 interactive/http.pm:156</div><div class='add'>+#: interactive/gtk.pm:808 interactive/http.pm:103 interactive/http.pm:156</div><div class='ctx'> #: interactive/newt.pm:321 interactive/newt.pm:424 interactive/stdio.pm:39</div><div class='ctx'> #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172</div><div class='ctx'> #: standalone/drakTermServ:200 standalone/drakTermServ:518</div><div class='hunk'>@@ -658,15 +664,15 @@ msgstr "Placa Gráfica: %s"</div><div class='ctx'> #: standalone/drakconnect:166 standalone/drakconnect:885</div><div class='ctx'> #: standalone/drakconnect:972 standalone/drakconnect:1071</div><div class='ctx'> #: standalone/drakfont:574 standalone/drakfont:586 standalone/drakroam:392</div><div class='del'>-#: standalone/draksplash:145 standalone/drakups:212 standalone/net_monitor:345</div><div class='add'>+#: standalone/draksplash:160 standalone/drakups:212 standalone/net_monitor:345</div><div class='ctx'> #: ugtk2.pm:409 ugtk2.pm:506 ugtk2.pm:908 ugtk2.pm:931</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Ok"</div><div class='ctx'> msgstr "Ok"</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/resolution_and_depth.pm:374 diskdrake/smbnfs_gtk.pm:81 help.pm:89</div><div class='del'>-#: help.pm:444 install_steps_gtk.pm:479 install_steps_interactive.pm:422</div><div class='del'>-#: install_steps_interactive.pm:827 interactive.pm:434 interactive/gtk.pm:771</div><div class='add'>+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422</div><div class='add'>+#: install_steps_interactive.pm:831 interactive.pm:434 interactive/gtk.pm:812</div><div class='ctx'> #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:318</div><div class='ctx'> #: interactive/newt.pm:428 interactive/stdio.pm:39 interactive/stdio.pm:142</div><div class='ctx'> #: interactive/stdio.pm:176 printer/printerdrake.pm:3676</div><div class='hunk'>@@ -675,7 +681,7 @@ msgstr "Ok"</div><div class='ctx'> #: standalone/drakbackup:3947 standalone/drakconnect:165</div><div class='ctx'> #: standalone/drakconnect:970 standalone/drakconnect:1070</div><div class='ctx'> #: standalone/drakfont:586 standalone/drakfont:664 standalone/drakfont:741</div><div class='del'>-#: standalone/draksplash:145 standalone/drakups:219 standalone/logdrake:174</div><div class='add'>+#: standalone/draksplash:160 standalone/drakups:219 standalone/logdrake:174</div><div class='ctx'> #: standalone/net_monitor:344 ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513</div><div class='ctx'> #: ugtk2.pm:908</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -683,8 +689,8 @@ msgid "Cancel"</div><div class='ctx'> msgstr "Cancelar"</div><div class='ctx'> </div><div class='ctx'> #: Xconfig/resolution_and_depth.pm:374 diskdrake/hd_gtk.pm:153</div><div class='del'>-#: install_steps_gtk.pm:227 install_steps_gtk.pm:628 interactive.pm:528</div><div class='del'>-#: interactive/gtk.pm:637 interactive/gtk.pm:639 standalone/drakTermServ:285</div><div class='add'>+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:528</div><div class='add'>+#: interactive/gtk.pm:678 interactive/gtk.pm:680 standalone/drakTermServ:285</div><div class='ctx'> #: standalone/drakbackup:3881 standalone/drakbug:104</div><div class='ctx'> #: standalone/drakconnect:161 standalone/drakconnect:246</div><div class='ctx'> #: standalone/drakfont:509 standalone/drakperm:134 standalone/draksec:336</div><div class='hunk'>@@ -836,10 +842,10 @@ msgstr ""</div><div class='ctx'> "_:proporção de aspecto estranho\n"</div><div class='ctx'> "outro"</div><div class='ctx'> </div><div class='del'>-#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:481</div><div class='add'>+#: any.pm:143 harddrake/sound.pm:191 interactive.pm:471 pkgs.pm:468</div><div class='ctx'> #: standalone/drakconnect:168 standalone/drakconnect:646 standalone/draksec:68</div><div class='ctx'> #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:244</div><div class='del'>-#: standalone/service_harddrake:203</div><div class='add'>+#: standalone/service_harddrake:206</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Please wait"</div><div class='ctx'> msgstr "Por favor aguarde"</div><div class='hunk'>@@ -869,7 +875,8 @@ msgstr ""</div><div class='ctx'> #: any.pm:165</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Installation of bootloader failed. The following error occurred:"</div><div class='del'>-msgstr "Instalação do carregador de arranque falhada. Ocorreram os seguintes erros:"</div><div class='add'>+msgstr ""</div><div class='add'>+"Instalação do carregador de arranque falhada. Ocorreram os seguintes erros:"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:171</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -951,7 +958,8 @@ msgstr "Indicar o tamanho da RAM em MB"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:276</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Option ``Restrict command line options'' is of no use without a password"</div><div class='add'>+msgid ""</div><div class='add'>+"Option ``Restrict command line options'' is of no use without a password"</div><div class='ctx'> msgstr "Opção ``Restringir opções da linha de comando'' não tem uso sem senha"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:277 any.pm:610 authentication.pm:182</div><div class='hunk'>@@ -995,7 +1003,7 @@ msgid "Force No Local APIC"</div><div class='ctx'> msgstr "Forçar Sem APIC Local"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:293 any.pm:637 authentication.pm:187 diskdrake/smbnfs_gtk.pm:180</div><div class='del'>-#: network/netconnect.pm:688 printer/printerdrake.pm:1663</div><div class='add'>+#: network/netconnect.pm:659 printer/printerdrake.pm:1663</div><div class='ctx'> #: printer/printerdrake.pm:1784 standalone/drakbackup:1625</div><div class='ctx'> #: standalone/drakbackup:3488 standalone/drakups:299</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -1209,8 +1217,10 @@ msgstr "Por favor indique um nome de utilizador"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:613</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"</div><div class='del'>-msgstr "O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"</div><div class='add'>+msgid ""</div><div class='add'>+"The user name must contain only lower cased letters, numbers, `-' and `_'"</div><div class='add'>+msgstr ""</div><div class='add'>+"O nome de utilizador deve conter apenas letras minúsculas, números, `-' e `_'"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:614</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -1279,27 +1289,26 @@ msgstr "Autologin"</div><div class='ctx'> #: any.pm:689</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "I can set up your computer to automatically log on one user."</div><div class='del'>-msgstr "Posso configurar o computador para ligar automaticamente um utilizador."</div><div class='add'>+msgstr ""</div><div class='add'>+"Posso configurar o computador para ligar automaticamente um utilizador."</div><div class='ctx'> </div><div class='ctx'> #: any.pm:690 help.pm:51</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Do you want to use this feature?"</div><div class='ctx'> msgstr "Deseja usar esta opção?"</div><div class='ctx'> </div><div class='del'>-#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:887</div><div class='add'>+#: any.pm:690 help.pm:180 help.pm:285 help.pm:444 install_any.pm:861</div><div class='ctx'> #: interactive.pm:158 modules/interactive.pm:71 printer/printerdrake.pm:743</div><div class='del'>-#: standalone/drakbackup:2501 standalone/drakgw:287 standalone/drakgw:288</div><div class='del'>-#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55</div><div class='del'>-#: standalone/harddrake2:306 standalone/net_applet:309 ugtk2.pm:907</div><div class='del'>-#: wizards.pm:156 wizards2.pm:158</div><div class='add'>+#: standalone/drakbackup:2501 standalone/draksec:55 standalone/harddrake2:306</div><div class='add'>+#: standalone/net_applet:310 ugtk2.pm:907 wizards.pm:156</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Yes"</div><div class='ctx'> msgstr "Sim"</div><div class='ctx'> </div><div class='ctx'> #: any.pm:690 help.pm:180 help.pm:285 help.pm:313 help.pm:444</div><div class='del'>-#: install_any.pm:887 interactive.pm:158 modules/interactive.pm:71</div><div class='add'>+#: install_any.pm:861 interactive.pm:158 modules/interactive.pm:71</div><div class='ctx'> #: standalone/drakbackup:2501 standalone/draksec:54 standalone/harddrake2:307</div><div class='del'>-#: standalone/net_applet:305 ugtk2.pm:907 wizards.pm:156 wizards2.pm:158</div><div class='add'>+#: standalone/net_applet:306 ugtk2.pm:907 wizards.pm:156</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "No"</div><div class='ctx'> msgstr "Não"</div><div class='hunk'>@@ -1345,56 +1354,56 @@ msgstr "Usar Unicode por omissão"</div><div class='ctx'> msgid "All languages"</div><div class='ctx'> msgstr "Todas as línguas"</div><div class='ctx'> </div><div class='del'>-#: any.pm:794 help.pm:566 help.pm:855 install_steps_interactive.pm:947</div><div class='add'>+#: any.pm:798 help.pm:566 help.pm:855 install_steps_interactive.pm:952</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Country / Region"</div><div class='ctx'> msgstr "País / Região"</div><div class='ctx'> </div><div class='del'>-#: any.pm:795</div><div class='add'>+#: any.pm:799</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Please choose your country."</div><div class='ctx'> msgstr "Por favor escolha o seu país."</div><div class='ctx'> </div><div class='del'>-#: any.pm:797</div><div class='add'>+#: any.pm:801</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Here is the full list of available countries"</div><div class='ctx'> msgstr "Aqui está a lista completa dos países disponíveis"</div><div class='ctx'> </div><div class='del'>-#: any.pm:798</div><div class='add'>+#: any.pm:802</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Other Countries"</div><div class='ctx'> msgstr "Outros Países"</div><div class='ctx'> </div><div class='del'>-#: any.pm:798 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722</div><div class='add'>+#: any.pm:802 help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722</div><div class='ctx'> #: interactive.pm:394</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Advanced"</div><div class='ctx'> msgstr "Avançado"</div><div class='ctx'> </div><div class='del'>-#: any.pm:806</div><div class='add'>+#: any.pm:810</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Input method:"</div><div class='ctx'> msgstr "Método de entrada:"</div><div class='ctx'> </div><div class='del'>-#: any.pm:807 install_any.pm:422 network/netconnect.pm:186</div><div class='del'>-#: network/netconnect.pm:380 network/netconnect.pm:385</div><div class='del'>-#: network/netconnect.pm:1377 printer/printerdrake.pm:105</div><div class='add'>+#: any.pm:811 install_any.pm:406 network/netconnect.pm:187</div><div class='add'>+#: network/netconnect.pm:381 network/netconnect.pm:386</div><div class='add'>+#: network/netconnect.pm:1278 printer/printerdrake.pm:105</div><div class='ctx'> #: printer/printerdrake.pm:2199</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "None"</div><div class='ctx'> msgstr "Nenhum"</div><div class='ctx'> </div><div class='del'>-#: any.pm:921</div><div class='add'>+#: any.pm:926</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "No sharing"</div><div class='ctx'> msgstr "Não partilhar"</div><div class='ctx'> </div><div class='del'>-#: any.pm:921</div><div class='add'>+#: any.pm:926</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Allow all users"</div><div class='ctx'> msgstr "Permitir todos os utilizadores"</div><div class='ctx'> </div><div class='del'>-#: any.pm:925</div><div class='add'>+#: any.pm:930</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Would you like to allow users to share some of their directories?\n"</div><div class='hunk'>@@ -1409,7 +1418,7 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "\"Personalizado\" permite escolher a cada utilizador.\n"</div><div class='ctx'> </div><div class='del'>-#: any.pm:937</div><div class='add'>+#: any.pm:942</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "NFS: the traditional Unix file sharing system, with less support on Mac and "</div><div class='hunk'>@@ -1418,7 +1427,7 @@ msgstr ""</div><div class='ctx'> "NFS: o sistema de partilha de ficheiros tradicional do Unix, com menos "</div><div class='ctx'> "suporte em Mac e Windows."</div><div class='ctx'> </div><div class='del'>-#: any.pm:940</div><div class='add'>+#: any.pm:945</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "</div><div class='hunk'>@@ -1427,17 +1436,18 @@ msgstr ""</div><div class='ctx'> "SMB: um sistema de partilha de ficheiros usado pelo Windows, Mac OS X e "</div><div class='ctx'> "muitos sistemas Linux modernos."</div><div class='ctx'> </div><div class='del'>-#: any.pm:948</div><div class='add'>+#: any.pm:953</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "You can export using NFS or SMB. Please select which you would like to use."</div><div class='add'>+msgid ""</div><div class='add'>+"You can export using NFS or SMB. Please select which you would like to use."</div><div class='ctx'> msgstr "Pode exportar com NFS ou SMB. Por favor escolha qual deseja usar."</div><div class='ctx'> </div><div class='del'>-#: any.pm:973</div><div class='add'>+#: any.pm:978</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Launch userdrake"</div><div class='ctx'> msgstr "Executar userdrake"</div><div class='ctx'> </div><div class='del'>-#: any.pm:973 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903</div><div class='add'>+#: any.pm:978 printer/printerdrake.pm:3900 printer/printerdrake.pm:3903</div><div class='ctx'> #: printer/printerdrake.pm:3904 printer/printerdrake.pm:3905</div><div class='ctx'> #: printer/printerdrake.pm:5166 standalone/drakTermServ:295</div><div class='ctx'> #: standalone/drakbackup:4081 standalone/drakbug:126 standalone/drakfont:497</div><div class='hunk'>@@ -1447,7 +1457,7 @@ msgstr "Executar userdrake"</div><div class='ctx'> msgid "Close"</div><div class='ctx'> msgstr "Fechar"</div><div class='ctx'> </div><div class='del'>-#: any.pm:975</div><div class='add'>+#: any.pm:980</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "The per-user sharing uses the group \"fileshare\". \n"</div><div class='hunk'>@@ -1498,7 +1508,8 @@ msgstr "Ficheiro local:"</div><div class='ctx'> </div><div class='ctx'> #: authentication.pm:56</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Use local for all authentication and information user tell in local file"</div><div class='add'>+msgid ""</div><div class='add'>+"Use local for all authentication and information user tell in local file"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Usar local para todas as autenticações e informações dadas pelo utilizador "</div><div class='ctx'> "no ficheiro local"</div><div class='hunk'>@@ -1553,7 +1564,8 @@ msgstr "Directório Activo com SFU:"</div><div class='ctx'> </div><div class='ctx'> #: authentication.pm:60 authentication.pm:61</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Kerberos is a secure system for providing network authentication services."</div><div class='add'>+msgid ""</div><div class='add'>+"Kerberos is a secure system for providing network authentication services."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Kerberos é um sistema seguro que providencia serviços de autenticação na "</div><div class='ctx'> "rede."</div><div class='hunk'>@@ -1713,7 +1725,8 @@ msgstr "Idmap predefinido "</div><div class='ctx'> #: authentication.pm:171</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Set administrator (root) password and network authentication methods"</div><div class='del'>-msgstr "Define a senha de administrador (root) e os métodos de autenticação da rede"</div><div class='add'>+msgstr ""</div><div class='add'>+"Define a senha de administrador (root) e os métodos de autenticação da rede"</div><div class='ctx'> </div><div class='ctx'> #: authentication.pm:172</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -1736,7 +1749,7 @@ msgstr "Nenhuma senha"</div><div class='ctx'> msgid "This password is too short (it must be at least %d characters long)"</div><div class='ctx'> msgstr "Essa senha é demasiado simples (pelo menos deve ter %d caracteres)"</div><div class='ctx'> </div><div class='del'>-#: authentication.pm:189 network/netconnect.pm:385 network/netconnect.pm:689</div><div class='add'>+#: authentication.pm:189 network/netconnect.pm:386 network/netconnect.pm:660</div><div class='ctx'> #: standalone/drakauth:24 standalone/drakauth:26 standalone/drakconnect:492</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Authentication"</div><div class='hunk'>@@ -1878,7 +1891,7 @@ msgstr "Austrália"</div><div class='ctx'> </div><div class='ctx'> #: crypto.pm:16 crypto.pm:50 lang.pm:214 network/adsl_consts.pm:93</div><div class='ctx'> #: network/adsl_consts.pm:102 network/adsl_consts.pm:114</div><div class='del'>-#: network/adsl_consts.pm:123 network/netconnect.pm:51</div><div class='add'>+#: network/adsl_consts.pm:123 network/netconnect.pm:52</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Belgium"</div><div class='ctx'> msgstr "Bélgica"</div><div class='hunk'>@@ -1948,7 +1961,7 @@ msgstr "Finlândia"</div><div class='ctx'> #: network/adsl_consts.pm:431 network/adsl_consts.pm:442</div><div class='ctx'> #: network/adsl_consts.pm:454 network/adsl_consts.pm:466</div><div class='ctx'> #: network/adsl_consts.pm:477 network/adsl_consts.pm:488</div><div class='del'>-#: network/netconnect.pm:48</div><div class='add'>+#: network/netconnect.pm:49</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "France"</div><div class='ctx'> msgstr "França"</div><div class='hunk'>@@ -1976,7 +1989,7 @@ msgstr "Israel"</div><div class='ctx'> </div><div class='ctx'> #: crypto.pm:32 crypto.pm:63 lang.pm:300 network/adsl_consts.pm:557</div><div class='ctx'> #: network/adsl_consts.pm:569 network/adsl_consts.pm:580</div><div class='del'>-#: network/adsl_consts.pm:589 network/netconnect.pm:50 standalone/drakxtv:47</div><div class='add'>+#: network/adsl_consts.pm:589 network/netconnect.pm:51 standalone/drakxtv:47</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Italy"</div><div class='ctx'> msgstr "Itália"</div><div class='hunk'>@@ -1988,7 +2001,7 @@ msgstr "Japão"</div><div class='ctx'> </div><div class='ctx'> #: crypto.pm:34 crypto.pm:65 lang.pm:352 network/adsl_consts.pm:620</div><div class='ctx'> #: network/adsl_consts.pm:629 network/adsl_consts.pm:638</div><div class='del'>-#: network/adsl_consts.pm:647 network/netconnect.pm:49</div><div class='add'>+#: network/adsl_consts.pm:647 network/netconnect.pm:50</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Netherlands"</div><div class='ctx'> msgstr "Holanda"</div><div class='hunk'>@@ -2047,7 +2060,7 @@ msgstr "Taiwan"</div><div class='ctx'> msgid "South Africa"</div><div class='ctx'> msgstr "África do Sul"</div><div class='ctx'> </div><div class='del'>-#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:52</div><div class='add'>+#: crypto.pm:78 crypto.pm:108 lang.pm:416 network/netconnect.pm:53</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "United States"</div><div class='ctx'> msgstr "Estados Unidos"</div><div class='hunk'>@@ -2155,7 +2168,7 @@ msgstr ""</div><div class='ctx'> msgid "Please click on a partition"</div><div class='ctx'> msgstr "Por favor clique numa partição"</div><div class='ctx'> </div><div class='del'>-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:481</div><div class='add'>+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482</div><div class='ctx'> #: standalone/drakbackup:2936 standalone/drakbackup:2996</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Details"</div><div class='hunk'>@@ -2496,7 +2509,8 @@ msgstr "Remover o ficheiro loopback?"</div><div class='ctx'> </div><div class='ctx'> #: diskdrake/interactive.pm:605</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "After changing type of partition %s, all data on this partition will be lost"</div><div class='add'>+msgid ""</div><div class='add'>+"After changing type of partition %s, all data on this partition will be lost"</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Após alterar o tipo de partição %s, todos os dados desta partição serão "</div><div class='ctx'> "perdidos"</div><div class='hunk'>@@ -2564,7 +2578,8 @@ msgstr "Todos os dados desta partição devem ser arquivados (backup)"</div><div class='ctx'> #: diskdrake/interactive.pm:757</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "After resizing partition %s, all data on this partition will be lost"</div><div class='del'>-msgstr "Após redimensionar a partição %s, todos os dados da partição serão perdidos"</div><div class='add'>+msgstr ""</div><div class='add'>+"Após redimensionar a partição %s, todos os dados da partição serão perdidos"</div><div class='ctx'> </div><div class='ctx'> #: diskdrake/interactive.pm:762</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -2756,7 +2771,7 @@ msgstr "Letra do drive no DOS: %s (apenas um palpite)\n"</div><div class='ctx'> msgid "Type: "</div><div class='ctx'> msgstr "Tipo: "</div><div class='ctx'> </div><div class='del'>-#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:295</div><div class='add'>+#: diskdrake/interactive.pm:1197 install_steps_gtk.pm:296</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Name: "</div><div class='ctx'> msgstr "Nome: "</div><div class='hunk'>@@ -2927,7 +2942,7 @@ msgstr ""</div><div class='ctx'> msgid "The encryption keys do not match"</div><div class='ctx'> msgstr "As senhas de encriptação não correspondem"</div><div class='ctx'> </div><div class='del'>-#: diskdrake/interactive.pm:1295 network/netconnect.pm:1222</div><div class='add'>+#: diskdrake/interactive.pm:1295 network/netconnect.pm:1122</div><div class='ctx'> #: standalone/drakconnect:430</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Encryption key"</div><div class='hunk'>@@ -2971,7 +2986,8 @@ msgstr "Mais outro"</div><div class='ctx'> </div><div class='ctx'> #: diskdrake/smbnfs_gtk.pm:177</div><div class='ctx'> #, c-format</div><div class='del'>-msgid "Please enter your username, password and domain name to access this host."</div><div class='add'>+msgid ""</div><div class='add'>+"Please enter your username, password and domain name to access this host."</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Por favor digite o seu nome de utilizador, senha e nome de domínio para "</div><div class='ctx'> "aceder a este servidor."</div><div class='hunk'>@@ -3112,7 +3128,8 @@ msgstr "Montar o sistema de ficheiros apenas para leitura."</div><div class='ctx'> #: fs/mount_options.pm:130</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "All I/O to the file system should be done synchronously."</div><div class='del'>-msgstr "Todos os I/O para o sistema de ficheiros devem ser feitos sincronizadamente."</div><div class='add'>+msgstr ""</div><div class='add'>+"Todos os I/O para o sistema de ficheiros devem ser feitos sincronizadamente."</div><div class='ctx'> </div><div class='ctx'> #: fs/mount_options.pm:134</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -3225,7 +3242,8 @@ msgstr ""</div><div class='ctx'> msgid ""</div><div class='ctx'> "You may not be able to install lilo (since lilo does not handle a LV on "</div><div class='ctx'> "multiple PVs)"</div><div class='del'>-msgstr "Pode não poder instalar o lilo (já que o lilo não gere um LV em vários PVs)"</div><div class='add'>+msgstr ""</div><div class='add'>+"Pode não poder instalar o lilo (já que o lilo não gere um LV em vários PVs)"</div><div class='ctx'> </div><div class='ctx'> #: fsedit.pm:415 fsedit.pm:417</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -3244,7 +3262,8 @@ msgstr ""</div><div class='ctx'> #: fsedit.pm:423</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "You can not use an encrypted file system for mount point %s"</div><div class='del'>-msgstr "Não pode usar um sistema de ficheiros encriptado para ponto de montagem %s"</div><div class='add'>+msgstr ""</div><div class='add'>+"Não pode usar um sistema de ficheiros encriptado para ponto de montagem %s"</div><div class='ctx'> </div><div class='ctx'> #: fsedit.pm:484</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -3256,7 +3275,7 @@ msgstr "Sem espaço livre suficiente para auto-alocação"</div><div class='ctx'> msgid "Nothing to do"</div><div class='ctx'> msgstr "Nada a fazer"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:62 install_any.pm:1639</div><div class='add'>+#: harddrake/data.pm:62 install_any.pm:1599</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Floppy"</div><div class='ctx'> msgstr "Disquete"</div><div class='hunk'>@@ -3266,12 +3285,12 @@ msgstr "Disquete"</div><div class='ctx'> msgid "Zip"</div><div class='ctx'> msgstr "Zip"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:88 install_any.pm:1640</div><div class='add'>+#: harddrake/data.pm:88 install_any.pm:1600</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Hard Disk"</div><div class='ctx'> msgstr "Disco"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:97 install_any.pm:1641</div><div class='add'>+#: harddrake/data.pm:97 install_any.pm:1601</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "CDROM"</div><div class='ctx'> msgstr "CDROM"</div><div class='hunk'>@@ -3361,7 +3380,7 @@ msgstr "Dispositivos bluetooth"</div><div class='ctx'> msgid "Ethernetcard"</div><div class='ctx'> msgstr "Placa Ethernet"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:283 network/netconnect.pm:575</div><div class='add'>+#: harddrake/data.pm:283 network/netconnect.pm:573</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Modem"</div><div class='ctx'> msgstr "Modem"</div><div class='hunk'>@@ -3382,7 +3401,7 @@ msgid "AGP controllers"</div><div class='ctx'> msgstr "Controladores AGP"</div><div class='ctx'> </div><div class='ctx'> #: harddrake/data.pm:325 help.pm:186 help.pm:855</div><div class='del'>-#: install_steps_interactive.pm:979</div><div class='add'>+#: install_steps_interactive.pm:984</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Printer"</div><div class='ctx'> msgstr "Impressora"</div><div class='hunk'>@@ -3449,7 +3468,7 @@ msgid "Bridges and system controllers"</div><div class='ctx'> msgstr "Pontes e controladores do sistema"</div><div class='ctx'> </div><div class='ctx'> #: harddrake/data.pm:448 help.pm:855 install_steps_interactive.pm:118</div><div class='del'>-#: install_steps_interactive.pm:939 standalone/keyboarddrake:29</div><div class='add'>+#: install_steps_interactive.pm:944 standalone/keyboarddrake:29</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Keyboard"</div><div class='ctx'> msgstr "Teclado"</div><div class='hunk'>@@ -3459,27 +3478,27 @@ msgstr "Teclado"</div><div class='ctx'> msgid "Tablet and touchscreen"</div><div class='ctx'> msgstr "Tabuleiro e touchscreen"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:469 help.pm:855 install_steps_interactive.pm:972</div><div class='add'>+#: harddrake/data.pm:470 help.pm:855 install_steps_interactive.pm:977</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Mouse"</div><div class='ctx'> msgstr "Rato"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:483</div><div class='add'>+#: harddrake/data.pm:484</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "UPS"</div><div class='ctx'> msgstr "UPS"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:492</div><div class='add'>+#: harddrake/data.pm:493</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Scanner"</div><div class='ctx'> msgstr "Digitalizador"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:502 standalone/harddrake2:440</div><div class='add'>+#: harddrake/data.pm:503 standalone/harddrake2:440</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Unknown/Others"</div><div class='ctx'> msgstr "Desconhecido/Outros"</div><div class='ctx'> </div><div class='del'>-#: harddrake/data.pm:530</div><div class='add'>+#: harddrake/data.pm:531</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "cpu # "</div><div class='ctx'> msgstr "processador # "</div><div class='hunk'>@@ -3518,7 +3537,7 @@ msgstr ""</div><div class='ctx'> "Aqui pode seleccionar um drive alternativo (seja OSS ou ALSA) para a sua "</div><div class='ctx'> "placa de som (%s)"</div><div class='ctx'> </div><div class='del'>-#. -PO: here the first %s is either "OSS" or "ALSA",</div><div class='add'>+#. -PO: here the first %s is either "OSS" or "ALSA", </div><div class='ctx'> #. -PO: the second %s is the name of the current driver</div><div class='ctx'> #. -PO: and the third %s is the name of the default driver</div><div class='ctx'> #: harddrake/sound.pm:241</div><div class='hunk'>@@ -3578,8 +3597,8 @@ msgstr "Driver:"</div><div class='ctx'> msgid "Trouble shooting"</div><div class='ctx'> msgstr "Correcção de problemas"</div><div class='ctx'> </div><div class='del'>-#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1072</div><div class='del'>-#: network/ndiswrapper.pm:95 network/netconnect.pm:561</div><div class='add'>+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1081</div><div class='add'>+#: network/ndiswrapper.pm:95 network/netconnect.pm:552</div><div class='ctx'> #: printer/printerdrake.pm:1206 printer/printerdrake.pm:2230</div><div class='ctx'> #: printer/printerdrake.pm:2316 printer/printerdrake.pm:2362</div><div class='ctx'> #: printer/printerdrake.pm:2429 printer/printerdrake.pm:2464</div><div class='hunk'>@@ -3720,8 +3739,8 @@ msgstr ""</div><div class='ctx'> "\n"</div><div class='ctx'> "O driver actual para a sua placa de som \"%s\" é \"%s\" "</div><div class='ctx'> </div><div class='del'>-#: harddrake/v4l.pm:14 standalone/net_applet:74 standalone/net_applet:75</div><div class='del'>-#: standalone/net_applet:77</div><div class='add'>+#: harddrake/v4l.pm:14 standalone/net_applet:75 standalone/net_applet:76</div><div class='add'>+#: standalone/net_applet:78</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Auto-detect"</div><div class='ctx'> msgstr "Auto-detectar"</div><div class='hunk'>@@ -3802,8 +3821,8 @@ msgstr ""</div><div class='ctx'> "presentes, active a caixa \"%s\". Se não, pode clicar no botão \"%s\"\n"</div><div class='ctx'> "para reiniciar o seu computador."</div><div class='ctx'> </div><div class='del'>-#: help.pm:14 install_steps_gtk.pm:551 install_steps_interactive.pm:92</div><div class='del'>-#: install_steps_interactive.pm:731 standalone/drakautoinst:216</div><div class='add'>+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92</div><div class='add'>+#: install_steps_interactive.pm:735 standalone/drakautoinst:216</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Accept"</div><div class='ctx'> msgstr "Aceitar"</div><div class='hunk'>@@ -3891,12 +3910,12 @@ msgstr ""</div><div class='ctx'> msgid "User name"</div><div class='ctx'> msgstr "Nome de utilizador"</div><div class='ctx'> </div><div class='del'>-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:232</div><div class='del'>-#: install_steps_gtk.pm:693 interactive.pm:433 interactive/newt.pm:321</div><div class='del'>-#: network/netconnect.pm:335 network/tools.pm:191 printer/printerdrake.pm:3678</div><div class='del'>-#: standalone/drakTermServ:383 standalone/drakbackup:3938</div><div class='del'>-#: standalone/drakbackup:4032 standalone/drakbackup:4049</div><div class='del'>-#: standalone/drakbackup:4067 ugtk2.pm:506</div><div class='add'>+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233</div><div class='add'>+#: install_steps_gtk.pm:694 interactive.pm:433 interactive/newt.pm:321</div><div class='add'>+#: network/netconnect.pm:336 network/thirdparty.pm:321</div><div class='add'>+#: printer/printerdrake.pm:3678 standalone/drakTermServ:383</div><div class='add'>+#: standalone/drakbackup:3938 standalone/drakbackup:4032</div><div class='add'>+#: standalone/drakbackup:4049 standalone/drakbackup:4067 ugtk2.pm:506</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Next"</div><div class='ctx'> msgstr "Próximo"</div><div class='hunk'>@@ -4109,7 +4128,7 @@ msgstr "Desenvolvimento"</div><div class='ctx'> msgid "Graphical Environment"</div><div class='ctx'> msgstr "Ambiente Gráfico"</div><div class='ctx'> </div><div class='del'>-#: help.pm:146 install_steps_gtk.pm:230 install_steps_interactive.pm:642</div><div class='add'>+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Individual package selection"</div><div class='ctx'> msgstr "Selecção individual de pacotes"</div><div class='hunk'>@@ -4225,7 +4244,7 @@ msgstr ""</div><div class='ctx'> "O interface apresentado no nosso manual é semelhante ao usado durante\n"</div><div class='ctx'> "a instalação."</div><div class='ctx'> </div><div class='del'>-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:606</div><div class='add'>+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607</div><div class='ctx'> #: standalone/drakbackup:2325 standalone/drakbackup:2329</div><div class='ctx'> #: standalone/drakbackup:2333 standalone/drakbackup:2337</div><div class='ctx'> #, c-format</div><div class='hunk'>@@ -4298,7 +4317,7 @@ msgstr ""</div><div class='ctx'> "opção instala um servidor horário que poderá ser usado por outras\n"</div><div class='ctx'> "máquinas na sua rede local."</div><div class='ctx'> </div><div class='del'>-#: help.pm:217 install_steps_interactive.pm:874</div><div class='add'>+#: help.pm:217 install_steps_interactive.pm:879</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Hardware clock set to GMT"</div><div class='ctx'> msgstr "Relógio do hardware definido na hora GMT"</div><div class='hunk'>@@ -4744,17 +4763,17 @@ msgstr ""</div><div class='ctx'> msgid "Generate auto-install floppy"</div><div class='ctx'> msgstr "Gerar disquete auto-instal"</div><div class='ctx'> </div><div class='del'>-#: help.pm:409 install_steps_interactive.pm:1331</div><div class='add'>+#: help.pm:409 install_steps_interactive.pm:1336</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Replay"</div><div class='ctx'> msgstr "Repetir"</div><div class='ctx'> </div><div class='del'>-#: help.pm:409 install_steps_interactive.pm:1331</div><div class='add'>+#: help.pm:409 install_steps_interactive.pm:1336</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Automated"</div><div class='ctx'> msgstr "Automática"</div><div class='ctx'> </div><div class='del'>-#: help.pm:409 install_steps_interactive.pm:1334</div><div class='add'>+#: help.pm:409 install_steps_interactive.pm:1339</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Save packages selection"</div><div class='ctx'> msgstr "Gravar selecção de pacotes"</div><div class='hunk'>@@ -4806,7 +4825,7 @@ msgstr ""</div><div class='ctx'> "Clique em \"%s\" se deseja escolher partições para verificar se\n"</div><div class='ctx'> "fisicamente há blocos defeituosos (\"bad blocks\") no disco."</div><div class='ctx'> </div><div class='del'>-#: help.pm:431 install_steps_gtk.pm:387 interactive.pm:434</div><div class='add'>+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:434</div><div class='ctx'> #: interactive/newt.pm:318 printer/printerdrake.pm:3676</div><div class='ctx'> #: standalone/drakTermServ:362 standalone/drakbackup:3898</div><div class='ctx'> #: standalone/drakbackup:3937 standalone/drakbackup:4048</div><div class='hunk'>@@ -4843,7 +4862,7 @@ msgstr ""</div><div class='ctx'> "reveja a selecção, e clique em \"%s\" para descarregar e instalar os\n"</div><div class='ctx'> "pacotes seleccionados, ou clique em \"%s\" para abortar."</div><div class='ctx'> </div><div class='del'>-#: help.pm:444 help.pm:588 install_steps_gtk.pm:386</div><div class='add'>+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387</div><div class='ctx'> #: install_steps_interactive.pm:156 standalone/drakbackup:4095</div><div class='ctx'> #, c-format