summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-13 03:01:51 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-13 03:01:51 +0200
commita50ab2d8de27e616c9834df3063d99da6ebbd2ac (patch)
treed6120be2adcb9b62c7f519c223e938c81ddde273
parent51972b8091ba5fa93ececc5e688bd00d2831812c (diff)
parent078ffb485e45ca636a70a1af5374e780fe10db47 (diff)
Merge remote branch 'origin/master-tx'
-rw-r--r--po/es.po149
-rw-r--r--po/pl.po52
-rw-r--r--po/uk.po44
-rw-r--r--po/zh_CN.po131
4 files changed, 198 insertions, 178 deletions
diff --git a/po/es.po b/po/es.po
index 561d774..7631543 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,18 +1,18 @@
-# Spanish translation for avahi
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# Fedora Spanish translation for avahi
# This file is distributed under the same license as the avahi package.
#
# Carlos Albornoz <caralbornozc@gmail.com>, 2010
# Jorge González <jorgegonz@svn.gnome.org>, 2008, 2010.
+# Héctor Daniel Cabrera <logan@fedoraproject.org>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: Avahi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 22:49+0200\n"
-"PO-Revision-Date: 2010-05-16 10:25+0200\n"
-"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
-"Language-Team: Español <gnome-es-list@gnome.org>\n"
+"POT-Creation-Date: 2010-06-29 08:42+0000\n"
+"PO-Revision-Date: 2010-06-30 20:33-0300\n"
+"Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
+"Language-Team: Fedora Spanish <trans-es@lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -20,6 +20,7 @@ msgstr ""
"X-Generator: Launchpad (build Unknown)\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: ARGENTINA\n"
#: ../avahi-common/error.c:30
msgid "OK"
@@ -260,41 +261,35 @@ msgstr "Navegar en busca de servicios Zeroconf disponibles en su red"
#: ../avahi-python/avahi-discover/avahi-discover.py:224
msgid "TXT"
-msgstr ""
+msgstr "TXT"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "TXT Data:"
-msgstr "Datos TXT"
+msgstr "Datos TXT:"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "empty"
-msgstr "Está vacío"
+msgstr "vacío"
#: ../avahi-python/avahi-discover/avahi-discover.py:228
-#, fuzzy
msgid "Service Type:"
-msgstr "Tipo de Servicio"
+msgstr "Tipo de servicio:"
#: ../avahi-python/avahi-discover/avahi-discover.py:229
-#, fuzzy
msgid "Service Name:"
-msgstr "Nombre del servicio"
+msgstr "Nombre del servicio:"
#: ../avahi-python/avahi-discover/avahi-discover.py:230
-#, fuzzy
msgid "Domain Name:"
-msgstr "Dominio"
+msgstr "Nombre del dominio:"
#: ../avahi-python/avahi-discover/avahi-discover.py:231
msgid "Interface:"
-msgstr ""
+msgstr "Interfaz:"
#: ../avahi-python/avahi-discover/avahi-discover.py:232
-#, fuzzy
msgid "Address:"
-msgstr "Dirección"
+msgstr "Dirección:"
#: ../avahi-ui/avahi-ui.c:185
msgid "Browse Service Types"
@@ -320,7 +315,8 @@ msgstr "Tipo de Servicio"
msgid "The service type of the selected service"
msgstr "El tipo de servicio del servicio seleccionado"
-#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019
+#: ../avahi-ui/avahi-ui.c:202
+#: ../avahi-ui/avahi-ui.c:1019
msgid "Service Name"
msgstr "Nombre del servicio"
@@ -361,23 +357,20 @@ msgid "The TXT data of the resolved service"
msgstr "Los datos TXT del servicio resuelto"
#: ../avahi-ui/avahi-ui.c:230
-#, fuzzy
msgid "Resolve Service"
msgstr "Resolver servicio"
#: ../avahi-ui/avahi-ui.c:230
msgid "Resolve the selected service automatically before returning"
-msgstr ""
+msgstr "Resolver el servicio seleccionado de manera automática antes de la devolución"
#: ../avahi-ui/avahi-ui.c:236
-#, fuzzy
msgid "Resolve Service Host Name"
msgstr "Resolver el nombre de equipo del servicio"
#: ../avahi-ui/avahi-ui.c:236
-msgid ""
-"Resolve the host name of the selected service automatically before returning"
-msgstr ""
+msgid "Resolve the host name of the selected service automatically before returning"
+msgstr "Resolver el nombre del equipo del servicio seleccionado de manera automática antes de la devolución"
#: ../avahi-ui/avahi-ui.c:242
msgid "Address family"
@@ -402,8 +395,10 @@ msgstr "Fallo del resolutor de Avahi: %s"
msgid "Browsing for service type %s in domain %s failed: %s"
msgstr "Falló la exploración del tipo de servicio %s en el dominio %s: %s"
-#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168
-#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178
+#: ../avahi-ui/avahi-ui.c:517
+#: ../avahi-utils/avahi-browse.c:168
+#: ../avahi-utils/avahi-browse.c:169
+#: ../avahi-utils/avahi-browse.c:178
#: ../avahi-utils/avahi-browse.c:179
msgid "n/a"
msgstr "n/d"
@@ -455,7 +450,8 @@ msgstr "Falló al crear el dominio de exploración: %s"
msgid "Change domain"
msgstr "Cambiar el dominio"
-#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158
+#: ../avahi-ui/avahi-ui.c:1027
+#: ../avahi-ui/avahi-ui.c:1158
msgid "Browsing..."
msgstr "Examinando…"
@@ -467,11 +463,13 @@ msgstr "Inicializando…"
msgid "Location"
msgstr "Ubicación"
-#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553
+#: ../avahi-ui/avahi-ui.c:1145
+#: ../avahi-utils/avahi-browse.c:553
msgid "Name"
msgstr "Nombre"
-#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553
+#: ../avahi-ui/avahi-ui.c:1150
+#: ../avahi-utils/avahi-browse.c:553
msgid "Type"
msgstr "Tipo"
@@ -498,7 +496,8 @@ msgstr ""
" -S --shell Examinar servidores SSH y VNC\n"
" -d --domain=DOMINIO El dominio que examinar\n"
-#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775
+#: ../avahi-ui/bssh.c:101
+#: ../avahi-utils/avahi-browse.c:775
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
@@ -564,7 +563,8 @@ msgstr ": Todo por ahora\n"
msgid ": Cache exhausted\n"
msgstr ": Caché agotada\n"
-#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261
+#: ../avahi-utils/avahi-browse.c:239
+#: ../avahi-utils/avahi-browse.c:261
#, c-format
msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"
msgstr "Error al resolver el servicio «%s» de tipo «%s» en el dominio «%s»: %s\n"
@@ -594,21 +594,27 @@ msgstr "Falló avahi_service_type_browser_new(): %s\n"
msgid "avahi_domain_browser_new() failed: %s\n"
msgstr "Falló avahi_domain_browser_new(): %s\n"
-#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394
-#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168
+#: ../avahi-utils/avahi-browse.c:535
+#: ../avahi-utils/avahi-publish.c:394
+#: ../avahi-utils/avahi-resolve.c:280
+#: ../avahi-utils/avahi-set-host-name.c:168
#, c-format
msgid "Failed to query version string: %s\n"
msgstr "Error al consultar la cadena de versión: %s\n"
-#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399
-#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173
+#: ../avahi-utils/avahi-browse.c:540
+#: ../avahi-utils/avahi-publish.c:399
+#: ../avahi-utils/avahi-resolve.c:285
+#: ../avahi-utils/avahi-set-host-name.c:173
#: ../avahi-utils/avahi-set-host-name.c:189
#, c-format
msgid "Failed to query host name: %s\n"
msgstr "Error al consultar el nombre del equipo: %s\n"
-#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403
-#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177
+#: ../avahi-utils/avahi-browse.c:544
+#: ../avahi-utils/avahi-publish.c:403
+#: ../avahi-utils/avahi-resolve.c:289
+#: ../avahi-utils/avahi-set-host-name.c:177
#, c-format
msgid "Server version: %s; Host name: %s\n"
msgstr "Versión del servidor: %s; Nombre del equipo: %s\n"
@@ -628,25 +634,32 @@ msgid "E Ifce Prot %-*s %-20s Domain\n"
msgstr "E Ifaz Prot %-*s %-20s Dominio\n"
#. We have been disconnected, so let reconnect
-#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163
+#: ../avahi-utils/avahi-browse.c:585
+#: ../avahi-utils/avahi-publish.c:163
#, c-format
msgid "Disconnected, reconnecting ...\n"
msgstr "Desconectado; volviendo a conectar…\n"
-#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829
-#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386
-#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160
+#: ../avahi-utils/avahi-browse.c:599
+#: ../avahi-utils/avahi-browse.c:829
+#: ../avahi-utils/avahi-publish.c:170
+#: ../avahi-utils/avahi-publish.c:386
+#: ../avahi-utils/avahi-resolve.c:272
+#: ../avahi-utils/avahi-set-host-name.c:160
#, c-format
msgid "Failed to create client object: %s\n"
msgstr "Falló al crear el objeto cliente: %s\n"
-#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175
-#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59
+#: ../avahi-utils/avahi-browse.c:604
+#: ../avahi-utils/avahi-publish.c:175
+#: ../avahi-utils/avahi-resolve.c:143
+#: ../avahi-utils/avahi-set-host-name.c:59
#, c-format
msgid "Client failure, exiting: %s\n"
msgstr "Fallo del cliente; saliendo: %s\n"
-#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206
+#: ../avahi-utils/avahi-browse.c:623
+#: ../avahi-utils/avahi-publish.c:206
#, c-format
msgid "Waiting for daemon ...\n"
msgstr "Esperando al demonio…\n"
@@ -659,8 +672,7 @@ msgid ""
" -a --all Show all services, regardless of the type\n"
" -d --domain=DOMAIN The domain to browse in\n"
" -v --verbose Enable verbose mode\n"
-" -t --terminate Terminate after dumping a more or less complete "
-"list\n"
+" -t --terminate Terminate after dumping a more or less complete list\n"
" -c --cache Terminate after dumping all entries from the cache\n"
" -l --ignore-local Ignore local services\n"
" -r --resolve Resolve services found\n"
@@ -670,13 +682,11 @@ msgstr ""
" -h --help Muestra esta ayuda\n"
" -V --version Muestra la versión\n"
" -D --browse-domains Explora dominios de búsqueda en lugar de servicios\n"
-" -a --all Muestra todos los servicios independientemente del "
-"tipo.\n"
+" -a --all Muestra todos los servicios independientemente del tipo.\n"
" -d --domain=DOMAIN El dominio que examinar\n"
" -v --verbose Activa el modo detallado\n"
" -t --terminate Terminar al volcar una lista más o menos completa\n"
-" -c --cache Terminar después de volcar todas las entradas de la "
-"cache\n"
+" -c --cache Terminar después de volcar todas las entradas de la cache\n"
" -l --ignore-local Ignorar los servicios locales\n"
" -r --resolve Resolver servicios encontrados\n"
" -f --no-fail No fallar si el demonio no está disponible\n"
@@ -690,13 +700,16 @@ msgstr ""
" -k --no-db-lookup No busca los tipos de servicios\n"
" -b --dump-db Vuelva la base de datos de tipos de servicios\n"
-#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219
+#: ../avahi-utils/avahi-browse.c:766
+#: ../avahi-utils/avahi-resolve.c:219
#, c-format
msgid "Too few arguments\n"
msgstr "Muy pocos argumentos\n"
-#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378
-#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152
+#: ../avahi-utils/avahi-browse.c:821
+#: ../avahi-utils/avahi-publish.c:378
+#: ../avahi-utils/avahi-resolve.c:264
+#: ../avahi-utils/avahi-set-host-name.c:152
#, c-format
msgid "Failed to create simple poll object.\n"
msgstr "Falló al crear un objeto de encuesta simple.\n"
@@ -742,7 +755,7 @@ msgid "Host name conflict\n"
msgstr "Conflicto de nombres de equipo\n"
#: ../avahi-utils/avahi-publish.c:216
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options] %s <name> <type> <port> [<txt ...>]\n"
"%s [options] %s <host-name> <address>\n"
@@ -754,8 +767,7 @@ msgid ""
" -v --verbose Enable verbose mode\n"
" -d --domain=DOMAIN Domain to publish service in\n"
" -H --host=DOMAIN Host where service resides\n"
-" --subtype=SUBTYPE An additional subtype to register this service "
-"with\n"
+" --subtype=SUBTYPE An additional subtype to register this service with\n"
" -R --no-reverse Do not publish reverse entry with address\n"
" -f --no-fail Don't fail if the daemon is not available\n"
msgstr ""
@@ -766,15 +778,15 @@ msgstr ""
" -V --version Mostrar la versión\n"
" -s --service Publicar el servicio\n"
" -a --address Publicar la dirección\n"
-" -v --vervose Activar el modo detallado\n"
+" -v --verbose Activar el modo detallado\n"
" -d --domain=DOMINIO Dominio donde publicar el servicio\n"
" -H --host=DOMINIO Equipo donde reside el servicio\n"
-" --sbtype=SUBTIPO Un subtipo adicional con el que registrar este "
-"servicio\n"
-" -f --no-fail No fallar en caso que el demonio no esté "
-"disponible\n"
+" --subtype=SUBTIPO Un subtipo adicional con el que registrar este servicio\n"
+" -R --no-reverse No publicar entrada de reverso con esta dirección\n"
+" -f --no-fail No fallar en caso que el demonio no esté disponible\n"
-#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318
+#: ../avahi-utils/avahi-publish.c:303
+#: ../avahi-utils/avahi-publish.c:318
#, c-format
msgid "Bad number of arguments\n"
msgstr "Número de argumentos incorrecto\n"
@@ -784,7 +796,8 @@ msgstr "Número de argumentos incorrecto\n"
msgid "Failed to parse port number: %s\n"
msgstr "Falló al analizar el número de puerto: %s\n"
-#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246
+#: ../avahi-utils/avahi-publish.c:361
+#: ../avahi-utils/avahi-resolve.c:246
#, c-format
msgid "No command specified.\n"
msgstr "No se especificó ningún comando.\n"
@@ -824,7 +837,8 @@ msgstr ""
" -6 Buscar dirección IPv6\n"
" -4 Buscar dirección IPv4\n"
-#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181
+#: ../avahi-utils/avahi-resolve.c:299
+#: ../avahi-utils/avahi-set-host-name.c:181
#, c-format
msgid "Failed to create host name resolver: %s\n"
msgstr "Falló al crear el resolutor de nombres de equipo: %s\n"
@@ -863,3 +877,4 @@ msgstr "Número de argumentos incorrecto; se esperaba exactamente uno.\n"
#, c-format
msgid "Host name successfully changed to %s\n"
msgstr "El nombre del equipo se ha cambiado con éxito a %s\n"
+
diff --git a/po/pl.po b/po/pl.po
index 8bc6703..b220c23 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,10 +5,10 @@ msgid ""
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 22:49+0200\n"
-"PO-Revision-Date: 2009-09-27 14:02+0200\n"
+"POT-Creation-Date: 2010-06-29 08:26+0000\n"
+"PO-Revision-Date: 2010-06-29 10:36+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <fedora-trans-pl@redhat.com>\n"
+"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgstr "Brak dostępnych odpowiednich protokołów sieciowych"
#: ../avahi-common/error.c:36
msgid "Invalid DNS TTL"
-msgstr "Nieprawidłowe TTL DNS"
+msgstr "Nieprawidłowe TTL serwera DNS"
#: ../avahi-common/error.c:37
msgid "Resource record key is pattern"
@@ -95,7 +95,7 @@ msgstr "Błąd systemu operacyjnego"
#: ../avahi-common/error.c:52
msgid "Access denied"
-msgstr "Zabroniono dostęp"
+msgstr "Brak dostępu"
#: ../avahi-common/error.c:53
msgid "Invalid operation"
@@ -103,11 +103,11 @@ msgstr "Nieprawidłowe działanie"
#: ../avahi-common/error.c:54
msgid "An unexpected D-Bus error occured"
-msgstr "Wystąpił nieoczekiwany błąd D-Bus"
+msgstr "Wystąpił nieoczekiwany błąd usługi D-Bus"
#: ../avahi-common/error.c:55
msgid "Daemon connection failed"
-msgstr "Połączenie się z demonem nie powiodło się"
+msgstr "Połączenie z demonem nie powiodło się"
#: ../avahi-common/error.c:56
msgid "Memory exhausted"
@@ -252,41 +252,35 @@ msgstr "Przeglądanie usług Zeroconf dostępnych w sieci"
#: ../avahi-python/avahi-discover/avahi-discover.py:224
msgid "TXT"
-msgstr ""
+msgstr "Tekst"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "TXT Data:"
-msgstr "Dane tekstowe"
+msgstr "Dane tekstowe:"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "empty"
-msgstr "Jest puste"
+msgstr "puste"
#: ../avahi-python/avahi-discover/avahi-discover.py:228
-#, fuzzy
msgid "Service Type:"
-msgstr "Typ usługi"
+msgstr "Typ usługi:"
#: ../avahi-python/avahi-discover/avahi-discover.py:229
-#, fuzzy
msgid "Service Name:"
-msgstr "Nazwa usługi"
+msgstr "Nazwa usługi:"
#: ../avahi-python/avahi-discover/avahi-discover.py:230
-#, fuzzy
msgid "Domain Name:"
-msgstr "Domena"
+msgstr "Nazwa domeny:"
#: ../avahi-python/avahi-discover/avahi-discover.py:231
msgid "Interface:"
-msgstr ""
+msgstr "Interfejs:"
#: ../avahi-python/avahi-discover/avahi-discover.py:232
-#, fuzzy
msgid "Address:"
-msgstr "Adres"
+msgstr "Adres:"
#: ../avahi-ui/avahi-ui.c:185
msgid "Browse Service Types"
@@ -353,23 +347,22 @@ msgid "The TXT data of the resolved service"
msgstr "Dane tekstowe rozwiązanej usługi"
#: ../avahi-ui/avahi-ui.c:230
-#, fuzzy
msgid "Resolve Service"
-msgstr "Rozwianie usługi"
+msgstr "Rozwiązywanie usługi"
#: ../avahi-ui/avahi-ui.c:230
msgid "Resolve the selected service automatically before returning"
-msgstr ""
+msgstr "Rozwiązywanie wybranej usługi automatycznie przed zwracaniem"
#: ../avahi-ui/avahi-ui.c:236
-#, fuzzy
msgid "Resolve Service Host Name"
-msgstr "Rozwiązanie nazwy komputera usługi"
+msgstr "Rozwiązywanie nazwy komputera usługi"
#: ../avahi-ui/avahi-ui.c:236
msgid ""
"Resolve the host name of the selected service automatically before returning"
msgstr ""
+"Rozwiązywanie nazwy komputera wybranej usługi automatycznie przed zwracaniem"
#: ../avahi-ui/avahi-ui.c:242
msgid "Address family"
@@ -519,7 +512,7 @@ msgstr "Wybór serwera SSH"
#: ../avahi-ui/bssh.c:185
#, c-format
msgid "Connecting to '%s' ...\n"
-msgstr "Łączenie się z \"%s\"...\n"
+msgstr "Łączenie z \"%s\"...\n"
#: ../avahi-ui/bssh.c:240
#, c-format
@@ -638,7 +631,7 @@ msgstr "Utworzenie obiektu klienta nie powiodło się: %s\n"
#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59
#, c-format
msgid "Client failure, exiting: %s\n"
-msgstr "Klient nie powiódł się, kończenie pracy: %s\n"
+msgstr "Klient nie powiódł się, kończenie działania: %s\n"
#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206
#, c-format
@@ -737,7 +730,7 @@ msgid "Host name conflict\n"
msgstr "Konflikt nazw komputerów\n"
#: ../avahi-utils/avahi-publish.c:216
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options] %s <name> <type> <port> [<txt ...>]\n"
"%s [options] %s <host-name> <address>\n"
@@ -765,6 +758,7 @@ msgstr ""
" -d --domain=DOMENA Domena, w której opublikować usługę\n"
" -H --host=DOMENA Komputer, na jakim znajduje się usługa\n"
" --subtype=PODTYP Dodatkowy podtyp do zarejestrowania tej usługi\n"
+" -R --no-reverse Nie publikuje odwróconego wpisu z adresem\n"
" -f --no-fail Nie wyłącza, jeśli demon nie jest dostępny\n"
#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318
diff --git a/po/uk.po b/po/uk.po
index c826cbe..86c01c4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,21 +1,21 @@
-# Free Software Foundation, Inc (C) 2009
+# Free Software Foundation, Inc (C) 2009
# This file is distributed under the same license as the avahi package.
#
-# Yuri Chornoivan <yurchor@ukr.net>, 2009.
+# Yuri Chornoivan <yurchor@ukr.net>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: avahi.master-tx.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 22:49+0200\n"
-"PO-Revision-Date: 2009-09-05 16:45+0300\n"
+"POT-Creation-Date: 2010-06-30 23:54+0000\n"
+"PO-Revision-Date: 2010-07-01 07:30+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation@linux.org.ua>\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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../avahi-common/error.c:30
msgid "OK"
@@ -257,41 +257,35 @@ msgstr ""
#: ../avahi-python/avahi-discover/avahi-discover.py:224
msgid "TXT"
-msgstr ""
+msgstr "TXT"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "TXT Data:"
-msgstr "Дані TXT"
+msgstr "Дані TXT:"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "empty"
msgstr "порожній"
#: ../avahi-python/avahi-discover/avahi-discover.py:228
-#, fuzzy
msgid "Service Type:"
-msgstr "Тип служби"
+msgstr "Тип служби:"
#: ../avahi-python/avahi-discover/avahi-discover.py:229
-#, fuzzy
msgid "Service Name:"
-msgstr "Назва служби"
+msgstr "Назва служби:"
#: ../avahi-python/avahi-discover/avahi-discover.py:230
-#, fuzzy
msgid "Domain Name:"
-msgstr "Домен"
+msgstr "Назва домену:"
#: ../avahi-python/avahi-discover/avahi-discover.py:231
msgid "Interface:"
-msgstr ""
+msgstr "Інтерфейс:"
#: ../avahi-python/avahi-discover/avahi-discover.py:232
-#, fuzzy
msgid "Address:"
-msgstr "Адреса"
+msgstr "Адреса:"
#: ../avahi-ui/avahi-ui.c:185
msgid "Browse Service Types"
@@ -358,23 +352,21 @@ msgid "The TXT data of the resolved service"
msgstr "Дані TXT виявленої служби"
#: ../avahi-ui/avahi-ui.c:230
-#, fuzzy
msgid "Resolve Service"
msgstr "Визначити службу"
#: ../avahi-ui/avahi-ui.c:230
msgid "Resolve the selected service automatically before returning"
-msgstr ""
+msgstr "Визначити параметри вибраної служби автоматично перед поверненням"
#: ../avahi-ui/avahi-ui.c:236
-#, fuzzy
msgid "Resolve Service Host Name"
msgstr "Визначити назву вузла служби"
#: ../avahi-ui/avahi-ui.c:236
msgid ""
"Resolve the host name of the selected service automatically before returning"
-msgstr ""
+msgstr "Визначити назву вузла вибраної служби автоматично перед поверненням"
#: ../avahi-ui/avahi-ui.c:242
msgid "Address family"
@@ -740,7 +732,7 @@ msgid "Host name conflict\n"
msgstr "Конфлікт назв вузлів\n"
#: ../avahi-utils/avahi-publish.c:216
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options] %s <name> <type> <port> [<txt ...>]\n"
"%s [options] %s <host-name> <address>\n"
@@ -768,6 +760,7 @@ msgstr ""
" -d --domain=ДОМЕН Домен для оприлюднення служби\n"
" -H --host=ДОМЕН Вузол, на якому працює служба\n"
" --subtype=ПІДТИП Додатковий підтип для реєстрації цієї служби\n"
+" -R --no-reverse Не оприлюднювати зворотний запис разом з адресою\n"
" -f --no-fail Не завершувати роботу, якщо не вдасться отримати "
"доступ до фонової служби\n"
@@ -861,3 +854,4 @@ msgstr "Некоректна кількість аргументів, слід
#, c-format
msgid "Host name successfully changed to %s\n"
msgstr "Назву вузла успішно змінено на %s\n"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 60bafa9..a3869dc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_CN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-28 22:49+0200\n"
-"PO-Revision-Date: 2010-03-07 02:27+0800\n"
-"Last-Translator: Jake Li <gnozil@gmail.com>\n"
+"POT-Creation-Date: 2010-06-29 08:42+0000\n"
+"PO-Revision-Date: 2010-07-01 17:45+0700\n"
+"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
"Language-Team: 简体中文 <kde-china@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -255,41 +255,35 @@ msgstr "浏览网络内的Zeroconf服务"
#: ../avahi-python/avahi-discover/avahi-discover.py:224
msgid "TXT"
-msgstr ""
+msgstr "TXT"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "TXT Data:"
-msgstr "TXT数据"
+msgstr "TXT 数据:"
#: ../avahi-python/avahi-discover/avahi-discover.py:226
-#, fuzzy
msgid "empty"
msgstr "为空"
#: ../avahi-python/avahi-discover/avahi-discover.py:228
-#, fuzzy
msgid "Service Type:"
-msgstr "服务类型"
+msgstr "服务类型:"
#: ../avahi-python/avahi-discover/avahi-discover.py:229
-#, fuzzy
msgid "Service Name:"
-msgstr "服务名称"
+msgstr "服务名称:"
#: ../avahi-python/avahi-discover/avahi-discover.py:230
-#, fuzzy
msgid "Domain Name:"
-msgstr "域"
+msgstr "域名称:"
#: ../avahi-python/avahi-discover/avahi-discover.py:231
msgid "Interface:"
-msgstr ""
+msgstr "接口:"
#: ../avahi-python/avahi-discover/avahi-discover.py:232
-#, fuzzy
msgid "Address:"
-msgstr "地址"
+msgstr "地址:"
#: ../avahi-ui/avahi-ui.c:185
msgid "Browse Service Types"
@@ -315,7 +309,8 @@ msgstr "服务类型"
msgid "The service type of the selected service"
msgstr "选定服务的服务类型"
-#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1019
+#: ../avahi-ui/avahi-ui.c:202
+#: ../avahi-ui/avahi-ui.c:1019
msgid "Service Name"
msgstr "服务名称"
@@ -356,23 +351,20 @@ msgid "The TXT data of the resolved service"
msgstr "已解析服务的TXT数据"
#: ../avahi-ui/avahi-ui.c:230
-#, fuzzy
msgid "Resolve Service"
-msgstr "解析服务"
+msgstr "解析服务:"
#: ../avahi-ui/avahi-ui.c:230
msgid "Resolve the selected service automatically before returning"
-msgstr ""
+msgstr "回转前自动解析选定的服务"
#: ../avahi-ui/avahi-ui.c:236
-#, fuzzy
msgid "Resolve Service Host Name"
-msgstr "解析服务主机名"
+msgstr "解析服务主机名:"
#: ../avahi-ui/avahi-ui.c:236
-msgid ""
-"Resolve the host name of the selected service automatically before returning"
-msgstr ""
+msgid "Resolve the host name of the selected service automatically before returning"
+msgstr "回转前自动解析选定服务的主机名"
#: ../avahi-ui/avahi-ui.c:242
msgid "Address family"
@@ -397,8 +389,10 @@ msgstr "Avahi 解析器失败:%s"
msgid "Browsing for service type %s in domain %s failed: %s"
msgstr "浏览服务类型 %s 于域 %s 失败:%s"
-#: ../avahi-ui/avahi-ui.c:517 ../avahi-utils/avahi-browse.c:168
-#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178
+#: ../avahi-ui/avahi-ui.c:517
+#: ../avahi-utils/avahi-browse.c:168
+#: ../avahi-utils/avahi-browse.c:169
+#: ../avahi-utils/avahi-browse.c:178
#: ../avahi-utils/avahi-browse.c:179
msgid "n/a"
msgstr "不可用"
@@ -450,7 +444,8 @@ msgstr "创建域浏览器失败:%s"
msgid "Change domain"
msgstr "更改域"
-#: ../avahi-ui/avahi-ui.c:1027 ../avahi-ui/avahi-ui.c:1158
+#: ../avahi-ui/avahi-ui.c:1027
+#: ../avahi-ui/avahi-ui.c:1158
msgid "Browsing..."
msgstr "正在浏览..."
@@ -462,11 +457,13 @@ msgstr "正在初始化..."
msgid "Location"
msgstr "位置"
-#: ../avahi-ui/avahi-ui.c:1145 ../avahi-utils/avahi-browse.c:553
+#: ../avahi-ui/avahi-ui.c:1145
+#: ../avahi-utils/avahi-browse.c:553
msgid "Name"
msgstr "名称"
-#: ../avahi-ui/avahi-ui.c:1150 ../avahi-utils/avahi-browse.c:553
+#: ../avahi-ui/avahi-ui.c:1150
+#: ../avahi-utils/avahi-browse.c:553
msgid "Type"
msgstr "类型"
@@ -493,7 +490,8 @@ msgstr ""
" -S --shell 浏览SSH和VNC\n"
" -d --domain=DOMAIN 要浏览的域名\n"
-#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775
+#: ../avahi-ui/bssh.c:101
+#: ../avahi-utils/avahi-browse.c:775
#, c-format
msgid "Too many arguments\n"
msgstr "参数太多\n"
@@ -559,7 +557,8 @@ msgstr ":当前所有\n"
msgid ": Cache exhausted\n"
msgstr ":缓存用尽\n"
-#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261
+#: ../avahi-utils/avahi-browse.c:239
+#: ../avahi-utils/avahi-browse.c:261
#, c-format
msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"
msgstr "解析类型“%s”的服务“%s”于域“%s”失败:%s\n"
@@ -589,21 +588,27 @@ msgstr "avahi_service_type_browser_new() 失败:%s\n"
msgid "avahi_domain_browser_new() failed: %s\n"
msgstr "avahi_domain_browser_new() 失败:%s\n"
-#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394
-#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168
+#: ../avahi-utils/avahi-browse.c:535
+#: ../avahi-utils/avahi-publish.c:394
+#: ../avahi-utils/avahi-resolve.c:280
+#: ../avahi-utils/avahi-set-host-name.c:168
#, c-format
msgid "Failed to query version string: %s\n"
msgstr "查询版本字符串失败:%s\n"
-#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399
-#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173
+#: ../avahi-utils/avahi-browse.c:540
+#: ../avahi-utils/avahi-publish.c:399
+#: ../avahi-utils/avahi-resolve.c:285
+#: ../avahi-utils/avahi-set-host-name.c:173
#: ../avahi-utils/avahi-set-host-name.c:189
#, c-format
msgid "Failed to query host name: %s\n"
msgstr "查询主机名失败:%s\n"
-#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403
-#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177
+#: ../avahi-utils/avahi-browse.c:544
+#: ../avahi-utils/avahi-publish.c:403
+#: ../avahi-utils/avahi-resolve.c:289
+#: ../avahi-utils/avahi-set-host-name.c:177
#, c-format
msgid "Server version: %s; Host name: %s\n"
msgstr "服务器版本:%s;主机名:%s\n"
@@ -623,25 +628,32 @@ msgid "E Ifce Prot %-*s %-20s Domain\n"
msgstr "E Ifce Prot %-*s %-20s 域\n"
#. We have been disconnected, so let reconnect
-#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163
+#: ../avahi-utils/avahi-browse.c:585
+#: ../avahi-utils/avahi-publish.c:163
#, c-format
msgid "Disconnected, reconnecting ...\n"
msgstr "已断开,正在重新连接 ...\n"
-#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829
-#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386
-#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160
+#: ../avahi-utils/avahi-browse.c:599
+#: ../avahi-utils/avahi-browse.c:829
+#: ../avahi-utils/avahi-publish.c:170
+#: ../avahi-utils/avahi-publish.c:386
+#: ../avahi-utils/avahi-resolve.c:272
+#: ../avahi-utils/avahi-set-host-name.c:160
#, c-format
msgid "Failed to create client object: %s\n"
msgstr "创建客户端对象失败:%s\n"
-#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175
-#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59
+#: ../avahi-utils/avahi-browse.c:604
+#: ../avahi-utils/avahi-publish.c:175
+#: ../avahi-utils/avahi-resolve.c:143
+#: ../avahi-utils/avahi-set-host-name.c:59
#, c-format
msgid "Client failure, exiting: %s\n"
msgstr "客户端失败,退出:%s\n"
-#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206
+#: ../avahi-utils/avahi-browse.c:623
+#: ../avahi-utils/avahi-publish.c:206
#, c-format
msgid "Waiting for daemon ...\n"
msgstr "正在等待 daemon ...\n"
@@ -654,8 +666,7 @@ msgid ""
" -a --all Show all services, regardless of the type\n"
" -d --domain=DOMAIN The domain to browse in\n"
" -v --verbose Enable verbose mode\n"
-" -t --terminate Terminate after dumping a more or less complete "
-"list\n"
+" -t --terminate Terminate after dumping a more or less complete list\n"
" -c --cache Terminate after dumping all entries from the cache\n"
" -l --ignore-local Ignore local services\n"
" -r --resolve Resolve services found\n"
@@ -683,13 +694,16 @@ msgstr ""
" -k --no-db-lookup 不查询服务类型\n"
" -b --dump-db 导出服务类型数据库\n"
-#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219
+#: ../avahi-utils/avahi-browse.c:766
+#: ../avahi-utils/avahi-resolve.c:219
#, c-format
msgid "Too few arguments\n"
msgstr "过少的参数\n"
-#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378
-#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152
+#: ../avahi-utils/avahi-browse.c:821
+#: ../avahi-utils/avahi-publish.c:378
+#: ../avahi-utils/avahi-resolve.c:264
+#: ../avahi-utils/avahi-set-host-name.c:152
#, c-format
msgid "Failed to create simple poll object.\n"
msgstr "创建简单查询对象失败。\n"
@@ -735,7 +749,7 @@ msgid "Host name conflict\n"
msgstr "主机名冲突\n"
#: ../avahi-utils/avahi-publish.c:216
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s [options] %s <name> <type> <port> [<txt ...>]\n"
"%s [options] %s <host-name> <address>\n"
@@ -747,8 +761,7 @@ msgid ""
" -v --verbose Enable verbose mode\n"
" -d --domain=DOMAIN Domain to publish service in\n"
" -H --host=DOMAIN Host where service resides\n"
-" --subtype=SUBTYPE An additional subtype to register this service "
-"with\n"
+" --subtype=SUBTYPE An additional subtype to register this service with\n"
" -R --no-reverse Do not publish reverse entry with address\n"
" -f --no-fail Don't fail if the daemon is not available\n"
msgstr ""
@@ -763,9 +776,10 @@ msgstr ""
" -d --domain=DOMAIN 要发布服务的域\n"
" -H --host=DOMAIN 服务宿属的主机\n"
" --subtype=SUBTYPE 用于注册此服务的额外子类型\n"
-" -f --no-fail 如果 daemon 不可用也不中断\n"
+" -R --no-reverse 不发布带地址的反转条目 -f --no-fail 如果 daemon 不可用也不中断\n"
-#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318
+#: ../avahi-utils/avahi-publish.c:303
+#: ../avahi-utils/avahi-publish.c:318
#, c-format
msgid "Bad number of arguments\n"
msgstr "无效的参数个数\n"
@@ -775,7 +789,8 @@ msgstr "无效的参数个数\n"
msgid "Failed to parse port number: %s\n"
msgstr "解析端口号失败:%s\n"
-#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246
+#: ../avahi-utils/avahi-publish.c:361
+#: ../avahi-utils/avahi-resolve.c:246
#, c-format
msgid "No command specified.\n"
msgstr "没有指定的命令。\n"
@@ -815,7 +830,8 @@ msgstr ""
" -6 检查 IPv6 地址\n"
" -4 检查 IPv4 地址\n"
-#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181
+#: ../avahi-utils/avahi-resolve.c:299
+#: ../avahi-utils/avahi-set-host-name.c:181
#, c-format
msgid "Failed to create host name resolver: %s\n"
msgstr "创建主机名解析器失败:%s\n"
@@ -854,3 +870,4 @@ msgstr "无效的参数个数,只接受一个参数。\n"
#, c-format
msgid "Host name successfully changed to %s\n"
msgstr "主机名成功更改为 %s\n"
+