From 9c256a5c573409c97b0d5a93ed7196a88c898419 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 20 Aug 2001 05:17:32 +0000 Subject: de-conflictify enough so that it builds --- po/pt_BR.po | 277 ++++-------------------------------------------------------- 1 file changed, 18 insertions(+), 259 deletions(-) (limited to 'po') diff --git a/po/pt_BR.po b/po/pt_BR.po index 2692e570..58d60d36 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -24,12 +24,8 @@ msgstr "Reiniciando as configura #: /etc/rc.d/init.d/nscd:58 /etc/rc.d/init.d/portmap:60 #: /etc/rc.d/init.d/pxe:32 /etc/rc.d/init.d/radvd:45 /etc/rc.d/init.d/rarpd:32 #: /etc/rc.d/init.d/rwalld:33 /etc/rc.d/init.d/snmpd:30 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/tWnn:42 /etc/rc.d/init.d/ups:61 /etc/rc.d/init.d/xinetd:65 -======= #: /etc/rc.d/init.d/tWnn:42 /etc/rc.d/init.d/ups:61 /etc/rc.d/init.d/xinetd:66 #, fuzzy ->>>>>>> 1.21 msgid "Stopping $prog: " msgstr "Parando $prog: " @@ -46,14 +42,11 @@ msgstr "Desligando os servi msgid "Binding to the NIS domain: " msgstr "Efetuando a ligação ao domínio NIS... " -<<<<<<< pt_BR.po #: /etc/sysconfig/network-scripts/network-functions-ipv6:647 #, fuzzy msgid "Missing 'prefix length' for given address ''$testipv6addr_valid" msgstr "Falta o 'prefix length' do endereço dado" -======= ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:449 #, fuzzy msgid "Missing parameter 'IPv6AddrToTest' (arg 1)" @@ -88,12 +81,8 @@ msgstr "Desmontando o initrd: " msgid "Starting $prog" msgstr "Inicializando o $prog" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:137 -======= #: /etc/rc.d/init.d/netfs:141 #, fuzzy ->>>>>>> 1.21 msgid "/proc filesystem unavailable" msgstr "O sistema de arquivos /proc não está disponível" @@ -163,31 +152,21 @@ msgstr " ter #: /etc/sysconfig/network-scripts/network-functions-ipv6:179 #, fuzzy msgid "Missing parameter 'IPv6-network' (arg 1)" -<<<<<<< pt_BR.po msgstr "Falta o parâmetro 'IPv6-network'" -======= -msgstr "Desabilitando o repasse de pacotes IPv4: " - #: /etc/rc.d/init.d/iscsi:33 #, fuzzy msgid "iscsi daemon already running" -msgstr "%s já está rodando\n" +msgstr "%s já está rodando" ->>>>>>> 1.21 #: /etc/rc.d/init.d/netfs:41 msgid "Mounting SMB filesystems: " -<<<<<<< pt_BR.po -msgstr "Montando os sistemas de arquivos SMB: " - -======= msgstr "Montando sistema de arquivos USB: " #: /etc/sysconfig/network-scripts/network-functions-ipv6:647 msgid "Missing 'prefix length' for given address '$testipv6addr_valid'" msgstr "" ->>>>>>> 1.21 #: /etc/rc.d/init.d/mysqld:96 msgid "Usage: $0 {start|stop|status|reload|condrestart|restart}" msgstr "Utilização: $0 {start|stop|status|reload|restart|condrestart}" @@ -195,7 +174,7 @@ msgstr "Utiliza #: /etc/rc.d/init.d/portmap:33 #, fuzzy msgid "Networking not configured - exiting" -msgstr "A rede não está configurada - terminando +msgstr "A rede não está configurada - terminando" #: /etc/sysconfig/network-scripts/ifup-aliases:337 msgid "error in $FILE: IPADDR_START and IPADDR_END don't argree" @@ -203,13 +182,10 @@ msgstr "erro em $FILE: IPADDR_START e IPADDR_END n #: /etc/rc.d/init.d/netfs:152 #, fuzzy -<<<<<<< pt_BR.po msgid "Device does not seem to be present, delaying ${DEVICE} initialization." msgstr "Adiando a inicialização de ${DEVICE}." #: /etc/rc.d/init.d/netfs:148 -======= ->>>>>>> 1.21 msgid "Usage: $0 {start|stop|restart|reload|status}" msgstr "Utilização: $0 {start|stop|restart|reload|status}" @@ -259,13 +235,11 @@ msgstr "Remontando o sistema de arquivos / em modo leitura-escrita: " #: /etc/rc.d/init.d/xfs:81 #, fuzzy -<<<<<<< pt_BR.po msgid "Shutting down ospf6d: " msgstr "Desligando o $prog: " -======= + msgid "Restarting $prog: " msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/mars-nwe:23 msgid "Starting NetWare emulator-server: " @@ -273,26 +247,20 @@ msgstr "Inicializando o emulador-servidor NetWare: " #: /etc/rc.d/init.d/ypxfrd:31 #, fuzzy -<<<<<<< pt_BR.po msgid "Starting iSCSI nuscsitcpd: " msgstr "Inicializando o NFS statd: " -======= msgid "Stopping YP map server: " msgstr "Interrompendo os serviços %s: " ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:303 msgid "Tunnel device 'sit0' is still up - FATAL ERROR!" msgstr "Dispositivo de túnel 'sti0' ainda está rodando - ERRO FATAL!" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/ospfd:25 #, fuzzy msgid "Starting ospfd: " msgstr "Inicializando o slapd: " -======= ->>>>>>> 1.21 #: /etc/rc.d/init.d/halt:18 msgid "$1 " msgstr "$1 " @@ -342,7 +310,7 @@ msgstr "n #: /etc/sysconfig/network-scripts/ifup-ppp:69 msgid "ifup-ppp for ${DEVNAME} exiting" -msgstr "ifup-ppp para ${DEVNAME} terminando +msgstr "ifup-ppp para ${DEVNAME} terminando" #: /etc/rc.d/init.d/ypbind:42 msgid "Listening for an NIS domain server." @@ -405,12 +373,8 @@ msgstr "Dispositivos activos de momento:" msgid "You need to be root to use this command ! " msgstr "Tem de ser o root para executar este comando!" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:93 -======= #: /etc/rc.d/init.d/netfs:97 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting NFS filesystems (retry): " msgstr "Desmontando os sistemas de arquivos NFS (repetição): " @@ -437,7 +401,7 @@ msgstr "Carregando o mapa de teclado padr #: /etc/sysconfig/network-scripts/ifup-ppp:43 msgid "ifup-ppp for ${DEVICE} exiting" -msgstr "ifup-ppp para ${DEVICE} terminando +msgstr "ifup-ppp para ${DEVICE} terminando" #: /etc/rc.d/rc.sysinit:392 /etc/rc.d/rc.sysinit:394 msgid "Finding module dependencies: " @@ -467,14 +431,11 @@ msgstr "Mudando as pol msgid "$0: configuration for ${1} not found." msgstr "" -<<<<<<< pt_BR.po -======= #: /etc/rc.d/init.d/syslog:34 #, fuzzy msgid "Starting kernel logger: " msgstr "Iniciando o servidor %s: " ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/ifup-aliases:156 msgid "error in $FILE: didn't specify device or ipaddr" msgstr "erro em $FILE: não especificou dispositivo ou endereço IP" @@ -582,18 +543,13 @@ msgstr "Desligando a mem #: /etc/rc.d/init.d/ups:42 msgid "Starting UPS monitor (master): " -<<<<<<< pt_BR.po msgstr "Inicializando o monitor de UPSs (mestre): " -======= -msgstr "Iniciando %s: " - #: /etc/rc.d/init.d/netfs:133 #, fuzzy msgid "Active SMB mountpoints: " msgstr "Pontos de montagem ativos %s:\n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/syslog:41 msgid "Shutting down kernel logger: " msgstr "Desligando o servidor de registos do núcleo: " @@ -639,15 +595,13 @@ msgstr " a directoria de m msgid "Extracting kadm5 Service Keys: " msgstr "Extraindo as chaves de serviço kadm5: " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/netfs:129 msgid "Active SMB mountpoints: " msgstr "Pontos de montagem SMB activos: " -======= + #: /etc/rc.d/init.d/lpd:34 msgid "No Printers Defined" msgstr "" ->>>>>>> 1.21 #: /etc/rc.d/rc.sysinit:302 msgid "Setting up Logical Volume Management:" @@ -675,14 +629,11 @@ msgid "" "specified, 6to4 configuration is not valid!" msgstr "" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/bgpd:34 #, fuzzy msgid "Shutting down bgpd: " msgstr "Desligando o $prog: " -======= ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:225 #: /etc/sysconfig/network-scripts/network-functions-ipv6:325 #: /etc/sysconfig/network-scripts/network-functions-ipv6:372 @@ -706,10 +657,6 @@ msgstr "Desligando o servidor de registos do sistema: " #: /etc/rc.d/init.d/network:189 msgid "Disabling IPv4 packet forwarding: " -<<<<<<< pt_BR.po -msgstr "Desativando o reenvio de pacotes IPv4: " - -======= msgstr "Desabilitando o repasse de pacotes IPv4: " #: /etc/rc.d/init.d/iscsi:42 @@ -721,7 +668,6 @@ msgstr "" msgid "Starting iSCSI iscsilun: " msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/vncserver:33 msgid "vncserver startup" msgstr "arranque do vncserver" @@ -736,19 +682,14 @@ msgstr "Iniciar o servi #: /etc/rc.d/init.d/rstatd:21 msgid "Starting rstat services: " -<<<<<<< pt_BR.po msgstr "Inicializando os serviços rstat: " -======= -msgstr "Iniciando os serviços %s: " - #: /etc/rc.d/init.d/ipchains:102 /etc/rc.d/init.d/iptables:75 #: /etc/rc.d/init.d/iptables:76 /etc/rc.d/init.d/iptables:152 #: /etc/rc.d/init.d/iptables:153 msgid "Removing user defined chains:" msgstr "" ->>>>>>> 1.21 #: /etc/rc.d/init.d/named:32 #, fuzzy msgid "$prog: already running" @@ -775,27 +716,19 @@ msgstr "" #: /etc/sysconfig/network-scripts/ifup-aliases:222 #: /etc/sysconfig/network-scripts/ifup-aliases:232 msgid "error in ifcfg-${parent_device}: files" -<<<<<<< pt_BR.po msgstr "erro em ifcfg-${parent_device}: arquivos" -======= -msgstr "" - #: /etc/rc.d/init.d/iscsi:63 #, fuzzy msgid "Stopping iSCSI: iscsid" msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/FreeWnn:71 /etc/rc.d/init.d/bootparamd:69 #: /etc/rc.d/init.d/cWnn:70 /etc/rc.d/init.d/pcmcia:52 -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/random:56 /etc/rc.d/init.d/tWnn:70 -======= #: /etc/rc.d/init.d/random:56 /etc/rc.d/init.d/routed:72 #: /etc/rc.d/init.d/tWnn:70 #, fuzzy ->>>>>>> 1.21 msgid "Usage: $0 {start|stop|status|restart|reload}" msgstr "Utilização: $0 {start|stop|status|restart|reload}" @@ -827,12 +760,8 @@ msgstr "Inicializando a interface $i: " msgid "Usage: $0 {start|stop|reload|restart|condrestart|status}" msgstr "Utilização: $0 {start|stop|reload|restart|condrestart|status}" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:133 -======= #: /etc/rc.d/init.d/netfs:137 #, fuzzy ->>>>>>> 1.21 msgid "Active NCP mountpoints: " msgstr "Pontos de montagem NCP activos: " @@ -848,12 +777,8 @@ msgstr "Inicializando o teclado USB: " msgid "Please run makehistory and/or makedbz before starting innd." msgstr "Por favor execute o makehistory e/ou makedbz antes de arrancar o innd." -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/xinetd:75 -======= #: /etc/rc.d/init.d/xinetd:76 #, fuzzy ->>>>>>> 1.21 msgid "Reloading configuration: " msgstr "Recarregando configuração: " @@ -865,12 +790,8 @@ msgstr "Pontos de Montagem Configurados:" msgid "Setting up ISA PNP devices: " msgstr "Configurando os dispositivos ISA PNP: " -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:125 -======= #: /etc/rc.d/init.d/netfs:129 #, fuzzy ->>>>>>> 1.21 msgid "Active NFS mountpoints: " msgstr "Pontos de montagem NFS activos: " @@ -914,12 +835,8 @@ msgstr "Desligando o dispositivo $device: " msgid "Generated 6to4 prefix '$prefix6to4' from '$localipv4'" msgstr "" -<<<<<<< pt_BR.po -#: /etc/sysconfig/network-scripts/ifup:149 -======= #: /etc/sysconfig/network-scripts/ifup:166 #, fuzzy ->>>>>>> 1.21 msgid "Determining IP information for ${DEVICE}..." msgstr "Determinando a informação IP para o ${DEVICE}..." @@ -982,13 +899,8 @@ msgstr "Utiliza #: /etc/rc.d/init.d/kudzu:51 #, fuzzy -<<<<<<< pt_BR.po msgid "Shutting down zebra: " msgstr "Desligando o $prog: " -======= -msgid "Hardware configuration timed out." -msgstr "Tempo de configuração do hardware esgotado.\n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/yppasswdd:24 msgid "Starting YP passwd service: " @@ -1007,30 +919,18 @@ msgstr "Utiliza msgid "Missing parameter 'device'" msgstr "Falta o parâmetro 'device'" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/halt:153 -======= -#: /etc/rc.d/init.d/halt:163 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting file systems: " msgstr "Desmontando os sistemas de arquivos: " -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:106 -======= #: /etc/rc.d/init.d/netfs:110 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting SMB filesystems: " msgstr "Desmontando os sistemas de arquivos SMB: " -<<<<<<< pt_BR.po -#: /etc/rc.d/rc.sysinit:597 -======= #: /etc/rc.d/rc.sysinit:600 #, fuzzy ->>>>>>> 1.21 msgid "Resetting hostname ${HOSTNAME}: " msgstr "Reconfigurando o nome da máquina ${HOSTNAME}: " @@ -1058,42 +958,30 @@ msgstr "" #: /etc/rc.d/init.d/netfs:39 #, fuzzy -<<<<<<< pt_BR.po msgid "Starting ripd: " msgstr "Inicializando o slurpd: " -======= + msgid "Mounting NFS filesystems: " msgstr "Montando sistemas de arquivos %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/halt:72 msgid "Saving mixer settings" msgstr "Gravando a configuração dos canais sonoros:" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/ripngd:55 #, fuzzy msgid "Usage: ripngd {start|stop|restart|reload|condrestart|status}" msgstr "Utilização: $prog {start|stop|restart|reload|condrestart|status}" -======= + #: /etc/sysconfig/network-scripts/ifup:205 msgid "Failed to bring up ${DEVICE}." msgstr "" ->>>>>>> 1.21 #: /etc/rc.d/init.d/halt:126 msgid "Turning off quotas: " -<<<<<<< pt_BR.po msgstr "Desligando as quotas: " -======= -msgstr "Desligando quotas: " ->>>>>>> 1.21 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/ospf6d:55 -======= #: /etc/rc.d/init.d/halt:187 ->>>>>>> 1.21 #, fuzzy msgid "Usage: ospf6d {start|stop|restart|reload|condrestart|status}" msgstr "Utilização: $0 {start|stop|restart|reload|condrestart|status}" @@ -1102,17 +990,15 @@ msgstr "Utiliza msgid "On the next boot fsck will be skipped." msgstr "No próximo arranque o fsck não será executado." -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/network:245 msgid "Bringing up route $device: " msgstr "Inicializando a 'route' $device: " -======= + #: /etc/sysconfig/network-scripts/ifup:96 #, fuzzy msgid "" "$alias device does not seem to be present, delaying ${DEVICE} initialization." msgstr "Atrasando a iniciação %s.\n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/sshd:54 /etc/rc.d/init.d/sshd:57 msgid "RSA key generation" @@ -1166,14 +1052,9 @@ msgstr "Desmontando sistemas de arquivos %s (de novo): " msgid "Enabling local filesystem quotas: " msgstr "Montando os sistemas de arquivos locais: " -<<<<<<< pt_BR.po -#: /etc/sysconfig/network-scripts/ifup:165 -#: /etc/sysconfig/network-scripts/ifup:167 -======= #: /etc/sysconfig/network-scripts/ifup:177 #: /etc/sysconfig/network-scripts/ifup:179 #, fuzzy ->>>>>>> 1.21 msgid " done." msgstr " concluído." @@ -1207,13 +1088,10 @@ msgstr "utiliza msgid "Usage: $0 {condrestart|start|stop|restart|reload|status}" msgstr "Utilização: $0 {condrestart|start|stop|restart|reload|status}" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/kudzu:51 msgid "Hardware configuration timed out." msgstr "'Timeout' na configuração do hardware." -======= ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/ifup-sl:45 msgid "/etc/sysconfig/network-scripts/dip-$DEVICE does not exist" msgstr "O /etc/sysconfig/network-scripts/dip-$DEVICE não existe" @@ -1254,11 +1132,7 @@ msgstr "Enviando a todos os processos o sinal KILL..." msgid "Usage: (halt|reboot) {start}" msgstr "Utilização: (halt|reboot) {start}" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/ospfd:32 -======= #: /etc/rc.d/init.d/halt:64 ->>>>>>> 1.21 #, fuzzy msgid "Shutting down ospfd: " msgstr "Desligando o $prog: " @@ -1326,22 +1200,16 @@ msgstr "Mudando pol msgid "*** An error occurred during the file system check." msgstr "*** Ocorreu um erro durante a verificação dos sistemas de arquivos." -<<<<<<< pt_BR.po #: /etc/sysconfig/network-scripts/ifup-ppp:68 msgid "/etc/sysconfig/network-scripts/chat-${DEVNAME} does not exist" msgstr "O /etc/sysconfig/network-scripts/chat-${DEVNAME} não existe" -======= + #: /etc/sysconfig/network-scripts/ifup:34 msgid "$0: configuration for ${1} not found." msgstr "" ->>>>>>> 1.21 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:113 -======= #: /etc/rc.d/init.d/netfs:117 #, fuzzy ->>>>>>> 1.21 msgid "Configured NFS mountpoints: " msgstr "Configuração dos pontos de montagem NFS: " @@ -1398,12 +1266,8 @@ msgstr "(n msgid "Loading default keymap ($KEYTABLE): " msgstr "Carregando o mapa do teclado padrão ($KEYTABLE): " -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/postgresql:169 -======= #: /etc/rc.d/init.d/postgresql:176 #, fuzzy ->>>>>>> 1.21 msgid "Stopping postgresql service: " msgstr "Parando o serviço postgresql: " @@ -1411,12 +1275,8 @@ msgstr "Parando o servi msgid "." msgstr "." -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/halt:39 -======= #: /etc/rc.d/init.d/halt:44 #, fuzzy ->>>>>>> 1.21 msgid "$0: call me as 'rc.halt' or 'rc.reboot' please!" msgstr "$0: invoque-me como 'rc.halt' ou 'rc.reboot' por favor!" @@ -1464,7 +1324,7 @@ msgstr "Utiliza #: /etc/sysconfig/network-scripts/ifup-sl:34 #: /etc/sysconfig/network-scripts/ifup-sl:46 msgid "ifup-sl for $DEVICE exiting" -msgstr "ifup-sl para $DEVICE terminando +msgstr "ifup-sl para $DEVICE terminando" #: /etc/rc.d/rc.sysinit:63 msgid "Configuring kernel parameters: " @@ -1479,39 +1339,32 @@ msgstr "Configurando os par msgid "Unmounting network block filesystems: " msgstr "Desmontando os sistemas de arquivos loopback: " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/netfs:39 msgid "Mounting NFS filesystems: " msgstr "Montando os sistemas de arquivos NFS: " -======= + #: /etc/rc.d/init.d/halt:143 /etc/rc.d/init.d/netfs:61 #, fuzzy msgid "Detaching loopback device $dev: " msgstr "Desligando dispositivo %s: " ->>>>>>> 1.21 -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/halt:172 msgid "Unmounting proc file system: " msgstr "Desmontando o sistema de arquivos proc: " -======= + #: /etc/rc.d/init.d/network:245 #, fuzzy msgid "Bringing up route $device: " msgstr "Levantando rota %s: " ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1022 msgid "Given IPv6 MTU is out of range" msgstr "" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/ups:32 msgid "Starting $MODEL: " msgstr "Inicializando o $MODEL: " -======= ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:89 #, fuzzy msgid "Missing parameter 'forwarding control' (arg 1)" @@ -1530,15 +1383,13 @@ msgstr "Inicializando a base de dados MySQL: " msgid "Setting network parameters: " msgstr "Configurando os parâmetros de rede: " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/xfs:81 msgid "Restarting $prog: " msgstr "Reinicializando o $prog: " -======= + #: /etc/rc.d/rc.sysinit:267 /etc/rc.d/rc.sysinit:551 msgid "Converting old user quota files: " msgstr "" ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/ifup-ipv6:168 msgid "" @@ -1554,12 +1405,8 @@ msgstr "Tabela: nat" msgid "Deleting internal IPX network: " msgstr "Apagando a rede IPX interna: " -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:107 -======= #: /etc/rc.d/init.d/netfs:111 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting NCP filesystems: " msgstr "Desmontando os sistemas de arquivos NCP: " @@ -1567,12 +1414,8 @@ msgstr "Desmontando os sistemas de arquivos NCP: " msgid "Setting default font ($SYSFONT): " msgstr "Configurando o tipo de letra padrão ($SYSFONT): " -<<<<<<< pt_BR.po -#: /etc/sysconfig/network-scripts/ifup:169 -======= #: /etc/sysconfig/network-scripts/ifup:181 #, fuzzy ->>>>>>> 1.21 msgid " failed." msgstr " falhou." @@ -1582,12 +1425,8 @@ msgstr " falhou." msgid "Missing parameter 'IPv6-route' (arg 3)" msgstr "Falta o parâmetro 'IPv6-route'" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:95 -======= #: /etc/rc.d/init.d/netfs:99 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting NFS filesystems: " msgstr "Desmontando os sistemas de arquivos NFS: " @@ -1618,21 +1457,13 @@ msgstr "Dispositivos configurados:" msgid "Converting old group quota files: " msgstr "Ativando as quotas para os sistemas de arquivos locais: " -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/halt:57 -======= #: /etc/rc.d/init.d/halt:62 #, fuzzy ->>>>>>> 1.21 msgid "Sending all processes the TERM signal..." msgstr "Enviando a todos os processos o sinal TERM..." -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/netfs:117 -======= #: /etc/rc.d/init.d/netfs:121 #, fuzzy ->>>>>>> 1.21 msgid "Configured SMB mountpoints: " msgstr "Pontos de montagem SMB configurados: " @@ -1641,18 +1472,16 @@ msgstr "Pontos de montagem SMB configurados: " msgid "Unmounting network block filesystems (retry): " msgstr "Desmontando os sistemas de arquivos loopback (repetição): " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/iscsi:29 #, fuzzy msgid "NuScsiTcp daemon already running" msgstr "O postmaster já está a correr." -======= + #: /etc/sysconfig/network-scripts/network-functions-ipv6:114 msgid "" "IPv6 forwarding per device cannot be controlled via sysctl - use netfilter6 " "instead!" msgstr "" ->>>>>>> 1.21 #: /etc/rc.d/init.d/isdn:182 /etc/rc.d/init.d/ldap:115 #: /etc/rc.d/init.d/smb:109 @@ -1667,12 +1496,8 @@ msgstr "Execute '/usr/sbin/kudzu' da linha de comandos para re-detectar." msgid "error in $FILE: IPADDR_START greater than IPADDR_END" msgstr "erro em $FILE: IPADDR_START mais elevado do que IPADDR_END" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/halt:151 -======= #: /etc/rc.d/init.d/halt:161 #, fuzzy ->>>>>>> 1.21 msgid "Unmounting file systems (retry): " msgstr "Desmontando os sistemas de arquivos (repetição): " @@ -1686,12 +1511,8 @@ msgstr "arranque do $base" #: /etc/rc.d/init.d/ospf6d:33 /etc/rc.d/init.d/ospfd:34 #: /etc/rc.d/init.d/ripd:33 /etc/rc.d/init.d/ripngd:33 #: /etc/rc.d/init.d/sendmail:55 /etc/rc.d/init.d/vncserver:40 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/xfs:67 -======= #: /etc/rc.d/init.d/xfs:67 /etc/rc.d/init.d/zebra:31 #, fuzzy ->>>>>>> 1.21 msgid "Shutting down $prog: " msgstr "Desligando o $prog: " @@ -1714,12 +1535,8 @@ msgstr "Desmontando os sistemas de arquivos" msgid "Table: mangle" msgstr "Tabela: mangle" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/halt:179 -======= #: /etc/rc.d/init.d/halt:189 #, fuzzy ->>>>>>> 1.21 msgid "On the next boot fsck will be forced." msgstr "No próximo arranque o fsck será forçado." @@ -1734,18 +1551,13 @@ msgstr "Utiliza #: /etc/rc.d/rc.sysinit:41 msgid " Linux" -<<<<<<< pt_BR.po msgstr " Linux" -======= -msgstr "" - #: /etc/rc.d/init.d/iscsi:55 #, fuzzy msgid "Stopping iSCSI: iscsilun" msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/gated:30 msgid "Not starting $prog: " msgstr "Não iniciar o $prog: " @@ -1768,36 +1580,24 @@ msgstr "" msgid "Disabling IPv4 automatic defragmentation: " msgstr "Desativando a desfragmentação automática do IPv4: " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/netfs:121 msgid "Configured NCP mountpoints: " msgstr "Pontos de montagem NCP configurados: " -======= + #: /etc/rc.d/init.d/halt:53 #, fuzzy msgid "Usage: (halt|reboot) {start}" msgstr "Uso: %s {start|stop|restart}\n" ->>>>>>> 1.21 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/httpd:86 -======= #: /etc/rc.d/init.d/httpd:86 /etc/rc.d/init.d/ospf6d:56 #, fuzzy ->>>>>>> 1.21 msgid "Usage: $prog {start|stop|restart|reload|condrestart|status}" msgstr "Utilização: $prog {start|stop|restart|reload|condrestart|status}" -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/iscsi:98 /etc/rc.d/init.d/rawdevices:77 -#: /etc/rc.d/init.d/rusersd:66 /etc/rc.d/init.d/rwalld:64 -#: /etc/rc.d/init.d/rwhod:63 -======= #: /etc/rc.d/init.d/iscsi:102 /etc/rc.d/init.d/rawdevices:77 #: /etc/rc.d/init.d/rstatd:63 /etc/rc.d/init.d/rusersd:66 #: /etc/rc.d/init.d/rwalld:64 /etc/rc.d/init.d/rwhod:63 #, fuzzy ->>>>>>> 1.21 msgid "Usage: $0 {start|stop|status|restart}" msgstr "Utilização: $0 {start|stop|status|restart}" @@ -1812,13 +1612,8 @@ msgid "" "already configured on device '$devnew' - FATAL ERROR!" msgstr "" -#: /etc/rc.d/init.d/rhnsd:82 /etc/rc.d/init.d/snmpd:74 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/xinetd:114 -======= #: /etc/rc.d/init.d/xinetd:115 #, fuzzy ->>>>>>> 1.21 msgid "Usage: $0 {start|stop|status|restart|condrestart|reload}" msgstr "Utilização: $0 {start|stop|status|restart|condrestart|reload}" @@ -1834,13 +1629,10 @@ msgstr "Parando os servi msgid "usage: ifup-routes " msgstr "utilização: ifup-routes " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/syslog:34 msgid "Starting kernel logger: " msgstr "Inicializando o servidor de registos do núcleo: " -======= ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/ifup-ipv6:164 msgid "" "Given IPv6 address of relay is not a 6to4 one, 6to4 configuration is not " @@ -1881,23 +1673,13 @@ msgstr "" #: /etc/rc.d/init.d/iscsi:47 #, fuzzy -<<<<<<< pt_BR.po msgid "Starting iSCSI nuactlun: " msgstr "Inicializando o NFS statd: " -======= -msgid "Devices that are down:" -msgstr "Dispositivos que estão desativados:\n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/netfs:125 #, fuzzy -<<<<<<< pt_BR.po msgid "Shutting down ripd: " msgstr "Desligando o $prog: " -======= -msgid "Configured NCP mountpoints: " -msgstr "Configurados os pontos de montagem %s:\n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/rawdevices:55 msgid "Assigning devices: " @@ -1916,14 +1698,11 @@ msgstr "vncserver shutdown" msgid "Device ${DEVICE} has different MAC address than expected, ignoring." msgstr "" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/ospf6d:25 #, fuzzy msgid "Starting ospf6d: " msgstr "Inicializando o slapd: " -======= ->>>>>>> 1.21 #: /etc/rc.d/init.d/pcmcia:128 msgid "Shutting down PCMCIA services:" msgstr "Desligando os serviços PCMCIA:" @@ -1945,11 +1724,10 @@ msgstr "O postmaster j msgid "Generating ident key: " msgstr "Gerando a chave do ident: " -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/halt:132 /etc/rc.d/init.d/netfs:55 msgid "Unmounting loopback filesystems (retry):" msgstr "Desmontando os sistemas de arquivos loopback (repetição): " -======= + #: /etc/rc.d/init.d/FreeWnn:32 /etc/rc.d/init.d/amd:30 #: /etc/rc.d/init.d/anacron:15 /etc/rc.d/init.d/arpwatch:28 #: /etc/rc.d/init.d/atd:29 /etc/rc.d/init.d/bgpd:26 @@ -1976,7 +1754,6 @@ msgstr "Desmontando os sistemas de arquivos loopback (repeti #, fuzzy msgid "Starting $prog: " msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/rc.d/init.d/innd:33 msgid "Starting INND system: " @@ -2066,45 +1843,33 @@ msgid "Start $x" msgstr "Iniciar o $x" #: /etc/rc.d/init.d/amd:96 /etc/rc.d/init.d/autofs:281 -<<<<<<< pt_BR.po -#: /etc/rc.d/init.d/irda:66 /etc/rc.d/init.d/keytable:72 -#: /etc/rc.d/init.d/sshd:138 -======= #: /etc/rc.d/init.d/bgpd:56 /etc/rc.d/init.d/irda:66 #: /etc/rc.d/init.d/keytable:72 /etc/rc.d/init.d/ospfd:57 #: /etc/rc.d/init.d/ripd:56 /etc/rc.d/init.d/ripngd:56 #: /etc/rc.d/init.d/sshd:138 /etc/rc.d/init.d/zebra:54 #, fuzzy ->>>>>>> 1.21 msgid "Usage: $0 {start|stop|restart|reload|condrestart|status}" msgstr "Utilização: $0 {start|stop|restart|reload|condrestart|status}" #: /etc/sysconfig/network-scripts/ifup-routes:9 #, fuzzy -<<<<<<< pt_BR.po msgid "Usage: ripd {start|stop|restart|reload|condrestart|status}" msgstr "Utilização: $0 {start|stop|restart|reload|condrestart|status}" -======= -msgid "usage: ifup-routes " -msgstr "uso: %s \n" ->>>>>>> 1.21 #: /etc/rc.d/init.d/iptables:161 /etc/rc.d/init.d/iptables:162 msgid "Saving current rules to $IPTABLES_CONFIG" msgstr "Gravando as regras atuais como $IPTABLES_CONFIG" -<<<<<<< pt_BR.po #: /etc/rc.d/init.d/ipchains:102 /etc/rc.d/init.d/iptables:75 #: /etc/rc.d/init.d/iptables:76 /etc/rc.d/init.d/iptables:152 #: /etc/rc.d/init.d/iptables:153 msgid "Removing user defined chains:" msgstr "Removendo as 'chains' definidas pelo usuário:" -======= + #: /etc/rc.d/init.d/ups:32 #, fuzzy msgid "Starting $MODEL: " msgstr "Iniciando %s: " ->>>>>>> 1.21 #: /etc/sysconfig/network-scripts/network-functions-ipv6:1016 #, fuzzy @@ -2123,14 +1888,9 @@ msgstr "Apagando todas as 'chains':" #: /etc/rc.d/init.d/functions:394 #, fuzzy -<<<<<<< pt_BR.po msgid "Stopping YP map server: " msgstr "Parando o serviço YP passwd: " -======= -msgid "Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " -msgstr "Iniciando serviço %s (S)im/(N)ão/(C)ontinue? [S] " - #, fuzzy #~ msgid "Usage: bgpd {start|stop|restart|reload|condrestart|status}" #~ msgstr "Uso: %s {start|stop|restart|reload|status}\n" @@ -2219,7 +1979,6 @@ msgstr "Iniciando servi #~ msgstr "Uso: %s {start|stop|restart|reload|status}\n" #, fuzzy ->>>>>>> 1.21 #~ msgid "Stopping Kerberos 5 Propagation Server: " #~ msgstr "Parando o Serviço de Propagação do Kerberos 5: " -- cgit v1.2.1