[network-manager-netbook: 4/4] Merge 'master' branch.
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [network-manager-netbook: 4/4] Merge 'master' branch.
- Date: Tue, 10 Nov 2009 10:06:53 +0000 (UTC)
commit b3e599f0a3537e174904eccd45e6e7021aa561ef
Merge: 4cacf38... d32da29...
Author: Tambet Ingo <tambet gmail com>
Date: Tue Nov 10 11:59:17 2009 +0200
Merge 'master' branch.
Conflicts:
po/LINGUAS
po/de.po
po/es.po
po/sv.po
Sorry if I messed up someones translations.
po/LINGUAS | 3 +
po/de.po | 143 +++++++++++++------
po/es.po | 121 ++++++++++++-----
po/et.po | 150 +++++----------------
po/gu.po | 445 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/id.po | 446 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/pa.po | 445 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/sv.po | 117 +++++++++++-----
8 files changed, 1634 insertions(+), 236 deletions(-)
---
diff --cc po/LINGUAS
index 0ebae17,657cfd1..8628597
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@@ -8,7 -6,8 +8,9 @@@ e
et
fi
fr
+hu
+ gu
+ id
it
ja
ko
diff --cc po/de.po
index b076339,707aecf..02cb5a1
--- a/po/de.po
+++ b/po/de.po
@@@ -1,28 -1,40 +1,41 @@@
- # Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
- # This file is distributed under the same license as the package.
+ # German translation of the NetworkManager netbook.
+ # Copyright (C) 2005 Dan Williams <dcbw redhat com>
+ # This file is distributed under the same license as the NetworkManager package.
+ # Hendrik Brandt <heb gnome-de org>, 2004, 2005.
+ # Frank Arnold <frank scirocco-5v-turbo de>, 2005.
+ # Hendrik Richter <hendrikr gnome org>, 2006.
+ # Jochen Skulj <jochen jochenskulj de>, 2008.
+ # Tobias Wolf <towolf gmx net>, 2008.
+ # Hauke Mehrtens <hauke hauke-m de>, 2008.
+ # Mario Blättermann <mariobl gnome org>, 2008, 2009.
+ # Stefan Horning <stefan hornings de>, 2009.
+ # Christian Kirbach <Christian Kirbach googlemail com>, 2009.
+ # Tambet Ingo <tambet novell com>, 2009.
++# Novell Language <language novell com>
#
msgid ""
msgstr ""
- "Project-Id-Version: upstream-translations.network-manager\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-09-08 14:16+0100\n"
- "PO-Revision-Date: 2009-09-16 15:15\n"
- "Last-Translator: Novell Language <language novell com>\n"
+ "Project-Id-Version: network-manager-netbook 0.2\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+ "product=NetworkManager&component=network-manager-netbook\n"
+ "POT-Creation-Date: 2009-10-10 13:20+0000\n"
+ "PO-Revision-Date: 2009-10-16 18:16+0100\n"
+ "Last-Translator: Mario Blättermann <mariobl gnome org>\n"
-"Language-Team: \n"
+"Language-Team: Novell Language <language novell com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: ../src/nmn-connection-details.c:101
+ #: ../src/nmn-connection-details.c:104
msgid "(none)"
-msgstr "(keine)"
+msgstr "(ohne)"
#. Connect by:
- #: ../src/nmn-connection-details.c:477
+ #: ../src/nmn-connection-details.c:475
msgid "Connect by:"
-msgstr "Verbinden:"
+msgstr "Verbinden durch:"
- #: ../src/nmn-connection-details.c:480
+ #: ../src/nmn-connection-details.c:478
msgid "DHCP"
msgstr "DHCP"
@@@ -30,27 -42,27 +43,27 @@@
msgid "Manual"
msgstr "Manuell"
- #: ../src/nmn-connection-details.c:490
+ #: ../src/nmn-connection-details.c:488
msgid "Link Local"
-msgstr "Link-Local"
+msgstr "Link Local"
#. Address
- #: ../src/nmn-connection-details.c:498
+ #: ../src/nmn-connection-details.c:496
msgid "IP Address:"
msgstr "IP-Adresse:"
#. Netmask
- #: ../src/nmn-connection-details.c:507
+ #: ../src/nmn-connection-details.c:505
msgid "Subnet mask:"
-msgstr "Subnetz-Maske:"
+msgstr "Teilnetzmaske:"
#. Gateway
- #: ../src/nmn-connection-details.c:516
+ #: ../src/nmn-connection-details.c:514
msgid "Router:"
-msgstr "Vorgaberoute:"
+msgstr "Router:"
#. DNS
- #: ../src/nmn-connection-details.c:525
+ #: ../src/nmn-connection-details.c:523
msgid "DNS:"
msgstr "DNS:"
@@@ -72,23 -84,23 +85,23 @@@ msgstr "An
msgid "Off"
msgstr "Aus"
- #: ../src/nmn-item.c:121
+ #: ../src/nmn-network-item.c:254
msgid "Disconnected"
-msgstr "Verbindung getrennt"
+msgstr "Nicht verbunden"
- #: ../src/nmn-item.c:122 ../src/nmn-item.c:403
+ #: ../src/nmn-network-item.c:255 ../src/nmn-network-item.c:695
msgid "Connect"
-msgstr "Verbinden"
+msgstr "Verbinde"
- #: ../src/nmn-item.c:125
+ #: ../src/nmn-network-item.c:258
msgid "Connecting..."
- msgstr "Verbinde..."
+ msgstr "Verbindung wird aufgebaut â?¦"
- #: ../src/nmn-item.c:126 ../src/nmn-item.c:130
+ #: ../src/nmn-network-item.c:259 ../src/nmn-network-item.c:263
msgid "Disconnect"
-msgstr "Trennen"
+msgstr "Getrennt"
- #: ../src/nmn-item.c:129
+ #: ../src/nmn-network-item.c:262
msgid "Connected"
msgstr "Verbunden"
@@@ -248,11 -297,23 +293,23 @@@ msgstr "_Netzwerkname:
#: ../src/wireless-security.ui.h:6
msgid "_Wireless Security:"
-msgstr "Funknetzwerkk_arte:"
+msgstr "_Drahtloses Netzwerk:"
#: ../src/wireless-security/ca-nag-dialog.ui.h:1
- msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks. Would you like to choose a Certificate Authority certificate?"
- msgstr "<span weight=\"bold\" size=\"larger\">Kein Zertifikat einer Zertifizierungsstelle ausgewählt</span>\n\nWenn kein Zertifikat einer Zertifizierungsstelle (CA) verwendet wird, kann dies zu unsicheren, nicht autorisierten drahtlosen Netzwerken führen. Möchten Sie ein Zertifikat einer Zertifizierungsstelle auswählen?"
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+ "chosen</span>\n"
+ "\n"
+ "Not using a Certificate Authority (CA) certificate can result in connections "
+ "to insecure, rogue wireless networks. Would you like to choose a Certificate "
+ "Authority certificate?"
+ msgstr ""
+ "<span weight=\"bold\" size=\"larger\">Es wurde kein CA-Zertifikat ausgewählt</"
+ "span>\n"
+ "\n"
+ "Wenn Sie kein CA-Zertifikat verwenden, kann dies zu unsicheren Verbindungen "
+ "oder schadhaften Funknetzwerken führen. Möchten Sie ein CA-Zertifikat "
+ "auswählen?"
#: ../src/wireless-security/ca-nag-dialog.ui.h:4
msgid "Choose CA Certificate"
diff --cc po/es.po
index 24fb5ee,cc5b2ed..03aac38
--- a/po/es.po
+++ b/po/es.po
@@@ -1,41 -1,52 +1,48 @@@
- # Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg
- # This file is distributed under the same license as the package.
+ # Antonio Ognio <antonio linux org pe>, 2004.
-# translation of network-manager-netbook to Español
-# translation of NetworkManager.po to
-# Traducción de NetworkManager al español.
-# Copyright (C) Spanish translation for NetworkManager
-# This file is distributed under the same license as the NetworkManager package.
-#
+ # Francisco Javier F. Serrador <serrador cvs gnome org>, 2004, 2005, 2006.
+ # Lucas Vieites Fariña <lucas asixinformatica com>, 2005, 2006.
+ # Jorge González <jorgegonz svn gnome org>, 2007, 200, 2009.
+ # Tambet Ingo <tambet novell com>, 2009.
+ # Jorge González <jorgegonz svn gnome org>, 2009.
++# Novell Language <language novell com>
+#
+ #, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: upstream-translations.network-manager\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-09-08 14:16+0100\n"
- "PO-Revision-Date: 2009-09-16 15:16\n"
- "Last-Translator: Novell Language <language novell com>\n"
- "Language-Team: Novell Language <language novell com>\n"
+ "Project-Id-Version: network-manager-netbook 0.2\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+ "product=NetworkManager&component=network-manager-netbook\n"
+ "POT-Creation-Date: 2009-10-10 13:20+0000\n"
+ "PO-Revision-Date: 2009-11-02 11:57+0100\n"
+ "Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
+ "Language-Team: Español <gnome-es-list gnome org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
- #: ../src/nmn-connection-details.c:101
+ #: ../src/nmn-connection-details.c:104
msgid "(none)"
-msgstr "(ninguna)"
+msgstr "(ninguno)"
#. Connect by:
- #: ../src/nmn-connection-details.c:477
+ #: ../src/nmn-connection-details.c:475
msgid "Connect by:"
-msgstr "Conectar:"
+msgstr "Conectar mediante:"
- #: ../src/nmn-connection-details.c:480
+ #: ../src/nmn-connection-details.c:478
msgid "DHCP"
msgstr "DHCP"
- #: ../src/nmn-connection-details.c:485
+ #: ../src/nmn-connection-details.c:483
msgid "Manual"
-msgstr "Automático"
+msgstr "Manual"
- #: ../src/nmn-connection-details.c:490
+ #: ../src/nmn-connection-details.c:488
msgid "Link Local"
-msgstr "Enlace local"
+msgstr "Local del enlace"
#. Address
- #: ../src/nmn-connection-details.c:498
+ #: ../src/nmn-connection-details.c:496
msgid "IP Address:"
msgstr "Dirección IP:"
@@@ -45,12 -56,12 +52,12 @@@ msgid "Subnet mask:
msgstr "Máscara de subred:"
#. Gateway
- #: ../src/nmn-connection-details.c:516
+ #: ../src/nmn-connection-details.c:514
msgid "Router:"
-msgstr "Ruta predeterminada:"
+msgstr "Router:"
#. DNS
- #: ../src/nmn-connection-details.c:525
+ #: ../src/nmn-connection-details.c:523
msgid "DNS:"
msgstr "DNS:"
@@@ -248,11 -295,23 +283,23 @@@ msgstr "_Nombre de la red:
#: ../src/wireless-security.ui.h:6
msgid "_Wireless Security:"
-msgstr "_Seguridad inalámbrica:"
+msgstr "Seg_uridad inalámbrica:"
#: ../src/wireless-security/ca-nag-dialog.ui.h:1
- msgid "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate chosen</span>\n\nNot using a Certificate Authority (CA) certificate can result in connections to insecure, rogue wireless networks. Would you like to choose a Certificate Authority certificate?"
- msgstr "<span weight=\"bold\" size=\"larger\">No se ha elegido ningún certificado de una autoridad certificadora.</span>\n\nSi no se usa un certificado de una autoridad certificadora (CA) las conexiones podrÃan no ser seguras o se podrÃan producir accesos inalámbricos no autorizados. ¿Desea elegir un certificado de una autoridad certificadora?"
+ msgid ""
+ "<span weight=\"bold\" size=\"larger\">No Certificate Authority certificate "
+ "chosen</span>\n"
+ "\n"
+ "Not using a Certificate Authority (CA) certificate can result in connections "
+ "to insecure, rogue wireless networks. Would you like to choose a "
+ "Certificate Authority certificate?"
+ msgstr ""
+ "<span weight=\"bold\" size=\"larger\">No se ha elegido ningún certificado "
+ "CA</span>\n"
+ "\n"
+ "No usar un certificado de Certificate Authority (CA) puede dar lugar a "
+ "conexiones inseguras, redes inalámbricas promiscuas. ¿Quiere elegir un "
+ "certificado Certificate Authority?"
#: ../src/wireless-security/ca-nag-dialog.ui.h:4
msgid "Choose CA Certificate"
diff --cc po/sv.po
index 94f4854,9aaa0d3..0424819
--- a/po/sv.po
+++ b/po/sv.po
@@@ -3,12 -5,12 +5,12 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: upstream-translations.network-manager\n"
+ "Project-Id-Version: network-manager-netbook\n"
"Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2009-09-08 14:16+0100\n"
- "PO-Revision-Date: 2009-09-17 08:40\n"
- "Last-Translator: Novell Language <language novell com>\n"
+ "POT-Creation-Date: 2009-10-28 23:28+0100\n"
+ "PO-Revision-Date: 2009-10-28 23:32+0100\n"
+ "Last-Translator: Daniel Nylander <po danielnylander se>\n"
-"Language-Team: \n"
+"Language-Team: Novell Language <language novell com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@@ -26,11 -28,11 +28,11 @@@ msgstr "Anslut med:
msgid "DHCP"
msgstr "DHCP"
- #: ../src/nmn-connection-details.c:485
+ #: ../src/nmn-connection-details.c:483
msgid "Manual"
-msgstr "Manuell"
+msgstr "Manuellt"
- #: ../src/nmn-connection-details.c:490
+ #: ../src/nmn-connection-details.c:488
msgid "Link Local"
msgstr "Lokal länk"
@@@ -40,17 -42,17 +42,17 @@@ msgid "IP Address:
msgstr "IP-adress:"
#. Netmask
- #: ../src/nmn-connection-details.c:507
+ #: ../src/nmn-connection-details.c:505
msgid "Subnet mask:"
-msgstr "Subnätsmask:"
+msgstr "Nätmask:"
#. Gateway
- #: ../src/nmn-connection-details.c:516
+ #: ../src/nmn-connection-details.c:514
msgid "Router:"
-msgstr "Standardväg:"
+msgstr "Router:"
#. DNS
- #: ../src/nmn-connection-details.c:525
+ #: ../src/nmn-connection-details.c:523
msgid "DNS:"
msgstr "DNS:"
@@@ -72,11 -76,12 +76,12 @@@ msgstr "PÃ¥
msgid "Off"
msgstr "Av"
- #: ../src/nmn-item.c:121
+ #: ../src/nmn-network-item.c:254
msgid "Disconnected"
-msgstr "Frånkopplad"
+msgstr "Inte ansluten"
- #: ../src/nmn-item.c:122 ../src/nmn-item.c:403
+ #: ../src/nmn-network-item.c:255
+ #: ../src/nmn-network-item.c:695
msgid "Connect"
msgstr "Anslut"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
