diff --git a/configure.ac b/configure.ac index 5206bd07b5..72e47001a2 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ dnl Make sha1.c happy on big endian systems dnl AC_C_BIGENDIAN -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo or mandriva])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva or pardus])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") @@ -94,6 +94,7 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") + AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus") if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi @@ -105,7 +106,7 @@ if test "z$with_distro" = "z"; then exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -158,6 +159,11 @@ if test x"$with_distro" = xmandriva; then AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva]) fi +AM_CONDITIONAL(TARGET_PARDUS, test x"$with_distro" = xpardus) +if test x"$with_distro" = xpardus; then + AC_DEFINE(TARGET_PARDUS, 1, [Define if you have Pardus]) +fi + AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) AC_TRY_COMPILE([#ifndef __user #define __user diff --git a/introspection/nm-device-olpc-mesh.xml b/introspection/nm-device-olpc-mesh.xml index 7d326b6b95..c30ecfc602 100644 --- a/introspection/nm-device-olpc-mesh.xml +++ b/introspection/nm-device-olpc-mesh.xml @@ -7,12 +7,14 @@ The hardware address of the device. - + + The object path of the companion device. - + + The currently active channel. diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 5792add501..0451f2b0f6 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -95,8 +95,8 @@ nm_device_bt_get_hw_address (NMDeviceBt *device) priv = NM_DEVICE_BT_GET_PRIVATE (device); if (!priv->hw_address) { priv->hw_address = _nm_object_get_string_property (NM_OBJECT (device), - NM_DBUS_INTERFACE_DEVICE_WIRED, - DBUS_PROP_HW_ADDRESS); + NM_DBUS_INTERFACE_DEVICE_BLUETOOTH, + DBUS_PROP_HW_ADDRESS); } return priv->hw_address; diff --git a/po/de.po b/po/de.po index 3a6c861980..05709384d2 100644 --- a/po/de.po +++ b/po/de.po @@ -7,156 +7,83 @@ # Thomas Gier , 2007. # Andre Klapper , 2007. # Hauke Mehrtens , 2008. +# Christian Kirbach , 2009. # msgid "" msgstr "" "Project-Id-Version: NetworkManager HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-25 21:44+0100\n" -"PO-Revision-Date: 2008-11-22 00:08+0100\n" -"Last-Translator: Hauke Mehrtens \n" +"POT-Creation-Date: 2009-10-15 23:02+0200\n" +"PO-Revision-Date: 2009-10-14 11:27+0200\n" +"Last-Translator: Christian Kirbach \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:454 -#, c-format -msgid "error processing netlink message: %s" -msgstr "Fehler beim Verarbeiten der netlink Nachricht: %s" - -#: ../src/nm-netlink-monitor.c:251 -#, c-format -msgid "unable to allocate netlink handle for monitoring link status: %s" -msgstr "" -"Kann netlink handle zur Überwachung von Netzwerkverbindung nicht belegen: %s" - -#: ../src/nm-netlink-monitor.c:261 -#, c-format -msgid "unable to connect to netlink for monitoring link status: %s" -msgstr "" -"Kann nicht mit netlink zur Überwachung von Netzwerkverbindung verbinden: %s" - -#: ../src/nm-netlink-monitor.c:269 -#, c-format -msgid "unable to join netlink group for monitoring link status: %s" -msgstr "" -"Kann nicht mit netlink Gruppe zur Überwachung der Netzwerkverbindung " -"verbinden: %s" - -#: ../src/nm-netlink-monitor.c:277 -#, c-format -msgid "unable to allocate netlink link cache for monitoring link status: %s" -msgstr "" -"Kann netlink Cache zur Überwachung der Netzwerkverbindung nicht belegen: %s" - -#: ../src/nm-netlink-monitor.c:418 -#, c-format -msgid "error updating link cache: %s" -msgstr "Fehler beim aktualisieren des Verbindungscaches: %s" - -#: ../src/nm-netlink-monitor.c:484 -msgid "error occurred while waiting for data on socket" -msgstr "Während des Wartens auf Daten am Socket ist ein Fehler aufgetreten" - -#: ../src/NetworkManager.c:293 -#, c-format -msgid "Invalid option. Please use --help to see a list of valid options.\n" -msgstr "" -"Ungültige Option. Benutzen Sie Bitte --help um eine Liste der gültigen " -"Optionen zu erhalten.\n" - -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:88 -msgid "# Created by NetworkManager\n" -msgstr "# Erzeugt vom NetzwerkManager\n" - -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:94 -#, c-format -msgid "" -"# Merged from %s\n" -"\n" -msgstr "" -"# Zusammengefügt aus %s\n" -"\n" - -#: ../src/named-manager/nm-named-manager.c:256 -msgid "NOTE: the libc resolver may not support more than 3 nameservers." -msgstr "" -"Achtung: der libc resolver unterstützt wahrscheinlich nicht mehr als 3 " -"Nameserver." - -#: ../src/named-manager/nm-named-manager.c:258 -msgid "The nameservers listed below may not be recognized." -msgstr "Die Nameserver unter diesem werden wahrscheinlich nicht benutzt." - -#: ../system-settings/src/main.c:376 -#, c-format -msgid "Auto %s" -msgstr "Auto %s" - #: ../libnm-util/crypto.c:120 #, c-format msgid "PEM key file had no end tag '%s'." -msgstr "PEM Schlüssel Datei hat keine abschließendes Tag '%s'." +msgstr "PEM-Schlüssel Datei hat kein abschließendes Tag »%s«." #: ../libnm-util/crypto.c:130 #, c-format msgid "Doesn't look like a PEM private key file." -msgstr "Das sieht nicht nach einem privatem PEM Schlüssel aus." +msgstr "Dies scheint kein privater PEM-Schlüssel zu sein." #: ../libnm-util/crypto.c:138 #, c-format msgid "Not enough memory to store PEM file data." msgstr "" -"Es steht nicht genug Speicher zum Speichern der PEM Datei zur Verfügung." +"Es steht nicht genug Speicher zum Speichern der PEM-Datei zur Verfügung." #: ../libnm-util/crypto.c:154 #, c-format msgid "Malformed PEM file: Proc-Type was not first tag." -msgstr "Fehlerhafte PEM Datei: Proc-Type ist nicht der erste Tag." +msgstr "Fehlerhafte PEM-Datei: Proc-Type ist nicht der erste Tag." #: ../libnm-util/crypto.c:162 #, c-format msgid "Malformed PEM file: unknown Proc-Type tag '%s'." -msgstr "Fehlerhafte PEM Datei: unbekannter Proc-Type Tag '%s'." +msgstr "Fehlerhafte PEM-Datei: unbekannter Proc-Type Tag »%s«." #: ../libnm-util/crypto.c:172 #, c-format msgid "Malformed PEM file: DEK-Info was not the second tag." -msgstr "Fehlerhafte PEM Datei: DEK-Info ist nicht der zweite Tag." +msgstr "Fehlerhafte PEM-Datei: DEK-Info ist nicht der zweite Tag." #: ../libnm-util/crypto.c:183 #, c-format msgid "Malformed PEM file: no IV found in DEK-Info tag." -msgstr "Fehlerhafte PEM Datei: kein IV im DEK-Info Tag gefunden." +msgstr "Fehlerhafte PEM-Datei: kein IV im DEK-Info Tag gefunden." #: ../libnm-util/crypto.c:190 #, c-format msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." -msgstr "Fehlerhafte PEM Datei: falsches Format des IV in DEK-Info Tag." +msgstr "Fehlerhafte PEM-Datei: falsches Format des IV in DEK-Info Tag." #: ../libnm-util/crypto.c:203 #, c-format msgid "Malformed PEM file: unknown private key cipher '%s'." msgstr "" -"Fehlerhafte PEM Datei: unbekannte Verschlüsselung '%s' des privaten " +"Fehlerhafte PEM-Datei: Unbekannte Verschlüsselung »%s« des privaten " "Schlüssels." #: ../libnm-util/crypto.c:222 #, c-format msgid "Could not decode private key." -msgstr "Konnte privaten Schlüssel nicht dekodieren." +msgstr "Der private Schlüssel konnte nicht dekodiert werden." #: ../libnm-util/crypto.c:267 #, c-format msgid "PEM certificate '%s' had no end tag '%s'." -msgstr "PEM Zertifikat '%s' hat keine abschließendes Tag '%s'." +msgstr "PEM-Zertifikat »%s« hat kein abschließendes Tag »%s«." #: ../libnm-util/crypto.c:277 #, c-format msgid "Failed to decode certificate." -msgstr "Fehler beim dekodieren des Zertifikats." +msgstr "Das Dekodieren des Zertifikats ist fehlgeschlagen." #: ../libnm-util/crypto.c:286 #, c-format @@ -183,21 +110,22 @@ msgstr "Nicht genug Speicher zum Sichern des IV." msgid "IV contains non-hexadecimal digits." msgstr "IV enthält nicht hexadezimale Zeichen." -#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:143 -#: ../libnm-util/crypto_nss.c:169 +#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148 +#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171 +#: ../libnm-util/crypto_nss.c:336 #, c-format msgid "Private key cipher '%s' was unknown." -msgstr "Unbekannte Verschlüsselung '%s' des privaten Schlüssels." +msgstr "Unbekannte Verschlüsselung »%s« des privaten Schlüssels." #: ../libnm-util/crypto.c:391 #, c-format msgid "Not enough memory to decrypt private key." -msgstr "Nicht genug Speicher zum entschlüsseln des privaten Schlüssels." +msgstr "Nicht genug Speicher zum Entschlüsseln des privaten Schlüssels." #: ../libnm-util/crypto.c:511 #, c-format msgid "Unable to determine private key type." -msgstr "Kann die Art des privaten Schlüssels nicht bestimmen." +msgstr "Die Art des privaten Schlüssels kann nicht bestimmt werden." #: ../libnm-util/crypto.c:530 #, c-format @@ -205,138 +133,393 @@ msgid "Not enough memory to store decrypted private key." msgstr "" "Nicht genug Speicher zum Speichern des entschlüsselten privaten Schlüssels." -#: ../libnm-util/crypto_gnutls.c:46 +#: ../libnm-util/crypto_gnutls.c:49 msgid "Failed to initialize the crypto engine." msgstr "Fehler beim Initialisieren der Verschlüsselung." -#: ../libnm-util/crypto_gnutls.c:90 +#: ../libnm-util/crypto_gnutls.c:93 #, c-format msgid "Failed to initialize the MD5 engine: %s / %s." msgstr "Fehler beim Initialisieren von MD5: %s / %s." -#: ../libnm-util/crypto_gnutls.c:152 ../libnm-util/crypto_nss.c:178 +#: ../libnm-util/crypto_gnutls.c:156 +#, c-format +msgid "Invalid IV length (must be at least %zd)." +msgstr "Ungültige Länge des IV (muss zumindest %zd sein)." + +#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188 #, c-format msgid "Not enough memory for decrypted key buffer." -msgstr "Nicht genug Speicher für den Entschlüsselungs-Puffer." +msgstr "Nicht genug Speicher für den Puffer zur Entschlüsselung." -#: ../libnm-util/crypto_gnutls.c:160 +#: ../libnm-util/crypto_gnutls.c:173 #, c-format msgid "Failed to initialize the decryption cipher context: %s / %s." msgstr "Fehler beim Initialisieren des Entschlüsselungs-Kontextes: %s / %s." -#: ../libnm-util/crypto_gnutls.c:169 +#: ../libnm-util/crypto_gnutls.c:182 #, c-format msgid "Failed to set symmetric key for decryption: %s / %s." msgstr "" -"Fehler beim setzen des symmetrischen Schlüssels für die Entschlüsselung: %" +"Fehler beim Festlegen des symmetrischen Schlüssels für die Entschlüsselung: %" "s / %s." -#: ../libnm-util/crypto_gnutls.c:178 +#: ../libnm-util/crypto_gnutls.c:191 #, c-format msgid "Failed to set IV for decryption: %s / %s." -msgstr "Fehler beim setzen des IV für die Verschlüsselung: %s / %s." +msgstr "Fehler beim Festlegen des IV für die Verschlüsselung: %s / %s." -#: ../libnm-util/crypto_gnutls.c:187 +#: ../libnm-util/crypto_gnutls.c:200 #, c-format msgid "Failed to decrypt the private key: %s / %s." msgstr "Fehler beim Entschlüsseln des privaten Schlüssels: %s / %s." -#: ../libnm-util/crypto_gnutls.c:200 +#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:267 +#, c-format +msgid "Failed to decrypt the private key: unexpected padding length." +msgstr "" +"Fehler beim Entschlüsseln des privaten Schlüssels: Unerwartete Fülllänge." + +#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:278 #, c-format msgid "Failed to decrypt the private key." msgstr "Fehler beim Entschlüsseln des privaten Schlüssels." -#: ../libnm-util/crypto_gnutls.c:235 +#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:356 #, c-format -msgid "Error initializing certificate data: %s" -msgstr "Fehler beim Initialisieren des Zertifikates: %s" - -#: ../libnm-util/crypto_gnutls.c:257 -#, c-format -msgid "Couldn't decode certificate: %s" -msgstr "Konnte Zertifikat nicht dekodieren: %s" - -#: ../libnm-util/crypto_gnutls.c:281 -#, c-format -msgid "Couldn't initialize PKCS#12 decoder: %s" -msgstr "Konnte PKCS#12 Decoder nicht initialisieren: %s" +msgid "Could not allocate memory for encrypting." +msgstr "Es konnte kein Arbeitsspeicher zur Verschlüsselung angefordert werden." #: ../libnm-util/crypto_gnutls.c:294 #, c-format -msgid "Couldn't decode PKCS#12 file: %s" -msgstr "Konnte PKCS#12 nicht decodieren: %s" +msgid "Failed to initialize the encryption cipher context: %s / %s." +msgstr "Fehler beim Initialisieren des Verschlüsselungs-Kontextes: %s / %s." -#: ../libnm-util/crypto_gnutls.c:306 +#: ../libnm-util/crypto_gnutls.c:303 +#, c-format +msgid "Failed to set symmetric key for encryption: %s / %s." +msgstr "" +"Fehler beim Festlegen des symmetrischen Schlüssels für die Verschlüsselung: %" +"s / %s." + +#: ../libnm-util/crypto_gnutls.c:313 +#, c-format +msgid "Failed to set IV for encryption: %s / %s." +msgstr "Fehler beim Festlegen des IV für die Verschlüsselung: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:322 +#, c-format +msgid "Failed to encrypt the data: %s / %s." +msgstr "Fehler beim Verschlüsseln der Daten: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:362 +#, c-format +msgid "Error initializing certificate data: %s" +msgstr "Fehler beim Initialisieren des Zertifikats: %s" + +#: ../libnm-util/crypto_gnutls.c:384 +#, c-format +msgid "Couldn't decode certificate: %s" +msgstr "Zertifikat konnte nicht dekodiert werden: %s" + +#: ../libnm-util/crypto_gnutls.c:408 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %s" +msgstr "PKCS#12-Decoder konnte nicht initialisiert werden: %s" + +#: ../libnm-util/crypto_gnutls.c:421 +#, c-format +msgid "Couldn't decode PKCS#12 file: %s" +msgstr "PKCS#12 konnte nicht decodiert werden: %s" + +#: ../libnm-util/crypto_gnutls.c:433 #, c-format msgid "Couldn't verify PKCS#12 file: %s" -msgstr "Konnte PKCS#12 Datei nicht überprüfen: %s" +msgstr "PKCS#12-Datei konnte nicht überprüft werden: %s" #: ../libnm-util/crypto_nss.c:57 #, c-format msgid "Failed to initialize the crypto engine: %d." -msgstr "Fehler beim Erstellen der Verschlüsselung: %d." +msgstr "Fehler beim Initialisieren der Verschlüsselung: %d." #: ../libnm-util/crypto_nss.c:111 #, c-format msgid "Failed to initialize the MD5 context: %d." -msgstr "Fehler beim Erstellen des MD5-Kontextes: %d." +msgstr "Fehler beim Initialisieren des MD5-Kontextes: %d." -#: ../libnm-util/crypto_nss.c:186 +#: ../libnm-util/crypto_nss.c:179 #, c-format -msgid "Failed to initialize the decryption cipher slot." -msgstr "Fehler beim Erstellen des Verschlüsselungs-Slots." +msgid "Invalid IV length (must be at least %d)." +msgstr "Ungültige Länge des IV (muss zumindest %d sein)." #: ../libnm-util/crypto_nss.c:196 #, c-format -msgid "Failed to set symmetric key for decryption." -msgstr "" -"Fehler beim Setzen des symmetrischen Schlüssels für die Entschlüsselung." +msgid "Failed to initialize the decryption cipher slot." +msgstr "Fehler beim Einrichten des Verschlüsselungs-Slots." #: ../libnm-util/crypto_nss.c:206 #, c-format -msgid "Failed to set IV for decryption." -msgstr "Fehler beim Setzten des IV für die Entschlüsselung." +msgid "Failed to set symmetric key for decryption." +msgstr "" +"Fehler beim Festlegen des symmetrischen Schlüssels für die Entschlüsselung." -#: ../libnm-util/crypto_nss.c:214 +#: ../libnm-util/crypto_nss.c:216 +#, c-format +msgid "Failed to set IV for decryption." +msgstr "Fehler beim Festlegen des IV für die Entschlüsselung." + +#: ../libnm-util/crypto_nss.c:224 #, c-format msgid "Failed to initialize the decryption context." -msgstr "Fehler beim Erstellen des Entschlüsselungs-Kontextes." +msgstr "Fehler beim Einrichten des Entschlüsselungs-Kontextes." -#: ../libnm-util/crypto_nss.c:227 +#: ../libnm-util/crypto_nss.c:237 #, c-format msgid "Failed to decrypt the private key: %d." msgstr "Fehler beim Entschlüsseln des privaten Schlüssels: %d." -#: ../libnm-util/crypto_nss.c:239 +#: ../libnm-util/crypto_nss.c:245 +#, c-format +msgid "Failed to decrypt the private key: decrypted data too large." +msgstr "" +"Fehler beim Entschlüsseln des privaten Schlüssels: Die entschlüsselten Daten " +"sind zu groß." + +#: ../libnm-util/crypto_nss.c:256 #, c-format msgid "Failed to finalize decryption of the private key: %d." msgstr "" "Fehler beim Abschließen der Entschlüsselung des privaten Schlüssels: %d." -#: ../libnm-util/crypto_nss.c:284 +#: ../libnm-util/crypto_nss.c:364 +#, c-format +msgid "Failed to initialize the encryption cipher slot." +msgstr "Fehler beim Einrichten des Verschlüsselungs-Slots." + +#: ../libnm-util/crypto_nss.c:372 +#, c-format +msgid "Failed to set symmetric key for encryption." +msgstr "" +"Fehler beim Festlegen des symmetrischen Schlüssels für die Verschlüsselung." + +#: ../libnm-util/crypto_nss.c:380 +#, c-format +msgid "Failed to set IV for encryption." +msgstr "Fehler beim Festlegen des IV für die Verschlüsselung." + +#: ../libnm-util/crypto_nss.c:388 +#, c-format +msgid "Failed to initialize the encryption context." +msgstr "Fehler beim Initialisieren des Verschlüsselungs-Kontextes." + +#: ../libnm-util/crypto_nss.c:396 +#, c-format +msgid "Failed to encrypt: %d." +msgstr "Fehler beim Verschlüsseln: %d." + +#: ../libnm-util/crypto_nss.c:404 +#, c-format +msgid "Unexpected amount of data after encrypting." +msgstr "Unerwartete Datenmenge nach der Verschlüsselung." + +#: ../libnm-util/crypto_nss.c:447 #, c-format msgid "Couldn't decode certificate: %d" -msgstr "Konnte Zertifikate nicht dekodieren: %d" +msgstr "Zertifikat konnte nicht dekodiert werden: %d" -#: ../libnm-util/crypto_nss.c:319 +#: ../libnm-util/crypto_nss.c:482 #, c-format msgid "Couldn't convert password to UCS2: %d" -msgstr "Konnte Passwort nicht zu UCS2 konvertieren: %d" +msgstr "Passwort konnte nicht zu UCS2 konvertiert werden: %d" -#: ../libnm-util/crypto_nss.c:347 +#: ../libnm-util/crypto_nss.c:510 #, c-format msgid "Couldn't initialize PKCS#12 decoder: %d" -msgstr "Konnte PKCS#12 Decoder nicht initialisieren: %d" +msgstr "PKCS#12-Decoder konnte nicht initialisiert werden: %d" -#: ../libnm-util/crypto_nss.c:356 +#: ../libnm-util/crypto_nss.c:519 #, c-format msgid "Couldn't decode PKCS#12 file: %d" -msgstr "Konnte PKCS#12 Datei nicht decodieren: %d" +msgstr "PKCS#12-Datei konnte nicht decodiert werden: %d" -#: ../libnm-util/crypto_nss.c:365 +#: ../libnm-util/crypto_nss.c:528 #, c-format msgid "Couldn't verify PKCS#12 file: %d" -msgstr "Konnte PKCS#12 Datei nicht überprüfen: %d" +msgstr "PKCS#12-Datei konnte nicht überprüft werden: %d" + +#: ../libnm-util/crypto_nss.c:557 +msgid "Could not generate random data." +msgstr "Zufällige Daten konnten nicht erstellt werden." + +#: ../libnm-util/nm-utils.c:1522 +#, c-format +msgid "Not enough memory to make encryption key." +msgstr "Nicht genug Speicher zum Erstellen eines Schlüssels." + +#: ../libnm-util/nm-utils.c:1633 +msgid "Could not allocate memory for PEM file creation." +msgstr "" +"Es konnte kein Speicher zum Erstellen der PEM-Datei angefordert werden." + +#: ../libnm-util/nm-utils.c:1645 +#, c-format +msgid "Could not allocate memory for writing IV to PEM file." +msgstr "" +"Es konnte kein Speicher zum Schreiben des IV in die PEM-Datei angefordert " +"werden." + +#: ../libnm-util/nm-utils.c:1657 +#, c-format +msgid "Could not allocate memory for writing encrypted key to PEM file." +msgstr "" +"Es konnte kein Speicher zum Schreiben des IV in die PEM-Datei angefordert " +"werden." + +#: ../libnm-util/nm-utils.c:1676 +#, c-format +msgid "Could not allocate memory for PEM file data." +msgstr "" +"Es konnte kein Speicher für die Daten der PEM-Datei angefordert werden." + +#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:464 +#: ../src/nm-netlink-monitor.c:569 +#: ../src/ip6-manager/nm-netlink-listener.c:352 +#, c-format +msgid "error processing netlink message: %s" +msgstr "Fehler beim Verarbeiten der netlink-Nachricht: %s" + +#: ../src/nm-netlink-monitor.c:260 +#, c-format +msgid "unable to allocate netlink handle for monitoring link status: %s" +msgstr "" +"Es kann kein netlink-Handle zur Überwachung der Netzwerkverbindung " +"angefordert werden: %s" + +#: ../src/nm-netlink-monitor.c:270 +#, c-format +msgid "unable to connect to netlink for monitoring link status: %s" +msgstr "" +"Es kann nicht mit netlink zur Überwachung der Netzwerkverbindung verbunden " +"werden: %s" + +#: ../src/nm-netlink-monitor.c:278 +#, c-format +msgid "unable to join netlink group for monitoring link status: %s" +msgstr "" +"Es kann nicht mit einer netlink-Gruppe zur Überwachung der " +"Netzwerkverbindung verbunden werden: %s" + +#: ../src/nm-netlink-monitor.c:286 +#, c-format +msgid "unable to allocate netlink link cache for monitoring link status: %s" +msgstr "" +"Es kann kein netlink-Cache zur Überwachung der Netzwerkverbindung belegt " +"werden: %s" + +#: ../src/nm-netlink-monitor.c:494 +#: ../src/ip6-manager/nm-netlink-listener.c:382 +msgid "error occurred while waiting for data on socket" +msgstr "Während des Wartens auf Daten am Socket ist ein Fehler aufgetreten" + +#: ../src/nm-netlink-monitor.c:558 +#, c-format +msgid "error updating link cache: %s" +msgstr "Fehler beim Aktualisieren des Verbindungs-Cache: %s" + +#: ../src/NetworkManager.c:330 +#, c-format +msgid "Invalid option. Please use --help to see a list of valid options.\n" +msgstr "" +"Ungültige Option. Verwenden Sie Bitte »--help«, um eine Liste der gültigen " +"Optionen zu erhalten.\n" + +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:304 +msgid "# Created by NetworkManager\n" +msgstr "# Erstellt von NetworkManager\n" + +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310 +#, c-format +msgid "" +"# Merged from %s\n" +"\n" +msgstr "" +"# Zusammengefügt aus %s\n" +"\n" + +#: ../src/ip6-manager/nm-netlink-listener.c:200 +#, c-format +msgid "unable to allocate netlink handle: %s" +msgstr "Es Kann kein netlink-Handle angefordert werden: %s" + +#: ../src/ip6-manager/nm-netlink-listener.c:210 +#, c-format +msgid "unable to connect to netlink: %s" +msgstr "Es kann nicht mit netlink verbunden werden: %s" + +#: ../src/ip6-manager/nm-netlink-listener.c:307 +#, c-format +msgid "unable to join netlink group: %s" +msgstr "Der netlink-Gruppe kann nicht beigetreten werden: %s" + +#: ../src/named-manager/nm-named-manager.c:315 +msgid "NOTE: the libc resolver may not support more than 3 nameservers." +msgstr "" +"HINWEIS: Der libc-Auflöser unterstützt eventuell nicht mehr als 3 Server zur " +"Namensauflösung." + +#: ../src/named-manager/nm-named-manager.c:317 +msgid "The nameservers listed below may not be recognized." +msgstr "" +"Die nachfolgend aufgelisteten Server zur Namensauflösung werden eventuell " +"nicht erkannt." + +#: ../src/system-settings/nm-default-wired-connection.c:157 +#, c-format +msgid "Auto %s" +msgstr "Auto %s" + +#: ../system-settings/plugins/ifcfg-rh/reader.c:2406 +msgid "System" +msgstr "System" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1 +msgid "Connection sharing via a protected WiFi network" +msgstr "Verbindungsfreigabe über ein geschütztes WiFi-Netzwerk" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2 +msgid "Connection sharing via an open WiFi network" +msgstr "Verbindungsfreigabe über ein offenes WiFi-Netzwerk" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3 +msgid "Modify persistent system hostname" +msgstr "Den ständigen Rechnernamen des Systems bearbeiten" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4 +msgid "Modify system connections" +msgstr "System-Verbindungen bearbeiten" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5 +msgid "System policy prevents modification of system settings" +msgstr "" +"Die Systemrichtlinien verhindern das Bearbeiten von Systemeinstellungen" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6 +msgid "System policy prevents modification of the persistent system hostname" +msgstr "" +"Die Systemrichtlinien verhindern das Bearbeiten des ständigen Rechnernamens " +"des Systems" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7 +msgid "System policy prevents sharing connections via a protected WiFi network" +msgstr "" +"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein geschütztes " +"WiFi-Netzwerk" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8 +msgid "System policy prevents sharing connections via an open WiFi network" +msgstr "" +"Die Systemrichtlinien verhindern Verbindungsfreigaben über ein offenes WiFi-" +"Netzwerk" #~ msgid "operation took too long" #~ msgstr "Vorgang dauerte zu lange" diff --git a/po/hu.po b/po/hu.po index 7bb2ed0240..742cdb15b3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,76 +1,418 @@ # Hungarian translation of NetworkManager -# Gabor Kelemen , 2005, 2006, 2007, 2008. # This file is distributed under the same license as the NetworkManager package. # Copyright (C) 2005, Free Software Foundation. Inc. +# +# Gabor Kelemen , 2005, 2006, 2007, 2008, 2009, 2010. msgid "" msgstr "" -"Project-Id-Version: NetworkManager.HEAD.hu\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-05 18:57+0000\n" -"PO-Revision-Date: 2008-09-25 21:33+0200\n" -"Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Project-Id-Version: NetworkManager master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n" +"POT-Creation-Date: 2009-09-29 03:25+0000\n" +"PO-Revision-Date: 2010-01-03 14:57+0100\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: ../src/nm-netlink-monitor.c:193 ../src/nm-netlink-monitor.c:474 +#: ../libnm-util/crypto.c:120 +#, c-format +msgid "PEM key file had no end tag '%s'." +msgstr "A PEM kulcsfájl nem rendelkezik „%s” zárócímkével." + +#: ../libnm-util/crypto.c:130 +#, c-format +msgid "Doesn't look like a PEM private key file." +msgstr "Nem tűnik PEM személyes kulcs fájlnak." + +#: ../libnm-util/crypto.c:138 +#, c-format +msgid "Not enough memory to store PEM file data." +msgstr "Nincs elég memória a PEM fájl adatainak tárolásához." + +#: ../libnm-util/crypto.c:154 +#, c-format +msgid "Malformed PEM file: Proc-Type was not first tag." +msgstr "Rosszul formázott PEM fájl: a Proc-Type nem az első címke." + +#: ../libnm-util/crypto.c:162 +#, c-format +msgid "Malformed PEM file: unknown Proc-Type tag '%s'." +msgstr "Rosszul formázott PEM fájl: ismeretlen Proc-Type címke („%s”)." + +#: ../libnm-util/crypto.c:172 +#, c-format +msgid "Malformed PEM file: DEK-Info was not the second tag." +msgstr "Rosszul formázott PEM fájl: A DEK-Info nem a második címke." + +#: ../libnm-util/crypto.c:183 +#, c-format +msgid "Malformed PEM file: no IV found in DEK-Info tag." +msgstr "Rosszul formázott PEM fájl: nem található IV a DEK-Info címkében." + +#: ../libnm-util/crypto.c:190 +#, c-format +msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." +msgstr "Rosszul formázott PEM fájl: az IV formátuma érvénytelen a DEK-Info címkében." + +#: ../libnm-util/crypto.c:203 +#, c-format +msgid "Malformed PEM file: unknown private key cipher '%s'." +msgstr "Rosszul formázott PEM fájl: ismeretlen személyes kulcs titkosító: „%s”." + +#: ../libnm-util/crypto.c:222 +#, c-format +msgid "Could not decode private key." +msgstr "A személyes kulcs nem fejthető vissza." + +#: ../libnm-util/crypto.c:267 +#, c-format +msgid "PEM certificate '%s' had no end tag '%s'." +msgstr "A(z) „%s” PEM tanúsítvány nem tartalmaz záró „%s” címkét." + +#: ../libnm-util/crypto.c:277 +#, c-format +msgid "Failed to decode certificate." +msgstr "A tanúsítvány visszafejtése meghiúsult." + +#: ../libnm-util/crypto.c:286 +#, c-format +msgid "Not enough memory to store certificate data." +msgstr "Nincs elég memória a tanúsítvány adatainak tárolásához." + +#: ../libnm-util/crypto.c:294 +#, c-format +msgid "Not enough memory to store file data." +msgstr "Nincs elég memória a fájl adatainak tárolásához." + +#: ../libnm-util/crypto.c:324 +#, c-format +msgid "IV must be an even number of bytes in length." +msgstr "Az IV hosszának páros számú bájtnak kell lennie." + +#: ../libnm-util/crypto.c:333 +#, c-format +msgid "Not enough memory to store the IV." +msgstr "Nincs elég memória az IV tárolásához." + +#: ../libnm-util/crypto.c:344 +#, c-format +msgid "IV contains non-hexadecimal digits." +msgstr "Az IV nem hexadecimális számjegyeket tartalmaz." + +#: ../libnm-util/crypto.c:382 ../libnm-util/crypto_gnutls.c:148 +#: ../libnm-util/crypto_gnutls.c:266 ../libnm-util/crypto_nss.c:171 +#: ../libnm-util/crypto_nss.c:335 +#, c-format +msgid "Private key cipher '%s' was unknown." +msgstr "A(z) „%s” személyeskulcs-titkosító ismeretlen." + +#: ../libnm-util/crypto.c:391 +#, c-format +msgid "Not enough memory to decrypt private key." +msgstr "Nincs elég memória a személyes kulcs visszafejtéséhez." + +#: ../libnm-util/crypto.c:511 +#, c-format +msgid "Unable to determine private key type." +msgstr "A személyes kulcs típusa nem határozható meg." + +#: ../libnm-util/crypto.c:530 +#, c-format +msgid "Not enough memory to store decrypted private key." +msgstr "Nincs elég memória a visszafejtett személyes kulcs tárolásához." + +#: ../libnm-util/crypto_gnutls.c:49 +msgid "Failed to initialize the crypto engine." +msgstr "A titkosító alrendszer előkészítése meghiúsult." + +#: ../libnm-util/crypto_gnutls.c:93 +#, c-format +msgid "Failed to initialize the MD5 engine: %s / %s." +msgstr "Az MD5 alrendszer előkészítése meghiúsult: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:156 +#, c-format +msgid "Invalid IV length (must be at least %zd)." +msgstr "Érvénytelen IV hossz (legalább %zd hosszúnak kell lennie)." + +#: ../libnm-util/crypto_gnutls.c:165 ../libnm-util/crypto_nss.c:188 +#, c-format +msgid "Not enough memory for decrypted key buffer." +msgstr "Nincs elég memória a visszafejtett kulcspufferhez." + +#: ../libnm-util/crypto_gnutls.c:173 +#, c-format +msgid "Failed to initialize the decryption cipher context: %s / %s." +msgstr "A visszafejtési titkosító kontextusának előkészítése meghiúsult: %s /%s." + +#: ../libnm-util/crypto_gnutls.c:182 +#, c-format +msgid "Failed to set symmetric key for decryption: %s / %s." +msgstr "A szimmetrikus kulcs beállítása meghiúsult a visszafejtéshez: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:191 +#, c-format +msgid "Failed to set IV for decryption: %s / %s." +msgstr "Az IV beállítása meghiúsult a visszafejtéshez: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:200 +#, c-format +msgid "Failed to decrypt the private key: %s / %s." +msgstr "A személyes kulcs visszafejtése meghiúsult: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:210 ../libnm-util/crypto_nss.c:266 +#, c-format +msgid "Failed to decrypt the private key: unexpected padding length." +msgstr "A személyes kulcs visszafejtése meghiúsult: váratlan kitöltéshossz." + +#: ../libnm-util/crypto_gnutls.c:221 ../libnm-util/crypto_nss.c:277 +#, c-format +msgid "Failed to decrypt the private key." +msgstr "A személyes kulcs visszafejtése meghiúsult." + +#: ../libnm-util/crypto_gnutls.c:286 ../libnm-util/crypto_nss.c:355 +#, c-format +msgid "Could not allocate memory for encrypting." +msgstr "Nem sikerült memóriát foglalni a titkosításhoz." + +#: ../libnm-util/crypto_gnutls.c:294 +#, c-format +msgid "Failed to initialize the encryption cipher context: %s / %s." +msgstr "A titkosító kontextusának előkészítése meghiúsult: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:303 +#, c-format +msgid "Failed to set symmetric key for encryption: %s / %s." +msgstr "A szimmetrikus kulcs beállítása meghiúsult a titkosításhoz: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:313 +#, c-format +msgid "Failed to set IV for encryption: %s / %s." +msgstr "Az IV beállítása meghiúsult a titkosításhoz: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:322 +#, c-format +msgid "Failed to encrypt the data: %s / %s." +msgstr "Az adatot nem sikerült titkosítani: %s / %s." + +#: ../libnm-util/crypto_gnutls.c:362 +#, c-format +msgid "Error initializing certificate data: %s" +msgstr "Hiba a tanúsítvány adatainak előkészítésekor: %s" + +#: ../libnm-util/crypto_gnutls.c:384 +#, c-format +msgid "Couldn't decode certificate: %s" +msgstr "A tanúsítvány nem fejthető vissza: %s" + +#: ../libnm-util/crypto_gnutls.c:408 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %s" +msgstr "A PKCS#12 dekódoló nem készíthető elő: %s" + +#: ../libnm-util/crypto_gnutls.c:421 +#, c-format +msgid "Couldn't decode PKCS#12 file: %s" +msgstr "A PKCS#12 fájl nem fejthető vissza: %s" + +#: ../libnm-util/crypto_gnutls.c:433 +#, c-format +msgid "Couldn't verify PKCS#12 file: %s" +msgstr "A PKCS#12 fájl nem ellenőrizhető: %s" + +#: ../libnm-util/crypto_nss.c:57 +#, c-format +msgid "Failed to initialize the crypto engine: %d." +msgstr "A titkosító alrendszer előkészítése meghiúsult: %d." + +#: ../libnm-util/crypto_nss.c:111 +#, c-format +msgid "Failed to initialize the MD5 context: %d." +msgstr "Az MD5 kontextus előkészítése meghiúsult: %d." + +#: ../libnm-util/crypto_nss.c:179 +#, c-format +msgid "Invalid IV length (must be at least %d)." +msgstr "Érvénytelen IV hossz (legalább %d hosszúnak kell lennie)." + +#: ../libnm-util/crypto_nss.c:196 +#, c-format +msgid "Failed to initialize the decryption cipher slot." +msgstr "A visszafejtési titkosítóhely előkészítése meghiúsult." + +#: ../libnm-util/crypto_nss.c:206 +#, c-format +msgid "Failed to set symmetric key for decryption." +msgstr "A szimmetrikus kulcs nem állítható be a visszafejtéshez." + +#: ../libnm-util/crypto_nss.c:216 +#, c-format +msgid "Failed to set IV for decryption." +msgstr "Az IV nem állítható be a visszafejtéshez." + +#: ../libnm-util/crypto_nss.c:224 +#, c-format +msgid "Failed to initialize the decryption context." +msgstr "A visszafejtési kontextus előkészítése meghiúsult." + +#: ../libnm-util/crypto_nss.c:237 +#, c-format +msgid "Failed to decrypt the private key: %d." +msgstr "A személyes kulcs visszafejtése meghiúsult: %d." + +#: ../libnm-util/crypto_nss.c:245 +#, c-format +msgid "Failed to decrypt the private key: decrypted data too large." +msgstr "A személyes kulcs visszafejtése meghiúsult: a visszafejtett adatok túl nagyok." + +#: ../libnm-util/crypto_nss.c:256 +#, c-format +msgid "Failed to finalize decryption of the private key: %d." +msgstr "A személyes kulcs visszafejtésének befejezése meghiúsult: %d." + +#: ../libnm-util/crypto_nss.c:363 +#, c-format +msgid "Failed to initialize the encryption cipher slot." +msgstr "A titkosítóhely előkészítése meghiúsult." + +#: ../libnm-util/crypto_nss.c:371 +#, c-format +msgid "Failed to set symmetric key for encryption." +msgstr "A szimmetrikus kulcs nem állítható be a titkosításhoz." + +#: ../libnm-util/crypto_nss.c:379 +#, c-format +msgid "Failed to set IV for encryption." +msgstr "Az IV nem állítható be a titkosításhoz." + +#: ../libnm-util/crypto_nss.c:387 +#, c-format +msgid "Failed to initialize the encryption context." +msgstr "A titkosítási kontextus előkészítése meghiúsult." + +#: ../libnm-util/crypto_nss.c:395 +#, c-format +msgid "Failed to encrypt: %d." +msgstr "A titkosítás meghiúsult: %d." + +#: ../libnm-util/crypto_nss.c:403 +#, c-format +msgid "Unexpected amount of data after encrypting." +msgstr "Váratlan mennyiségű adat a titkosítás után." + +#: ../libnm-util/crypto_nss.c:446 +#, c-format +msgid "Couldn't decode certificate: %d" +msgstr "A tanúsítvány nem fejthető vissza: %d" + +#: ../libnm-util/crypto_nss.c:481 +#, c-format +msgid "Couldn't convert password to UCS2: %d" +msgstr "A jelszó nem alakítható UCS2 formátumra: %d" + +#: ../libnm-util/crypto_nss.c:509 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %d" +msgstr "A PKCS#12 dekódoló nem készíthető elő: %d" + +#: ../libnm-util/crypto_nss.c:518 +#, c-format +msgid "Couldn't decode PKCS#12 file: %d" +msgstr "A PKCS#12 fájl nem fejthető vissza: %d" + +#: ../libnm-util/crypto_nss.c:527 +#, c-format +msgid "Couldn't verify PKCS#12 file: %d" +msgstr "A PKCS#12 fájl nem ellenőrizhető: %d" + +#: ../libnm-util/crypto_nss.c:556 +msgid "Could not generate random data." +msgstr "Nem sikerült a véletlen adatok előállítása." + +#: ../libnm-util/nm-utils.c:1522 +#, c-format +msgid "Not enough memory to make encryption key." +msgstr "Nincs elég memória titkosítási kulcs készítéséhez." + +#: ../libnm-util/nm-utils.c:1633 +msgid "Could not allocate memory for PEM file creation." +msgstr "Nem sikerült memóriát foglalni PEM fájl készítéséhez." + +#: ../libnm-util/nm-utils.c:1645 +#, c-format +msgid "Could not allocate memory for writing IV to PEM file." +msgstr "Nem sikerült memóriát foglalni az IV írásához PEM fájlba." + +#: ../libnm-util/nm-utils.c:1657 +#, c-format +msgid "Could not allocate memory for writing encrypted key to PEM file." +msgstr "Nem sikerült memóriát foglalni a titkosított kulcs PEM fájlba írásához." + +#: ../libnm-util/nm-utils.c:1676 +#, c-format +msgid "Could not allocate memory for PEM file data." +msgstr "Nem sikerült memóriát foglalni a PEM fájl adatainak." + +#: ../src/nm-netlink-monitor.c:194 ../src/nm-netlink-monitor.c:464 +#: ../src/nm-netlink-monitor.c:569 +#: ../src/ip6-manager/nm-netlink-listener.c:352 #, c-format msgid "error processing netlink message: %s" msgstr "hiba a netlink üzenet feldolgozásakor: %s" -#: ../src/nm-netlink-monitor.c:250 +#: ../src/nm-netlink-monitor.c:260 #, c-format msgid "unable to allocate netlink handle for monitoring link status: %s" msgstr "" "nem lehet netlink kezelőt lefoglalni a kapcsolat állapotának megfigyelése " "érdekében: %s" -#: ../src/nm-netlink-monitor.c:260 +#: ../src/nm-netlink-monitor.c:270 #, c-format msgid "unable to connect to netlink for monitoring link status: %s" msgstr "" "nem lehet kapcsolódni a netlinkhez a kapcsolat állapotának megfigyelése " "érdekében: %s" -#: ../src/nm-netlink-monitor.c:268 +#: ../src/nm-netlink-monitor.c:278 #, c-format msgid "unable to join netlink group for monitoring link status: %s" msgstr "" "nem lehet csatlakozni a netlink csoporthoz a kapcsolat állapotának " "megfigyelése érdekében: %s" -#: ../src/nm-netlink-monitor.c:276 +#: ../src/nm-netlink-monitor.c:286 #, c-format msgid "unable to allocate netlink link cache for monitoring link status: %s" msgstr "" "nem lehet netlink kapcsolat-gyorsítótárat lefoglalni a kapcsolat állapotának " "megfigyelése érdekében: %s" -#: ../src/nm-netlink-monitor.c:439 +#: ../src/nm-netlink-monitor.c:494 +#: ../src/ip6-manager/nm-netlink-listener.c:382 +msgid "error occurred while waiting for data on socket" +msgstr "hiba lépett fel adatokra várakozás közben a foglalaton" + +#: ../src/nm-netlink-monitor.c:558 #, c-format msgid "error updating link cache: %s" msgstr "hiba a kapcsolat gyorsítótárának frissítésekor: %s" -#: ../src/nm-netlink-monitor.c:497 -#, c-format -msgid "error occurred while waiting for data on socket" -msgstr "hiba lépett fel adatokra várakozás közben a foglalaton" - -#: ../src/NetworkManager.c:250 +#: ../src/NetworkManager.c:330 #, c-format msgid "Invalid option. Please use --help to see a list of valid options.\n" msgstr "" "Érvénytelen kapcsoló. Az érvényes kapcsolók listájáért használja a --help " "kapcsolót.\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:87 +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:304 msgid "# Created by NetworkManager\n" msgstr "# Készítette a NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient.c:93 +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310 #, c-format msgid "" "# Merged from %s\n" @@ -79,201 +421,73 @@ msgstr "" "# Összefésülve ebből: %s\n" "\n" -#: ../src/named-manager/nm-named-manager.c:240 +#: ../src/ip6-manager/nm-netlink-listener.c:200 +#, c-format +msgid "unable to allocate netlink handle: %s" +msgstr "nem lehet netlink kezelőt lefoglalni: %s" + +#: ../src/ip6-manager/nm-netlink-listener.c:210 +#, c-format +msgid "unable to connect to netlink: %s" +msgstr "nem lehet kapcsolódni a netlinkhez: %s" + +#: ../src/ip6-manager/nm-netlink-listener.c:307 +#, c-format +msgid "unable to join netlink group: %s" +msgstr "nem lehet csatlakozni a netlink csoporthoz: %s" + +#: ../src/named-manager/nm-named-manager.c:315 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "MEGJEGYZÉS: a libc feloldó nem támogat háromnál több névkiszolgálót." -#: ../src/named-manager/nm-named-manager.c:242 +#: ../src/named-manager/nm-named-manager.c:317 msgid "The nameservers listed below may not be recognized." msgstr "Az alább felsorolt névkiszolgálók lehet, hogy nem kerülnek felismerésre." -#: ../system-settings/src/main.c:366 +#: ../src/system-settings/nm-default-wired-connection.c:194 #, c-format msgid "Auto %s" msgstr "Automatikus %s" -#: ../libnm-util/crypto.c:125 -#, c-format -msgid "PEM key file had no end tag '%s'." -msgstr "A PEM kulcsfájl nem rendelkezik „%s” zárócímkével." +#: ../system-settings/plugins/ifcfg-rh/reader.c:2406 +msgid "System" +msgstr "Rendszer" -#: ../libnm-util/crypto.c:135 -#, c-format -msgid "Doesn't look like a PEM private key file." -msgstr "Nem tűnik PEM személyes kulcs fájlnak." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1 +msgid "Connection sharing via a protected WiFi network" +msgstr "Kapcsolatmegosztás védett WiFi hálózaton" -#: ../libnm-util/crypto.c:143 -#, c-format -msgid "Not enough memory to store PEM file data." -msgstr "Nincs elég memória a PEM fájl adatainak tárolásához." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2 +msgid "Connection sharing via an open WiFi network" +msgstr "Kapcsolatmegosztás nyílt WiFi hálózaton" -#: ../libnm-util/crypto.c:159 -#, c-format -msgid "Malformed PEM file: Proc-Type was not first tag." -msgstr "Rosszul formázott PEM fájl: a Proc-Type nem az első címke." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3 +msgid "Modify persistent system hostname" +msgstr "Állandó rendszergépnév módosítása" -#: ../libnm-util/crypto.c:167 -#, c-format -msgid "Malformed PEM file: unknown Proc-Type tag '%s'." -msgstr "Rosszul formázott PEM fájl: ismeretlen Proc-Type címke („%s”)." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4 +msgid "Modify system connections" +msgstr "Rendszerkapcsolatok módosítása" -#: ../libnm-util/crypto.c:177 -#, c-format -msgid "Malformed PEM file: DEK-Info was not the second tag." -msgstr "Rosszul formázott PEM fájl: A DEK-Info nem a második címke." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5 +msgid "System policy prevents modification of system settings" +msgstr "A rendszer házirendje megakadályozza a rendszerbeállítások módosítását" -#: ../libnm-util/crypto.c:188 -#, c-format -msgid "Malformed PEM file: no IV found in DEK-Info tag." -msgstr "Rosszul formázott PEM fájl: nem található IV a DEK-Info címkében." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6 +msgid "System policy prevents modification of the persistent system hostname" +msgstr "" +"A rendszer házirendje megakadályozza a rendszer állandó gépnevének " +"módosítását" -#: ../libnm-util/crypto.c:195 -#, c-format -msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." -msgstr "Rosszul formázott PEM fájl: az IV formátuma érvénytelen a DEK-Info címkében." +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7 +msgid "System policy prevents sharing connections via a protected WiFi network" +msgstr "" +"A rendszer házirendje megakadályozza a kapcsolatok megosztását védett WiFi " +"hálózaton" -#: ../libnm-util/crypto.c:208 -#, c-format -msgid "Malformed PEM file: unknown private key cipher '%s'." -msgstr "Rosszul formázott PEM fájl: ismeretlen személyes kulcs titkosító: „%s”." - -#: ../libnm-util/crypto.c:227 -#, c-format -msgid "Could not decode private key." -msgstr "A személyes kulcs nem fejthető vissza." - -#: ../libnm-util/crypto.c:271 -#, c-format -msgid "PEM certificate '%s' had no end tag '%s'." -msgstr "A(z) „%s” PEM tanúsítvány nem tartalmaz záró „%s” címkét." - -#: ../libnm-util/crypto.c:281 -#, c-format -msgid "Failed to decode certificate." -msgstr "A tanúsítvány visszafejtése meghiúsult." - -#: ../libnm-util/crypto.c:290 ../libnm-util/crypto.c:298 -#, c-format -msgid "Not enough memory to store certificate data." -msgstr "Nincs elég memória a tanúsítvány adatainak tárolásához." - -#: ../libnm-util/crypto.c:328 -#, c-format -msgid "IV must be an even number of bytes in length." -msgstr "Az IV hosszának páros számú bájtnak kell lennie." - -#: ../libnm-util/crypto.c:337 -#, c-format -msgid "Not enough memory to store the IV." -msgstr "Nincs elég memória az IV tárolásához." - -#: ../libnm-util/crypto.c:348 -#, c-format -msgid "IV contains non-hexadecimal digits." -msgstr "Az IV nem hexadecimális számjegyeket tartalmaz." - -#: ../libnm-util/crypto.c:386 ../libnm-util/crypto_gnutls.c:142 -#: ../libnm-util/crypto_nss.c:155 -#, c-format -msgid "Private key cipher '%s' was unknown." -msgstr "A(z) „%s” személyeskulcs-titkosító ismeretlen." - -#: ../libnm-util/crypto.c:395 -#, c-format -msgid "Not enough memory to create private key decryption key." -msgstr "Nincs elég memória a személyes kulcs visszafejtési kulcsának létrehozásához." - -#: ../libnm-util/crypto.c:513 -#, c-format -msgid "Not enough memory to store decrypted private key." -msgstr "Nincs elég memória a visszafejtett személyes kulcs tárolásához." - -#: ../libnm-util/crypto_gnutls.c:43 -msgid "Failed to initialize the crypto engine." -msgstr "A titkosító alrendszer előkészítése meghiúsult." - -#: ../libnm-util/crypto_gnutls.c:88 -#, c-format -msgid "Failed to initialize the MD5 engine: %s / %s." -msgstr "Az MD5 alrendszer előkészítése meghiúsult: %s / %s." - -#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_nss.c:164 -#, c-format -msgid "Not enough memory for decrypted key buffer." -msgstr "Nincs elég memória a visszafejtett kulcspufferhez." - -#: ../libnm-util/crypto_gnutls.c:159 -#, c-format -msgid "Failed to initialize the decryption cipher context: %s / %s." -msgstr "A visszafejtési titkosító kontextusának előkészítése meghiúsult: %s /%s." - -#: ../libnm-util/crypto_gnutls.c:168 -#, c-format -msgid "Failed to set symmetric key for decryption: %s / %s." -msgstr "A szimmetrikus kulcs beállítása meghiúsult a visszafejtéshez: %s / %s." - -#: ../libnm-util/crypto_gnutls.c:177 -#, c-format -msgid "Failed to set IV for decryption: %s / %s." -msgstr "Az IV beállítása meghiúsult a visszafejtéshez: %s / %s." - -#: ../libnm-util/crypto_gnutls.c:186 -#, c-format -msgid "Failed to decrypt the private key: %s / %s." -msgstr "A személyes kulcs visszafejtése meghiúsult: %s / %s." - -#: ../libnm-util/crypto_gnutls.c:224 -#, c-format -msgid "Error initializing certificate data: %s" -msgstr "Hiba a tanúsítvány adatainak előkészítésekor: %s" - -#: ../libnm-util/crypto_gnutls.c:236 -#, c-format -msgid "Couldn't decode certificate: %s" -msgstr "A tanúsítvány nem fejthető vissza: %s" - -#: ../libnm-util/crypto_nss.c:49 -#, c-format -msgid "Failed to initialize the crypto engine: %d." -msgstr "A titkosító alrendszer előkészítése meghiúsult: %d." - -#: ../libnm-util/crypto_nss.c:96 -#, c-format -msgid "Failed to initialize the MD5 context: %d." -msgstr "Az MD5 kontextus előkészítése meghiúsult: %d." - -#: ../libnm-util/crypto_nss.c:172 -#, c-format -msgid "Failed to initialize the decryption cipher slot." -msgstr "A visszafejtési titkosítóhely előkészítése meghiúsult." - -#: ../libnm-util/crypto_nss.c:182 -#, c-format -msgid "Failed to set symmetric key for decryption." -msgstr "A szimmetrikus kulcs nem állítható be a visszafejtéshez." - -#: ../libnm-util/crypto_nss.c:192 -#, c-format -msgid "Failed to set IV for decryption." -msgstr "Az IV nem állítható be a visszafejtéshez." - -#: ../libnm-util/crypto_nss.c:200 -#, c-format -msgid "Failed to initialize the decryption context." -msgstr "A visszafejtési kontextus előkészítése meghiúsult." - -#: ../libnm-util/crypto_nss.c:213 -#, c-format -msgid "Failed to decrypt the private key: %d." -msgstr "A személyes kulcs visszafejtése meghiúsult: %d." - -#: ../libnm-util/crypto_nss.c:225 -#, c-format -msgid "Failed to finalize decryption of the private key: %d." -msgstr "A személyes kulcs visszafejtésének befejezése meghiúsult: %d." - -#: ../libnm-util/crypto_nss.c:269 -#, c-format -msgid "Couldn't decode certificate: %d" -msgstr "A tanúsítvány nem fejthető vissza: %d" +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8 +msgid "System policy prevents sharing connections via an open WiFi network" +msgstr "" +"A rendszer házirendje megakadályozza a kapcsolatok megosztását nyílt WiFi " +"hálózaton" diff --git a/po/sl.po b/po/sl.po index d42310fb1d..425fd752e2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,918 +1,992 @@ # Slovenian translation of NetworkManager. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the NetworkManager package. -# # Matic Žgur , 2007. +# Andrej Žnidaršič , 2009. # msgid "" msgstr "" "Project-Id-Version: NetworkManager\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-17 05:31+0100\n" -"PO-Revision-Date: 2007-01-09 16:11+0100\n" -"Last-Translator: Matic Žgur \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager&component=general\n" +"POT-Creation-Date: 2009-09-29 03:25+0000\n" +"PO-Revision-Date: 2009-12-17 07:10+0100\n" +"Last-Translator: Andrej Žnidaršič \n" "Language-Team: Slovenian GNOME Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"X-Poedit-Country: SLOVENIA\n" "X-Poedit-Language: Slovenian\n" +"X-Poedit-SourceCharset: utf-8\n" -#: ../gnome/applet/applet-compat.c:171 -#: ../gnome/applet/applet-dbus-info.c:926 +#: ../libnm-util/crypto.c:120 #, c-format -msgid "Passphrase for wireless network %s" -msgstr "Šifrirna fraza za brezžično omrežje %s" +msgid "PEM key file had no end tag '%s'." +msgstr "Ključna datoteka PEM nima končne oznake '%s'." -#: ../gnome/applet/applet-dbus.c:274 +#: ../libnm-util/crypto.c:130 #, c-format -msgid "Connection to the wireless network '%s' failed." -msgstr "Povezava z brezžičnim omrežjem %s ni uspela" +msgid "Doesn't look like a PEM private key file." +msgstr "Ni videti kot PEM zasebna ključna datoteka." -#: ../gnome/applet/applet-dbus.c:279 -msgid "Connection to the wired network failed." -msgstr "Povezava z žičnim omrežjem ni uspela." - -#: ../gnome/applet/applet.c:182 -msgid "Error displaying connection information:" -msgstr "Napaka pri prikazovanju informacij o povezavi:" - -#: ../gnome/applet/applet.c:200 -msgid "Could not find some required resources (the glade file)!" -msgstr "Ni mogoče najti nekaterih zahtevanih virov (datoteke glade)!" - -#: ../gnome/applet/applet.c:210 -msgid "No active connections!" -msgstr "Ni aktivnih povezav!" - -#: ../gnome/applet/applet.c:227 +#: ../libnm-util/crypto.c:138 #, c-format -msgid "%d Mb/s" -msgstr "%d Mb/s" +msgid "Not enough memory to store PEM file data." +msgstr "Ni dovolj pomnilnika za shranjevanje podatkov datoteke PEM." -#: ../gnome/applet/applet.c:230 +#: ../libnm-util/crypto.c:154 #, c-format -msgid "Wired Ethernet (%s)" -msgstr "Žični eternet (%s)" +msgid "Malformed PEM file: Proc-Type was not first tag." +msgstr "Slabo oblikovana datoteka PEM: Proc-Type ni prva oznaka." -#: ../gnome/applet/applet.c:232 +#: ../libnm-util/crypto.c:162 #, c-format -msgid "Wireless Ethernet (%s)" -msgstr "Brezžični eternet (%s)" +msgid "Malformed PEM file: unknown Proc-Type tag '%s'." +msgstr "Slabo oblikovana datoteka PEM: neznana oznaka Proc-Type '%s'" -#: ../gnome/applet/applet.c:238 -msgid "Unknown" -msgstr "Neznano" - -#: ../gnome/applet/applet.c:330 -#: ../gnome/applet/applet.c:357 -msgid "NetworkManager Applet" -msgstr "Programček NetworkManager" - -#: ../gnome/applet/applet.c:332 -msgid "" -"Copyright © 2004-2006 Red Hat, Inc.\n" -"Copyright © 2005-2006 Novell, Inc." -msgstr "" -"Copyright © 2004-2006 Red Hat, Inc.\n" -"Copyright © 2005-2006 Novell, Inc." - -#: ../gnome/applet/applet.c:334 -#: ../gnome/applet/applet.c:361 -msgid "Notification area applet for managing your network devices and connections." -msgstr "Programček za območje obvestil za upravljanje vaših mrežnih naprav in povezav." - -#: ../gnome/applet/applet.c:337 -#: ../gnome/applet/applet.c:365 -msgid "translator-credits" -msgstr "Matic Žgur " - -#: ../gnome/applet/applet.c:359 -msgid "" -"Copyright © 2004-2005 Red Hat, Inc.\n" -"Copyright © 2005-2006 Novell, Inc." -msgstr "" -"Copyright © 2004-2005 Red Hat, Inc.\n" -"Copyright © 2005-2006 Novell, Inc." - -#: ../gnome/applet/applet.c:421 -msgid "VPN Login Failure" -msgstr "Neuspela prijava VPN" - -#: ../gnome/applet/applet.c:422 +#: ../libnm-util/crypto.c:172 #, c-format -msgid "Could not start the VPN connection '%s' due to a login failure." -msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspele prijave." +msgid "Malformed PEM file: DEK-Info was not the second tag." +msgstr "Slabo oblikovana datoteka PEM: DEK-Info ni druga oznaka." -#: ../gnome/applet/applet.c:426 -msgid "VPN Start Failure" -msgstr "Neuspel zagon VPN" - -#: ../gnome/applet/applet.c:427 +#: ../libnm-util/crypto.c:183 #, c-format -msgid "Could not start the VPN connection '%s' due to a failure launching the VPN program." -msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspelega zagona programa VPN." +msgid "Malformed PEM file: no IV found in DEK-Info tag." +msgstr "Slabo oblikovana datoteka PEM: IV ni mogoče najti v DEK-Info oznaki." -#: ../gnome/applet/applet.c:431 -#: ../gnome/applet/applet.c:441 -msgid "VPN Connect Failure" -msgstr "Neuspela povezava VPN" - -#: ../gnome/applet/applet.c:432 +#: ../libnm-util/crypto.c:190 #, c-format -msgid "Could not start the VPN connection '%s' due to a connection error." -msgstr "Ni mogoče začeti povezave VPN '%s' zaradi napake pri povezavi." +msgid "Malformed PEM file: invalid format of IV in DEK-Info tag." +msgstr "Slabo oblikovana datoteka PEM: neveljavna oblika IV v DEK-Info oznaki." -#: ../gnome/applet/applet.c:436 -msgid "VPN Configuration Error" -msgstr "Napaka nastavitev VPN" - -#: ../gnome/applet/applet.c:437 +#: ../libnm-util/crypto.c:203 #, c-format -msgid "The VPN connection '%s' was not correctly configured." -msgstr "Povezava VPN '%s' ni pravilno nastavljena." +msgid "Malformed PEM file: unknown private key cipher '%s'." +msgstr "Slabo oblikovana datoteka PEM: neznana cifra zasebnega ključa '%s'." -#: ../gnome/applet/applet.c:442 +#: ../libnm-util/crypto.c:222 #, c-format -msgid "Could not start the VPN connection '%s' because the VPN server did not return an adequate network configuration." -msgstr "Ni mogoče začeti povezave VPN '%s', ker strežnik VPN ni vrnil ustreznih nastavitev." +msgid "Could not decode private key." +msgstr "Zasebnega ključa ni mogoče dekodirati." -#: ../gnome/applet/applet.c:512 -msgid "VPN Login Message" -msgstr "Prijavno sporočilo VPN" - -#: ../gnome/applet/applet.c:737 -#: ../gnome/applet/applet.c:2635 -#: ../gnome/applet/other-network-dialog.c:458 -#: ../gnome/applet/passphrase-dialog.c:228 -msgid "The NetworkManager Applet could not find some required resources (the glade file was not found)." -msgstr "Programček NetworkManager ne more najti nekaterih zahtevanih virov (datoteka glade ni bila najdena)." - -#: ../gnome/applet/applet.c:749 +#: ../libnm-util/crypto.c:267 #, c-format -msgid "The network device \"%s (%s)\" does not support wireless scanning." -msgstr "Omrežna naprava \"%s (%s)\" ne podpira skeniranja brezžičnih omrežij." +msgid "PEM certificate '%s' had no end tag '%s'." +msgstr "PEM potrdilo '%s' nima končne oznake '%s'." -#: ../gnome/applet/applet.c:757 +#: ../libnm-util/crypto.c:277 #, c-format -msgid "The network device \"%s (%s)\" does not support link detection." -msgstr "Omrežna naprava \"%s (%s)\" ne podpira odkrivanja povezav." +msgid "Failed to decode certificate." +msgstr "Dekodiranje potrdila je spodletelo." -#. Note to translators: this is used if no essid is known -#: ../gnome/applet/applet.c:905 -#: ../gnome/applet/applet.c:1103 -msgid "(unknown)" -msgstr "(neznano)" - -#: ../gnome/applet/applet.c:911 +#: ../libnm-util/crypto.c:286 #, c-format -msgid "Preparing device %s for the wired network..." -msgstr "Pripravljanje naprave %s na žično omrežje ..." +msgid "Not enough memory to store certificate data." +msgstr "Ni dovolj pomnilnika za shranjevanje podatkov potrdila." -#: ../gnome/applet/applet.c:913 +#: ../libnm-util/crypto.c:294 #, c-format -msgid "Preparing device %s for the wireless network '%s'..." -msgstr "Pripravljanje naprave %s na rezžično omrežje '%s' ..." +msgid "Not enough memory to store file data." +msgstr "Ni dovolj pomnilnika za shranjevanje podatkov datoteke." -#: ../gnome/applet/applet.c:921 +#: ../libnm-util/crypto.c:324 #, c-format -msgid "Configuring device %s for the wired network..." -msgstr "Nastavljanje naprave %s za žično omrežje ..." +msgid "IV must be an even number of bytes in length." +msgstr "IV mora biti dolg sodo število bajtov." -#: ../gnome/applet/applet.c:923 +#: ../libnm-util/crypto.c:333 #, c-format -msgid "Attempting to join the wireless network '%s'..." -msgstr "Poskus pridruževanja brezžičnemu omrežju '%s' ..." +msgid "Not enough memory to store the IV." +msgstr "Za shranjevanje IV ni dovolj pomnilnika." -#: ../gnome/applet/applet.c:931 +#: ../libnm-util/crypto.c:344 #, c-format -msgid "Waiting for Network Key for the wireless network '%s'..." -msgstr "Čakanje na omrežni ključ za brezžično omrežje '%s' ..." +msgid "IV contains non-hexadecimal digits." +msgstr "IV vsebuje ne-šestnajstiške številke." -#: ../gnome/applet/applet.c:939 -#: ../gnome/applet/applet.c:949 -msgid "Requesting a network address from the wired network..." -msgstr "Zahtevanje omrežnega naslova iz žičnega omrežja ..." - -#: ../gnome/applet/applet.c:941 -#: ../gnome/applet/applet.c:951 +#: ../libnm-util/crypto.c:382 +#: ../libnm-util/crypto_gnutls.c:148 +#: ../libnm-util/crypto_gnutls.c:266 +#: ../libnm-util/crypto_nss.c:171 +#: ../libnm-util/crypto_nss.c:335 #, c-format -msgid "Requesting a network address from the wireless network '%s'..." -msgstr "Zahtevanje omrežnega naslova iz brezžičnega omrežja '%s' ..." +msgid "Private key cipher '%s' was unknown." +msgstr "Cifra zasebnega ključa '%s' je neznana." -#: ../gnome/applet/applet.c:959 -msgid "Finishing connection to the wired network..." -msgstr "Zaključevanje povezave v žično omrežje ..." - -#: ../gnome/applet/applet.c:961 +#: ../libnm-util/crypto.c:391 #, c-format -msgid "Finishing connection to the wireless network '%s'..." -msgstr "Zaključevanje povezave v brezžično omrežje '%s' ..." +msgid "Not enough memory to decrypt private key." +msgstr "Ni dovolj pomnilnika za dešifriranje zasebnega ključa." -#: ../gnome/applet/applet.c:1078 -msgid "NetworkManager is not running" -msgstr "NetworkManager ni zagnan" - -#: ../gnome/applet/applet.c:1086 -#: ../gnome/applet/applet.c:1843 -msgid "Networking disabled" -msgstr "Omrežje onemogočeno" - -#: ../gnome/applet/applet.c:1091 -msgid "No network connection" -msgstr "Nobene omrežne povezave" - -#: ../gnome/applet/applet.c:1096 -msgid "Wired network connection" -msgstr "Žična omrežna povezava" - -#: ../gnome/applet/applet.c:1100 -msgid "Connected to an Ad-Hoc wireless network" -msgstr "Povezan v ad-hoc brezžično omrežje" - -#: ../gnome/applet/applet.c:1102 +#: ../libnm-util/crypto.c:511 #, c-format -msgid "Wireless network connection to '%s' (%d%%)" -msgstr "Brezžična omrežna povezava z '%s' (%d%%)" +msgid "Unable to determine private key type." +msgstr "Ni mogoče določiti vrste zasebnega ključa." -#: ../gnome/applet/applet.c:1123 +#: ../libnm-util/crypto.c:530 #, c-format -msgid "VPN connection to '%s'" -msgstr "Povezave VPN z '%s'" +msgid "Not enough memory to store decrypted private key." +msgstr "Ni dovolj pomnilnika za shranjevanje dešifriranega zasebnega ključa." -#: ../gnome/applet/applet.c:1131 +#: ../libnm-util/crypto_gnutls.c:49 +msgid "Failed to initialize the crypto engine." +msgstr "Zagon motorja šifriranja je spodletel." + +#: ../libnm-util/crypto_gnutls.c:93 #, c-format -msgid "VPN connecting to '%s'" -msgstr "Povezovanje VPN z '%s'" +msgid "Failed to initialize the MD5 engine: %s / %s." +msgstr "Zagon motorja MD5 je spodletel: %s / %s." -#: ../gnome/applet/applet.c:1556 -msgid "_Connect to Other Wireless Network..." -msgstr "Po_veži se v drugo brezžično omrežje ..." - -#: ../gnome/applet/applet.c:1577 -msgid "Create _New Wireless Network..." -msgstr "_Ustvari novo brezžično omrežje ..." - -#: ../gnome/applet/applet.c:1700 -msgid "_VPN Connections" -msgstr "_Povezave VPN" - -#: ../gnome/applet/applet.c:1745 -msgid "_Configure VPN..." -msgstr "_Nastavi VPN ..." - -#: ../gnome/applet/applet.c:1749 -msgid "_Disconnect VPN..." -msgstr "_Prekini povezavo z VPN ..." - -#: ../gnome/applet/applet.c:1771 -msgid "_Dial Up Connections" -msgstr "_Klicna povezava" - -#. FIXME: We should save and then check the state of the devices and show Connect _or_ Disconnect for each item -#: ../gnome/applet/applet.c:1782 +#: ../libnm-util/crypto_gnutls.c:156 #, c-format -msgid "Connect to %s..." -msgstr "Poveži se v %s ..." +msgid "Invalid IV length (must be at least %zd)." +msgstr "Neveljavna dolžina IV (mora biti vsaj %zd)" -#: ../gnome/applet/applet.c:1788 +#: ../libnm-util/crypto_gnutls.c:165 +#: ../libnm-util/crypto_nss.c:188 #, c-format -msgid "Disconnect from %s..." -msgstr "Prekini povezavo z %s ..." +msgid "Not enough memory for decrypted key buffer." +msgstr "Ni dovolj pomnilnika za medpomnilnik ključa dešifriranja." -#: ../gnome/applet/applet.c:1837 -msgid "No network devices have been found" -msgstr "Najdena ni bila nobena omrežna naprava" - -#: ../gnome/applet/applet.c:2029 -msgid "NetworkManager is not running..." -msgstr "NetworkManager ni zagnan ..." - -#. 'Enable Networking' item -#: ../gnome/applet/applet.c:2210 -msgid "Enable _Networking" -msgstr "Omogoči _omrežje" - -#. 'Enable Wireless' item -#: ../gnome/applet/applet.c:2216 -msgid "Enable _Wireless" -msgstr "Omogoči _brezžično omrežje" - -#. 'Connection Information' item -#: ../gnome/applet/applet.c:2222 -msgid "Connection _Information" -msgstr "_Informacije o povezavi" - -#. Help item -#: ../gnome/applet/applet.c:2233 -msgid "_Help" -msgstr "_Pomoč" - -#. About item -#: ../gnome/applet/applet.c:2242 -msgid "_About" -msgstr "_O Programu" - -#: ../gnome/applet/applet.c:2824 -msgid "The NetworkManager applet could not find some required resources. It cannot continue.\n" -msgstr "Programček NetworkManager ne more najti nekaterih zahtevanih virov. Ni mogoče nadaljevati.\n" - -#: ../gnome/applet/wireless-security-option.c:157 -msgid "Open System" -msgstr "Odprti sistem" - -#: ../gnome/applet/wireless-security-option.c:160 -msgid "Shared Key" -msgstr "Deljeni ključ" - -#: ../gnome/applet/wireless-security-option.c:208 -msgid "Automatic (Default)" -msgstr "Samodejno (privzeto)" - -#: ../gnome/applet/wireless-security-option.c:215 -msgid "AES-CCMP" -msgstr "AES-CCMP" - -#: ../gnome/applet/wireless-security-option.c:223 -msgid "TKIP" -msgstr "TKIP" - -#: ../gnome/applet/wireless-security-option.c:231 -msgid "Dynamic WEP" -msgstr "Dinamični WEP" - -#: ../gnome/applet/wso-none.c:53 -msgid "None" -msgstr "Brez" - -#: ../gnome/applet/wso-wep-ascii.c:138 -msgid "WEP 64/128-bit ASCII" -msgstr "WEP 64/128-bit ASCII" - -#: ../gnome/applet/wso-wep-hex.c:135 -msgid "WEP 64/128-bit Hex" -msgstr "WEP 64/128-bit Hex" - -#: ../gnome/applet/wso-wep-passphrase.c:135 -msgid "WEP 128-bit Passphrase" -msgstr "WEP 128-bit šifrirna fraza" - -#: ../gnome/applet/wso-wpa-eap.c:237 -msgid "PEAP" -msgstr "PEAP" - -#: ../gnome/applet/wso-wpa-eap.c:238 -msgid "TLS" -msgstr "TLS" - -#: ../gnome/applet/wso-wpa-eap.c:239 -msgid "TTLS" -msgstr "TTLS" - -#: ../gnome/applet/wso-wpa-eap.c:247 -#: ../src/nm-ap-security-wpa-eap.c:93 -#: ../src/nm-ap-security-wpa-eap.c:117 -msgid "WPA2 Enterprise" -msgstr "Podjetniški WPA2" - -#: ../gnome/applet/wso-wpa-eap.c:249 -#: ../src/nm-ap-security-wpa-eap.c:95 -#: ../src/nm-ap-security-wpa-eap.c:122 -msgid "WPA Enterprise" -msgstr "Podjetniški WPA" - -#: ../gnome/applet/wso-wpa-psk.c:178 -msgid "WPA2 Personal" -msgstr "Osebni WPA2" - -#: ../gnome/applet/wso-wpa-psk.c:180 -msgid "WPA Personal" -msgstr "Osebni WPA" - -#: ../gnome/applet/eggtrayicon.c:134 -msgid "Orientation" -msgstr "Usmerjenost" - -#: ../gnome/applet/eggtrayicon.c:135 -msgid "The orientation of the tray." -msgstr "Usmeritev pladnja." - -#: ../gnome/applet/menu-items.c:88 +#: ../libnm-util/crypto_gnutls.c:173 #, c-format -msgid "Wired Network (%s)" -msgstr "Žično omrežje (%s)" +msgid "Failed to initialize the decryption cipher context: %s / %s." +msgstr "Zagon vsebine cifre dešifriranje je spodletel: %s / %s." -#: ../gnome/applet/menu-items.c:91 -msgid "_Wired Network" -msgstr "Ž_ično omrežje" - -#: ../gnome/applet/menu-items.c:162 +#: ../libnm-util/crypto_gnutls.c:182 #, c-format -msgid "Wireless Network (%s)" -msgid_plural "Wireless Networks (%s)" -msgstr[0] "Brezžično omrežje (%s)" -msgstr[1] "Brezžični omrežji (%s)" -msgstr[2] "Brezžična omrežja (%s)" -msgstr[3] "Brezžična omrežja (%s)" +msgid "Failed to set symmetric key for decryption: %s / %s." +msgstr "Nastavljanje simetričnega ključa za dešifriranje je spodletelo: %s / %s. " -#: ../gnome/applet/menu-items.c:164 -msgid "Wireless Network" -msgid_plural "Wireless Networks" -msgstr[0] "Brezžično omrežje" -msgstr[1] "Brezžični omrežji" -msgstr[2] "Brezžična omrežja" -msgstr[3] "Brezžična omrežja" - -#: ../gnome/applet/menu-items.c:343 -msgid " (invalid Unicode)" -msgstr " (neveljaven Unicode)" - -#: ../gnome/applet/other-network-dialog.c:352 +#: ../libnm-util/crypto_gnutls.c:191 #, c-format -msgid "By default, the wireless network's name is set to your computer's name, %s, with no encryption enabled" -msgstr "Privzeto je ime brezžičnega omrežja nastavljeno na ime vašega računalnika, %s, brez omogočenega šifriranja" +msgid "Failed to set IV for decryption: %s / %s." +msgstr "Nastavljanje IV za dešifriranje je spodletelo: %s / %s." -#: ../gnome/applet/other-network-dialog.c:358 -msgid "Create new wireless network" -msgstr "Ustvari novo brezžično omrežje" - -#: ../gnome/applet/other-network-dialog.c:359 -msgid "Enter the name and security settings of the wireless network you wish to create." -msgstr "Vnesite ime in varnostne nastavitve brezžičnega omrežja, ki ga želite ustvariti." - -#: ../gnome/applet/other-network-dialog.c:363 -msgid "Create New Wireless Network" -msgstr "Ustvari novo brezžično omrežje" - -#: ../gnome/applet/other-network-dialog.c:368 -msgid "Existing wireless network" -msgstr "Obstoječe brezžično omrežje" - -#: ../gnome/applet/other-network-dialog.c:369 -msgid "Enter the name of the wireless network to which you wish to connect." -msgstr "Vnesite ime brezžičnega omrežja, v katerega se želite povezati." - -#: ../gnome/applet/other-network-dialog.c:371 -msgid "Connect to Other Wireless Network" -msgstr "Poveži se v drugo brezžično omrežje" - -#: ../gnome/applet/passphrase-dialog.c:215 -msgid "Error connecting to wireless network" -msgstr "Napaka pri povezovanju z brezžičnim omrežjem" - -#: ../gnome/applet/passphrase-dialog.c:216 -msgid "The requested wireless network requires security capabilities unsupported by your hardware." -msgstr "Zahtevano brezžično omrežje zahteva varnostne zmožnosti, ki so nepodprte z vašo strojno opremo." - -#: ../gnome/applet/vpn-password-dialog.c:151 -#: ../gnome/applet/vpn-password-dialog.c:188 +#: ../libnm-util/crypto_gnutls.c:200 #, c-format -msgid "Cannot start VPN connection '%s'" -msgstr "Ni mogoče začeti povezave VPN '%s'" +msgid "Failed to decrypt the private key: %s / %s." +msgstr "Dešifriranje zasebnega ključa je spodletelo: %s / %s." -#: ../gnome/applet/vpn-password-dialog.c:154 +#: ../libnm-util/crypto_gnutls.c:210 +#: ../libnm-util/crypto_nss.c:266 #, c-format -msgid "Could not find the authentication dialog for VPN connection type '%s'. Contact your system administrator." -msgstr "Ni mogoče najti pogovornega okna za overitev za povezavo VPN vrste '%s'. Kontaktirajte sistemskega administratorja." +msgid "Failed to decrypt the private key: unexpected padding length." +msgstr "Dešifriranje zasebnega ključa je spodletelo: nepričakovana dolžina blazinjenja." -#: ../gnome/applet/vpn-password-dialog.c:191 +#: ../libnm-util/crypto_gnutls.c:221 +#: ../libnm-util/crypto_nss.c:277 #, c-format -msgid "There was a problem launching the authentication dialog for VPN connection type '%s'. Contact your system administrator." -msgstr "Pri zagonu pogovornega okna za overovitev za povezavo VPN vrste '%s' je prišlo do problema. Kontaktirajte sistemskega administratorja." +msgid "Failed to decrypt the private key." +msgstr "Dešifriranje zasebnega ključa je spodletelo." -#: ../gnome/applet/applet.glade.h:1 -msgid " " -msgstr " " - -#: ../gnome/applet/applet.glade.h:2 -msgid "Active Connection Information" -msgstr "Informacije o aktivni povezavi" - -#: ../gnome/applet/applet.glade.h:4 -#, no-c-format -msgid "" -"Passphrase Required by Wireless Network\n" -"\n" -"A passphrase or encryption key is required to access the wireless network '%s'." -msgstr "" -"Šifrirna fraza, ki jo zahteva brezžično omrežje\n" -"\n" -"Za dostop do brezžičnega omrežja '%s' je zahtevana šifrirna fraza ali šifrirni ključ." - -#: ../gnome/applet/applet.glade.h:8 -#, no-c-format -msgid "" -"Reduced Network Functionality\n" -"\n" -"%s It will not be completely functional." -msgstr "" -"Zmanjšana uporabnost omrežja\n" -"\n" -"%s ne bo popolnoma uporaben." - -#: ../gnome/applet/applet.glade.h:12 -#, no-c-format -msgid "" -"Wireless Network Login Confirmation\n" -"\n" -"You have chosen to log in to the wireless network '%s'. If you are sure that this wireless network is secure, click the checkbox below and NetworkManager will not require confirmation on subsequent log ins." -msgstr "" -"Potrditev prijave v brezžično omrežje\n" -"\n" -"Izbrali ste prijavo v brezžično omrežje '%s'. Če ste prepričani, da je to brezžično omrežje varno, kliknite potrditveno polje spodaj in NetworkManager ne bo več zahteval potrditve za nadaljnje prijave." - -#: ../gnome/applet/applet.glade.h:15 -msgid "Anonymous Identity:" -msgstr "Anonimna identiteta:" - -#: ../gnome/applet/applet.glade.h:16 -msgid "Authentication:" -msgstr "Overovitev:" - -#: ../gnome/applet/applet.glade.h:17 -msgid "Broadcast Address:" -msgstr "Naslov za razpršeno oddajanje:" - -#: ../gnome/applet/applet.glade.h:18 -msgid "CA Certificate File:" -msgstr "Datoteka overiteljevega (CA) certifikata:" - -#: ../gnome/applet/applet.glade.h:19 -msgid "C_onnect" -msgstr "Po_veži se" - -#: ../gnome/applet/applet.glade.h:20 -msgid "Client Certificate File:" -msgstr "Datoteka odjemalčevega certifikata:" - -#: ../gnome/applet/applet.glade.h:21 -msgid "Connection Information" -msgstr "Informacije o povezavi" - -#: ../gnome/applet/applet.glade.h:22 -msgid "Default Route:" -msgstr "Privzeta smer:" - -#: ../gnome/applet/applet.glade.h:23 -msgid "Destination Address:" -msgstr "Ciljni naslov:" - -#: ../gnome/applet/applet.glade.h:24 -msgid "Driver:" -msgstr "Gonilnik:" - -#: ../gnome/applet/applet.glade.h:25 -msgid "EAP Method:" -msgstr "Metoda EAP:" - -#: ../gnome/applet/applet.glade.h:26 -msgid "Hardware Address:" -msgstr "Naslov strojne opreme:" - -#: ../gnome/applet/applet.glade.h:27 -msgid "IP Address:" -msgstr "IP naslov:" - -#: ../gnome/applet/applet.glade.h:28 -msgid "Identity:" -msgstr "Identiteta:" - -#: ../gnome/applet/applet.glade.h:29 -msgid "Interface:" -msgstr "Vmesnik:" - -#: ../gnome/applet/applet.glade.h:30 -msgid "Key Type:" -msgstr "Vrsta ključa:" - -#: ../gnome/applet/applet.glade.h:31 -msgid "Key management:" -msgstr "Upravljanje s ključi:" - -#: ../gnome/applet/applet.glade.h:32 -msgid "Key:" -msgstr "Ključ:" - -#: ../gnome/applet/applet.glade.h:33 -msgid "" -"None\n" -"WEP 128-bit Passphrase\n" -"WEP 64/128-bit Hex\n" -"WEP 64/128-bit ASCII\n" -msgstr "" -"Brez\n" -"WEP 128-bit šifrirna fraza\n" -"WEP 64/128-bit Hex\n" -"WEP 64/128-bit ASCII\n" - -#: ../gnome/applet/applet.glade.h:38 -msgid "" -"Open System\n" -"Shared Key" -msgstr "" -"Odprti sistem\n" -"Deljeni ključ" - -#: ../gnome/applet/applet.glade.h:40 -msgid "Other Wireless Network..." -msgstr "Drugo brezžično omrežje ..." - -#: ../gnome/applet/applet.glade.h:41 -msgid "Passphrase:" -msgstr "Šifrirna fraza:" - -#: ../gnome/applet/applet.glade.h:42 -msgid "Password:" -msgstr "Geslo:" - -#: ../gnome/applet/applet.glade.h:43 -msgid "Primary DNS:" -msgstr "Primarni DNS;" - -#: ../gnome/applet/applet.glade.h:44 -msgid "Private Key File:" -msgstr "Datoteka zasebnega ključa:" - -#: ../gnome/applet/applet.glade.h:45 -msgid "Private Key Password:" -msgstr "Geslo zasebnega ključa:" - -#: ../gnome/applet/applet.glade.h:46 -msgid "Secondary DNS:" -msgstr "Sekundarni DNS:" - -#: ../gnome/applet/applet.glade.h:47 -msgid "Select the CA Certificate File" -msgstr "Izberite datoteko overiteljevega (CA) certifikata" - -#: ../gnome/applet/applet.glade.h:48 -msgid "Select the Client Certificate File" -msgstr "Izberite datoteko odjemalčevega certifikata" - -#: ../gnome/applet/applet.glade.h:49 -msgid "Select the Private Key File" -msgstr "Izberite datoteko zasebnega ključa" - -#: ../gnome/applet/applet.glade.h:50 -msgid "Show key" -msgstr "Pokaži ključ" - -#: ../gnome/applet/applet.glade.h:51 -msgid "Show passphrase" -msgstr "Pokaži šifrirno frazo" - -#: ../gnome/applet/applet.glade.h:52 -msgid "Show password" -msgstr "Pokaži geslo" - -#: ../gnome/applet/applet.glade.h:53 -msgid "Show passwords" -msgstr "Pokaži gesla" - -#: ../gnome/applet/applet.glade.h:54 -msgid "Speed:" -msgstr "Hitrost:" - -#: ../gnome/applet/applet.glade.h:55 -msgid "Subnet Mask:" -msgstr "Maska podomrežja:" - -#: ../gnome/applet/applet.glade.h:56 -msgid "Type:" -msgstr "Vrsta:" - -#: ../gnome/applet/applet.glade.h:57 -msgid "User Name:" -msgstr "Uporabniško ime:" - -#: ../gnome/applet/applet.glade.h:58 -msgid "Wireless Network Key Required" -msgstr "Zahtevan ključ brezžičnega omrežja" - -#: ../gnome/applet/applet.glade.h:59 -msgid "Wireless _adapter:" -msgstr "Brezžični _vmesnik:" - -#: ../gnome/applet/applet.glade.h:60 -msgid "_Always Trust this Wireless Network" -msgstr "Vedno _zaupaj temu brezžičnemu omrežju" - -#: ../gnome/applet/applet.glade.h:61 -msgid "_Don't remind me again" -msgstr "_Ne spomni me več" - -#: ../gnome/applet/applet.glade.h:62 -msgid "_Fallback on this Network" -msgstr "" - -#: ../gnome/applet/applet.glade.h:63 -msgid "_Login to Network" -msgstr "_Prijava v omrežje" - -#: ../gnome/applet/applet.glade.h:64 -msgid "_Network Name:" -msgstr "_Ime omrežja:" - -#: ../gnome/applet/applet.glade.h:65 -msgid "_Wireless Security:" -msgstr "_Zaščita omrežja:" - -#: ../gnome/vpn-properties/nm-vpn-properties.c:417 -msgid "Cannot add VPN connection" -msgstr "Ni mogoče dodati povezave VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.c:419 -msgid "No suitable VPN software was found on your system. Contact your system administrator." -msgstr "Ustrezna programska oprema za VPN ni bila najdena na vašem sistemu. Kontaktirajte vašega sistemskega administratorja." - -#: ../gnome/vpn-properties/nm-vpn-properties.c:461 -msgid "Cannot import VPN connection" -msgstr "Ni mogoče uvoziti povezave VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.c:463 +#: ../libnm-util/crypto_gnutls.c:286 +#: ../libnm-util/crypto_nss.c:355 #, c-format -msgid "Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator." -msgstr "Ni mogoče najti ustrezne programske opreme za povezavo VPN vrste '%s' za uvoz datoteke '%s'. Kontaktirajte vašega sistemskega administratorja." +msgid "Could not allocate memory for encrypting." +msgstr "Pomnilnika za šifriranje ni mogoče dodeliti." -#: ../gnome/vpn-properties/nm-vpn-properties.c:580 +#: ../libnm-util/crypto_gnutls.c:294 #, c-format -msgid "Error retrieving VPN connection '%s'" -msgstr "Napaka pri pridobivanju povezave VPN '%s'" +msgid "Failed to initialize the encryption cipher context: %s / %s." +msgstr "Zagon vsebine šifrirne cifre je spodletel: %s / %s. " -#: ../gnome/vpn-properties/nm-vpn-properties.c:583 +#: ../libnm-util/crypto_gnutls.c:303 #, c-format -msgid "Could not find the UI files for VPN connection type '%s'. Contact your system administrator." -msgstr "Ni mogoče najti datotek uporabniškega vmesnika za povezavo VPN vrste \"%s\". Kontaktirajte vašega sistemskega administratorja." +msgid "Failed to set symmetric key for encryption: %s / %s." +msgstr "Nastavitev simetričnega ključa za šifriranje je spodletela: %s / %s." -#: ../gnome/vpn-properties/nm-vpn-properties.c:727 +#: ../libnm-util/crypto_gnutls.c:313 #, c-format -msgid "Delete VPN connection \"%s\"?" -msgstr "Ali želite izbrisati povezavo VPN \"%s\"?" +msgid "Failed to set IV for encryption: %s / %s." +msgstr "Nastavitev IV za šifriranje je spodletela: %s / %s." -#: ../gnome/vpn-properties/nm-vpn-properties.c:730 +#: ../libnm-util/crypto_gnutls.c:322 #, c-format -msgid "All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection." -msgstr "Vse informacije o povezavi VPN \"%s\" bodo izgubljene in mogoče boste potrebovali vašega sistemskega administratorja, da vam priskrbi informacije za ustvarjanje nove povezave." +msgid "Failed to encrypt the data: %s / %s." +msgstr "Šifriranje podatkov je spodletelo: %s / %s." -#: ../gnome/vpn-properties/nm-vpn-properties.c:924 -msgid "Unable to load" -msgstr "Ni mogoče naložiti" - -#: ../gnome/vpn-properties/nm-vpn-properties.c:926 -msgid "Cannot find some needed resources (the glade file)!" -msgstr "Ni mogoče najti nekaterih potrebnih virov (datoteke glade)!" - -#. druid_window = GTK_DIALOG (gtk_dialog_new_with_buttons (_("Create VPN Connection"), -#. NULL, -#. GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, -#. GTK_STOCK_CANCEL, -#. GTK_RESPONSE_REJECT, -#. GTK_STOCK_APPLY, -#. GTK_RESPONSE_ACCEPT, -#. NULL)); -#: ../gnome/vpn-properties/nm-vpn-properties.c:1081 -msgid "Create VPN Connection" -msgstr "Ustvari povezavo VPN" - -#. gtk_container_add (GTK_CONTAINER (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label"))); -#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(druid), TRUE,TRUE,0); -#. gtk_box_pack_start (GTK_BOX (druid_window->vbox), GTK_WIDGET(gtk_label_new("Some label")), TRUE,TRUE,0); -#. toplevel = gtk_widget_get_toplevel (GTK_WIDGET (druid)); -#. gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event", GTK_SIGNAL_FUNC (vpn_window_close), NULL); -#. make the druid window modal wrt. our main window -#. gtk_window_set_modal (druid_window, TRUE); -#. gtk_window_set_transient_for (GTK_WINDOW(druid_window), GTK_WINDOW (dialog)); -#. Edit dialog -#: ../gnome/vpn-properties/nm-vpn-properties.c:1099 -msgid "Edit VPN Connection" -msgstr "Uredi povezavo VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:1 -msgid "Add a new VPN connection" -msgstr "Dodaj novo povezavo VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:2 -msgid "Delete the selected VPN connection" -msgstr "Izbriši izbrano povezavo VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:3 -msgid "E_xport" -msgstr "I_zvozi" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:4 -msgid "Edit the selected VPN connection" -msgstr "Uredi izbrano povezavo VPN" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:5 -msgid "Export the VPN settings to a file" -msgstr "Izvozi nastavitve VPN v datoteko" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:6 -msgid "Export the selected VPN connection to a file" -msgstr "Izvozi izbrano povezavo VPN v datoteko" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:7 -msgid "Manage Virtual Private Network Connections" -msgstr "Upravljanje povezav navideznega zasebnega omrežja (VPN)" - -#: ../gnome/vpn-properties/nm-vpn-properties.glade.h:8 -msgid "VPN Connections" -msgstr "Povezave VPN" - -#: ../src/nm-ap-security-wep.c:52 -msgid "40-bit WEP" -msgstr "40-bitni WEP" - -#: ../src/nm-ap-security-wep.c:54 -msgid "104-bit WEP" -msgstr "104-bitni WEP" - -#: ../src/nm-ap-security-wpa-psk.c:50 -msgid "WPA TKIP" -msgstr "WPA TKIP" - -#: ../src/nm-ap-security-wpa-psk.c:52 -msgid "WPA CCMP" -msgstr "WPA CCMP" - -#: ../src/nm-ap-security-wpa-psk.c:54 -msgid "WPA Automatic" -msgstr "Samodejni WPA" - -#: ../src/nm-ap-security-wpa-psk.c:59 -msgid "WPA2 TKIP" -msgstr "WPA2 TKIP" - -#: ../src/nm-ap-security-wpa-psk.c:61 -msgid "WPA2 CCMP" -msgstr "WPA2 CCMP" - -#: ../src/nm-ap-security-wpa-psk.c:63 -msgid "WPA2 Automatic" -msgstr "Samodejni WPA2" - -#: ../src/nm-ap-security.c:338 -msgid "none" -msgstr "brez" - -#: ../src/nm-netlink-monitor.c:174 +#: ../libnm-util/crypto_gnutls.c:362 #, c-format -msgid "unable to create netlink socket for monitoring wired ethernet devices - %s" -msgstr "ni mogoče ustvariti netlink vtiča (netlink socket) za nadzor žičnih eternet naprav - %s" +msgid "Error initializing certificate data: %s" +msgstr "Napaka med zaganjanjem podatkov potrdila: %s" -#: ../src/nm-netlink-monitor.c:192 +#: ../libnm-util/crypto_gnutls.c:384 #, c-format -msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s" -msgstr "ni mogoče vzpostaviti vezi z netlink vtičem (netlink socket) za nadzor žičnih eternet naprav - %s" +msgid "Couldn't decode certificate: %s" +msgstr "Potrdila ni mogoča dekodirati: %s" -#: ../src/nm-netlink-monitor.c:427 -msgid "operation took too long" -msgstr "operacija je trajala predolgo" +#: ../libnm-util/crypto_gnutls.c:408 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %s" +msgstr "Dekodirnika PKCS#12 ni mogoče zagnati: %s" -#: ../src/nm-netlink-monitor.c:524 -msgid "received data from wrong type of sender" -msgstr "prejeti podatki od pošiljatelja napačne vrste" +#: ../libnm-util/crypto_gnutls.c:421 +#, c-format +msgid "Couldn't decode PKCS#12 file: %s" +msgstr "Datoteke PKCS#12 ni mogoče dekodirati: %s" -#: ../src/nm-netlink-monitor.c:537 -msgid "received data from unexpected sender" -msgstr "prejeti podatki od nepričakovanega pošiljatelja" +#: ../libnm-util/crypto_gnutls.c:433 +#, c-format +msgid "Couldn't verify PKCS#12 file: %s" +msgstr "Datoteke PKCS#12 ni mogoče preveriti: %s" -#: ../src/nm-netlink-monitor.c:666 -msgid "too much data was sent over socket and some of it was lost" -msgstr "preveč podatkov je bilo poslano preko vtiča in nekaj se jih je izgubilo" +#: ../libnm-util/crypto_nss.c:57 +#, c-format +msgid "Failed to initialize the crypto engine: %d." +msgstr "Zagon motorja šifriranja je spodletel: %d." -#: ../src/nm-netlink-monitor.c:776 +#: ../libnm-util/crypto_nss.c:111 +#, c-format +msgid "Failed to initialize the MD5 context: %d." +msgstr "Zagon vsebine MD5 je spodletel: %d." + +#: ../libnm-util/crypto_nss.c:179 +#, c-format +msgid "Invalid IV length (must be at least %d)." +msgstr "Neveljavna dolžina IV (mora biti vsaj %d)." + +#: ../libnm-util/crypto_nss.c:196 +#, c-format +msgid "Failed to initialize the decryption cipher slot." +msgstr "Zagon polja cifre dešifriranja je spodletel." + +#: ../libnm-util/crypto_nss.c:206 +#, c-format +msgid "Failed to set symmetric key for decryption." +msgstr "Nastavljanje simetričnega ključa za opis je spodletelo." + +#: ../libnm-util/crypto_nss.c:216 +#, c-format +msgid "Failed to set IV for decryption." +msgstr "Nastavljanje IV za dešifriranje je spodletelo." + +#: ../libnm-util/crypto_nss.c:224 +#, c-format +msgid "Failed to initialize the decryption context." +msgstr "Zagon vsebine dešifriranja je spodletel." + +#: ../libnm-util/crypto_nss.c:237 +#, c-format +msgid "Failed to decrypt the private key: %d." +msgstr "Dešifriranje zasebnega ključa je spodletelo: %d." + +#: ../libnm-util/crypto_nss.c:245 +#, c-format +msgid "Failed to decrypt the private key: decrypted data too large." +msgstr "Dešifriranje zasebnega ključa je spodletelo: dešifrirani podatki so preveliki." + +#: ../libnm-util/crypto_nss.c:256 +#, c-format +msgid "Failed to finalize decryption of the private key: %d." +msgstr "Končanje dešifriranja zasebnega ključa je spodletelo: %d." + +#: ../libnm-util/crypto_nss.c:363 +#, c-format +msgid "Failed to initialize the encryption cipher slot." +msgstr "Zagon polja cifre šifriranja je spodletel." + +#: ../libnm-util/crypto_nss.c:371 +#, c-format +msgid "Failed to set symmetric key for encryption." +msgstr "Nastavljanje simetričnega ključa za šifriranje je spodletelo." + +#: ../libnm-util/crypto_nss.c:379 +#, c-format +msgid "Failed to set IV for encryption." +msgstr "Nastavljanje IV za šifriranje je spodletelo." + +#: ../libnm-util/crypto_nss.c:387 +#, c-format +msgid "Failed to initialize the encryption context." +msgstr "Zaganjanje vsebine šifriranja je spodletelo." + +#: ../libnm-util/crypto_nss.c:395 +#, c-format +msgid "Failed to encrypt: %d." +msgstr "Šifriranje je spodletelo: %d." + +#: ../libnm-util/crypto_nss.c:403 +#, c-format +msgid "Unexpected amount of data after encrypting." +msgstr "Nepričakovana količina podatkov po šifriranju." + +#: ../libnm-util/crypto_nss.c:446 +#, c-format +msgid "Couldn't decode certificate: %d" +msgstr "Potrdila ni mogoče dekodirati: %d" + +#: ../libnm-util/crypto_nss.c:481 +#, c-format +msgid "Couldn't convert password to UCS2: %d" +msgstr "Gesla ni mogoče pretvoriti v UCS2: %d" + +#: ../libnm-util/crypto_nss.c:509 +#, c-format +msgid "Couldn't initialize PKCS#12 decoder: %d" +msgstr "Dekodirnika PKCS#12 ni mogoče zagnati: %d" + +#: ../libnm-util/crypto_nss.c:518 +#, c-format +msgid "Couldn't decode PKCS#12 file: %d" +msgstr "Datoteke PCKS#12 ni mogoče dekodirati: %d" + +#: ../libnm-util/crypto_nss.c:527 +#, c-format +msgid "Couldn't verify PKCS#12 file: %d" +msgstr "Datoteke PCKS#12 ni mogoče preveriti: %d" + +#: ../libnm-util/crypto_nss.c:556 +msgid "Could not generate random data." +msgstr "Naključnih podatkov ni mogoče ustvariti." + +#: ../libnm-util/nm-utils.c:1522 +#, c-format +msgid "Not enough memory to make encryption key." +msgstr "Ni dovolj pomnilnika za ustvarjanje šifrirnega ključa." + +#: ../libnm-util/nm-utils.c:1633 +msgid "Could not allocate memory for PEM file creation." +msgstr "Ni mogoče dodeliti pomnilnika za ustvarjanje datoteke PEM." + +#: ../libnm-util/nm-utils.c:1645 +#, c-format +msgid "Could not allocate memory for writing IV to PEM file." +msgstr "Ni mogoče dodeliti pomnilnika za zapis IV v datoteko PEM." + +#: ../libnm-util/nm-utils.c:1657 +#, c-format +msgid "Could not allocate memory for writing encrypted key to PEM file." +msgstr "Ni mogoče dodeliti pomnilnika za zapis šifriranega ključa v datoteko PEM." + +#: ../libnm-util/nm-utils.c:1676 +#, c-format +msgid "Could not allocate memory for PEM file data." +msgstr "Ni mogoče dodeliti pomnilnika za podatke datoteke PEM." + +#: ../src/nm-netlink-monitor.c:194 +#: ../src/nm-netlink-monitor.c:464 +#: ../src/nm-netlink-monitor.c:569 +#: ../src/ip6-manager/nm-netlink-listener.c:352 +#, c-format +msgid "error processing netlink message: %s" +msgstr "napaka med obdelovanjem sporočila netlink: %s" + +#: ../src/nm-netlink-monitor.c:260 +#, c-format +#| msgid "" +#| "unable to create netlink socket for monitoring wired ethernet devices - %s" +msgid "unable to allocate netlink handle for monitoring link status: %s" +msgstr "ni mogoče dodeliti ročice netlink za nadziranje stanja povezave: %s" + +#: ../src/nm-netlink-monitor.c:270 +#, c-format +#| msgid "" +#| "unable to bind to netlink socket for monitoring wired ethernet devices - %" +#| "s" +msgid "unable to connect to netlink for monitoring link status: %s" +msgstr "ni se mogoče povezati z netlink za nadziranje stanja povezave: %s" + +#: ../src/nm-netlink-monitor.c:278 +#, c-format +#| msgid "" +#| "unable to bind to netlink socket for monitoring wired ethernet devices - %" +#| "s" +msgid "unable to join netlink group for monitoring link status: %s" +msgstr "ni se mogoče povezati s skupino netlink za nadziranje stanja povezave: %s" + +#: ../src/nm-netlink-monitor.c:286 +#, c-format +#| msgid "" +#| "unable to create netlink socket for monitoring wired ethernet devices - %s" +msgid "unable to allocate netlink link cache for monitoring link status: %s" +msgstr "ni mogoče dodeliti predpomnilnika netlink povezav za nadziranje stanja povezave: %s" + +#: ../src/nm-netlink-monitor.c:494 +#: ../src/ip6-manager/nm-netlink-listener.c:382 msgid "error occurred while waiting for data on socket" msgstr "med čakanjem na podatke na vtiču je prišlo do napake" -#: ../gnome/applet/applet-dbus-devices.c:930 +#: ../src/nm-netlink-monitor.c:558 #, c-format -msgid "You are now connected to the Ad-Hoc wireless network '%s'." -msgstr "Zdaj ste povezani v ad-hoc brezžično omrežje '%s'." +msgid "error updating link cache: %s" +msgstr "napaka med posodabljanjem predpomnilnika povezave: %s" -#: ../gnome/applet/applet-dbus-devices.c:935 +#: ../src/NetworkManager.c:330 #, c-format -msgid "You are now connected to the wireless network '%s'." -msgstr "Zdaj ste povezani z brezžičnim omrežjem '%s'." +msgid "Invalid option. Please use --help to see a list of valid options.\n" +msgstr "Neveljavna možnost. Uporabite --help za seznam veljavnih možnosti.\n" -#: ../gnome/applet/applet-dbus-devices.c:942 -msgid "You are now connected to the wired network." -msgstr "Zdaj ste povezani z žičnim omrežjem." +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:304 +msgid "# Created by NetworkManager\n" +msgstr "#Ustvaril upravljalnik omrežij\n" -#: ../gnome/applet/applet-dbus-devices.c:948 -msgid "Connection Established" -msgstr "Povezava vzpostavljena" +#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310 +#, c-format +msgid "" +"# Merged from %s\n" +"\n" +msgstr "" +"# Združeno iz %s\n" +"\n" -#: ../gnome/applet/applet-dbus-devices.c:997 -msgid "Disconnected" -msgstr "Prekinjena povezava" +#: ../src/ip6-manager/nm-netlink-listener.c:200 +#, c-format +msgid "unable to allocate netlink handle: %s" +msgstr "Ročnika netlink ni mogoče dodeliti: %s" -#: ../gnome/applet/applet-dbus-devices.c:998 -msgid "The network connection has been disconnected." -msgstr "Omrežna povezava je bila prekinjena." +#: ../src/ip6-manager/nm-netlink-listener.c:210 +#, c-format +msgid "unable to connect to netlink: %s" +msgstr "z netlink se ni mogoče povezati: %s" -#: ../src/nm-ap-security-leap.c:66 -#: ../src/nm-ap-security-leap.c:82 -msgid "LEAP" -msgstr "LEAP" +#: ../src/ip6-manager/nm-netlink-listener.c:307 +#, c-format +msgid "unable to join netlink group: %s" +msgstr "skupini netlink se ni mogoče pridružiti: %s" + +#: ../src/named-manager/nm-named-manager.c:315 +msgid "NOTE: the libc resolver may not support more than 3 nameservers." +msgstr "OPOMBA: libc razreševalnik morda ne podpira več kot 3 imenske strežnike." + +#: ../src/named-manager/nm-named-manager.c:317 +msgid "The nameservers listed below may not be recognized." +msgstr "Imenski strežniki našteti spodaj morda ne bodo prepoznani." + +#: ../src/system-settings/nm-default-wired-connection.c:194 +#, c-format +msgid "Auto %s" +msgstr "Samodejno %s" + +#: ../system-settings/plugins/ifcfg-rh/reader.c:2406 +#| msgid "Open System" +msgid "System" +msgstr "Sistem" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:1 +msgid "Connection sharing via a protected WiFi network" +msgstr "Deljene povezave preko zaščitenega WiFi omrežja" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:2 +msgid "Connection sharing via an open WiFi network" +msgstr "Deljene povezave preko odprtega WiFi omrežja" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:3 +msgid "Modify persistent system hostname" +msgstr "Spremeni trajno sistemsko ime gostitelja" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:4 +#| msgid "No active connections!" +msgid "Modify system connections" +msgstr "Spremeni sistemske povezave" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:5 +msgid "System policy prevents modification of system settings" +msgstr "Sistemska določila onemogočajo spreminjanje sistemskih nastavitev" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:6 +msgid "System policy prevents modification of the persistent system hostname" +msgstr "Sistemska pravila preprečujejo spremembo imena gostitelja trajnega sistema" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:7 +msgid "System policy prevents sharing connections via a protected WiFi network" +msgstr "Sistemska pravila preprečujejo deljenje povezav preko zaščitenega WiFi omrežja" + +#: ../policy/org.freedesktop.network-manager-settings.system.policy.in.h:8 +msgid "System policy prevents sharing connections via an open WiFi network" +msgstr "Sistemska pravila preprečujejo deljenje povezav preko odprtega WiFi omrežja" + +#~ msgid "Passphrase for wireless network %s" +#~ msgstr "Šifrirna fraza za brezžično omrežje %s" +#~ msgid "Connection to the wireless network '%s' failed." +#~ msgstr "Povezava z brezžičnim omrežjem %s ni uspela" +#~ msgid "Connection to the wired network failed." +#~ msgstr "Povezava z žičnim omrežjem ni uspela." +#~ msgid "Error displaying connection information:" +#~ msgstr "Napaka pri prikazovanju informacij o povezavi:" +#~ msgid "Could not find some required resources (the glade file)!" +#~ msgstr "Ni mogoče najti nekaterih zahtevanih virov (datoteke glade)!" +#~ msgid "%d Mb/s" +#~ msgstr "%d Mb/s" +#~ msgid "Wired Ethernet (%s)" +#~ msgstr "Žični eternet (%s)" +#~ msgid "Wireless Ethernet (%s)" +#~ msgstr "Brezžični eternet (%s)" +#~ msgid "Unknown" +#~ msgstr "Neznano" +#~ msgid "NetworkManager Applet" +#~ msgstr "Programček NetworkManager" +#~ msgid "" +#~ "Copyright © 2004-2006 Red Hat, Inc.\n" +#~ "Copyright © 2005-2006 Novell, Inc." +#~ msgstr "" +#~ "Copyright © 2004-2006 Red Hat, Inc.\n" +#~ "Copyright © 2005-2006 Novell, Inc." +#~ msgid "" +#~ "Notification area applet for managing your network devices and " +#~ "connections." +#~ msgstr "" +#~ "Programček za območje obvestil za upravljanje vaših mrežnih naprav in " +#~ "povezav." +#~ msgid "translator-credits" +#~ msgstr "Matic Žgur " +#~ msgid "" +#~ "Copyright © 2004-2005 Red Hat, Inc.\n" +#~ "Copyright © 2005-2006 Novell, Inc." +#~ msgstr "" +#~ "Copyright © 2004-2005 Red Hat, Inc.\n" +#~ "Copyright © 2005-2006 Novell, Inc." +#~ msgid "VPN Login Failure" +#~ msgstr "Neuspela prijava VPN" +#~ msgid "Could not start the VPN connection '%s' due to a login failure." +#~ msgstr "Ni mogoče začeti povezave VPN '%s' zaradi neuspele prijave." +#~ msgid "VPN Start Failure" +#~ msgstr "Neuspel zagon VPN" +#~ msgid "" +#~ "Could not start the VPN connection '%s' due to a failure launching the " +#~ "VPN program." +#~ msgstr "" +#~ "Ni mogoče začeti povezave VPN '%s' zaradi neuspelega zagona programa VPN." +#~ msgid "VPN Connect Failure" +#~ msgstr "Neuspela povezava VPN" +#~ msgid "Could not start the VPN connection '%s' due to a connection error." +#~ msgstr "Ni mogoče začeti povezave VPN '%s' zaradi napake pri povezavi." +#~ msgid "VPN Configuration Error" +#~ msgstr "Napaka nastavitev VPN" +#~ msgid "The VPN connection '%s' was not correctly configured." +#~ msgstr "Povezava VPN '%s' ni pravilno nastavljena." +#~ msgid "" +#~ "Could not start the VPN connection '%s' because the VPN server did not " +#~ "return an adequate network configuration." +#~ msgstr "" +#~ "Ni mogoče začeti povezave VPN '%s', ker strežnik VPN ni vrnil ustreznih " +#~ "nastavitev." +#~ msgid "VPN Login Message" +#~ msgstr "Prijavno sporočilo VPN" +#~ msgid "" +#~ "The NetworkManager Applet could not find some required resources (the " +#~ "glade file was not found)." +#~ msgstr "" +#~ "Programček NetworkManager ne more najti nekaterih zahtevanih virov " +#~ "(datoteka glade ni bila najdena)." +#~ msgid "The network device \"%s (%s)\" does not support wireless scanning." +#~ msgstr "" +#~ "Omrežna naprava \"%s (%s)\" ne podpira skeniranja brezžičnih omrežij." +#~ msgid "The network device \"%s (%s)\" does not support link detection." +#~ msgstr "Omrežna naprava \"%s (%s)\" ne podpira odkrivanja povezav." +#~ msgid "(unknown)" +#~ msgstr "(neznano)" +#~ msgid "Preparing device %s for the wired network..." +#~ msgstr "Pripravljanje naprave %s na žično omrežje ..." +#~ msgid "Preparing device %s for the wireless network '%s'..." +#~ msgstr "Pripravljanje naprave %s na rezžično omrežje '%s' ..." +#~ msgid "Configuring device %s for the wired network..." +#~ msgstr "Nastavljanje naprave %s za žično omrežje ..." +#~ msgid "Attempting to join the wireless network '%s'..." +#~ msgstr "Poskus pridruževanja brezžičnemu omrežju '%s' ..." +#~ msgid "Waiting for Network Key for the wireless network '%s'..." +#~ msgstr "Čakanje na omrežni ključ za brezžično omrežje '%s' ..." +#~ msgid "Requesting a network address from the wired network..." +#~ msgstr "Zahtevanje omrežnega naslova iz žičnega omrežja ..." +#~ msgid "Requesting a network address from the wireless network '%s'..." +#~ msgstr "Zahtevanje omrežnega naslova iz brezžičnega omrežja '%s' ..." +#~ msgid "Finishing connection to the wired network..." +#~ msgstr "Zaključevanje povezave v žično omrežje ..." +#~ msgid "Finishing connection to the wireless network '%s'..." +#~ msgstr "Zaključevanje povezave v brezžično omrežje '%s' ..." +#~ msgid "NetworkManager is not running" +#~ msgstr "NetworkManager ni zagnan" +#~ msgid "Networking disabled" +#~ msgstr "Omrežje onemogočeno" +#~ msgid "No network connection" +#~ msgstr "Nobene omrežne povezave" +#~ msgid "Wired network connection" +#~ msgstr "Žična omrežna povezava" +#~ msgid "Connected to an Ad-Hoc wireless network" +#~ msgstr "Povezan v ad-hoc brezžično omrežje" +#~ msgid "Wireless network connection to '%s' (%d%%)" +#~ msgstr "Brezžična omrežna povezava z '%s' (%d%%)" +#~ msgid "VPN connection to '%s'" +#~ msgstr "Povezave VPN z '%s'" +#~ msgid "VPN connecting to '%s'" +#~ msgstr "Povezovanje VPN z '%s'" +#~ msgid "_Connect to Other Wireless Network..." +#~ msgstr "Po_veži se v drugo brezžično omrežje ..." +#~ msgid "Create _New Wireless Network..." +#~ msgstr "_Ustvari novo brezžično omrežje ..." +#~ msgid "_VPN Connections" +#~ msgstr "_Povezave VPN" +#~ msgid "_Configure VPN..." +#~ msgstr "_Nastavi VPN ..." +#~ msgid "_Disconnect VPN..." +#~ msgstr "_Prekini povezavo z VPN ..." +#~ msgid "_Dial Up Connections" +#~ msgstr "_Klicna povezava" +#~ msgid "Connect to %s..." +#~ msgstr "Poveži se v %s ..." +#~ msgid "Disconnect from %s..." +#~ msgstr "Prekini povezavo z %s ..." +#~ msgid "No network devices have been found" +#~ msgstr "Najdena ni bila nobena omrežna naprava" +#~ msgid "NetworkManager is not running..." +#~ msgstr "NetworkManager ni zagnan ..." +#~ msgid "Enable _Networking" +#~ msgstr "Omogoči _omrežje" +#~ msgid "Enable _Wireless" +#~ msgstr "Omogoči _brezžično omrežje" +#~ msgid "Connection _Information" +#~ msgstr "_Informacije o povezavi" +#~ msgid "_Help" +#~ msgstr "_Pomoč" +#~ msgid "_About" +#~ msgstr "_O Programu" +#~ msgid "" +#~ "The NetworkManager applet could not find some required resources. It " +#~ "cannot continue.\n" +#~ msgstr "" +#~ "Programček NetworkManager ne more najti nekaterih zahtevanih virov. Ni " +#~ "mogoče nadaljevati.\n" +#~ msgid "Shared Key" +#~ msgstr "Deljeni ključ" +#~ msgid "Automatic (Default)" +#~ msgstr "Samodejno (privzeto)" +#~ msgid "AES-CCMP" +#~ msgstr "AES-CCMP" +#~ msgid "TKIP" +#~ msgstr "TKIP" +#~ msgid "Dynamic WEP" +#~ msgstr "Dinamični WEP" +#~ msgid "None" +#~ msgstr "Brez" +#~ msgid "WEP 64/128-bit ASCII" +#~ msgstr "WEP 64/128-bit ASCII" +#~ msgid "WEP 64/128-bit Hex" +#~ msgstr "WEP 64/128-bit Hex" +#~ msgid "WEP 128-bit Passphrase" +#~ msgstr "WEP 128-bit šifrirna fraza" +#~ msgid "PEAP" +#~ msgstr "PEAP" +#~ msgid "TLS" +#~ msgstr "TLS" +#~ msgid "TTLS" +#~ msgstr "TTLS" +#~ msgid "WPA2 Enterprise" +#~ msgstr "Podjetniški WPA2" +#~ msgid "WPA Enterprise" +#~ msgstr "Podjetniški WPA" +#~ msgid "WPA2 Personal" +#~ msgstr "Osebni WPA2" +#~ msgid "WPA Personal" +#~ msgstr "Osebni WPA" +#~ msgid "Orientation" +#~ msgstr "Usmerjenost" +#~ msgid "The orientation of the tray." +#~ msgstr "Usmeritev pladnja." +#~ msgid "Wired Network (%s)" +#~ msgstr "Žično omrežje (%s)" +#~ msgid "_Wired Network" +#~ msgstr "Ž_ično omrežje" +#~ msgid "Wireless Network (%s)" +#~ msgid_plural "Wireless Networks (%s)" +#~ msgstr[0] "Brezžično omrežje (%s)" +#~ msgstr[1] "Brezžični omrežji (%s)" +#~ msgstr[2] "Brezžična omrežja (%s)" +#~ msgstr[3] "Brezžična omrežja (%s)" +#~ msgid "Wireless Network" +#~ msgid_plural "Wireless Networks" +#~ msgstr[0] "Brezžično omrežje" +#~ msgstr[1] "Brezžični omrežji" +#~ msgstr[2] "Brezžična omrežja" +#~ msgstr[3] "Brezžična omrežja" +#~ msgid " (invalid Unicode)" +#~ msgstr " (neveljaven Unicode)" +#~ msgid "" +#~ "By default, the wireless network's name is set to your computer's name, %" +#~ "s, with no encryption enabled" +#~ msgstr "" +#~ "Privzeto je ime brezžičnega omrežja nastavljeno na ime vašega " +#~ "računalnika, %s, brez omogočenega šifriranja" +#~ msgid "Create new wireless network" +#~ msgstr "Ustvari novo brezžično omrežje" +#~ msgid "" +#~ "Enter the name and security settings of the wireless network you wish to " +#~ "create." +#~ msgstr "" +#~ "Vnesite ime in varnostne nastavitve brezžičnega omrežja, ki ga želite " +#~ "ustvariti." +#~ msgid "Create New Wireless Network" +#~ msgstr "Ustvari novo brezžično omrežje" +#~ msgid "Existing wireless network" +#~ msgstr "Obstoječe brezžično omrežje" +#~ msgid "Enter the name of the wireless network to which you wish to connect." +#~ msgstr "Vnesite ime brezžičnega omrežja, v katerega se želite povezati." +#~ msgid "Connect to Other Wireless Network" +#~ msgstr "Poveži se v drugo brezžično omrežje" +#~ msgid "Error connecting to wireless network" +#~ msgstr "Napaka pri povezovanju z brezžičnim omrežjem" +#~ msgid "" +#~ "The requested wireless network requires security capabilities unsupported " +#~ "by your hardware." +#~ msgstr "" +#~ "Zahtevano brezžično omrežje zahteva varnostne zmožnosti, ki so nepodprte " +#~ "z vašo strojno opremo." +#~ msgid "Cannot start VPN connection '%s'" +#~ msgstr "Ni mogoče začeti povezave VPN '%s'" +#~ msgid "" +#~ "Could not find the authentication dialog for VPN connection type '%s'. " +#~ "Contact your system administrator." +#~ msgstr "" +#~ "Ni mogoče najti pogovornega okna za overitev za povezavo VPN vrste '%s'. " +#~ "Kontaktirajte sistemskega administratorja." +#~ msgid "" +#~ "There was a problem launching the authentication dialog for VPN " +#~ "connection type '%s'. Contact your system administrator." +#~ msgstr "" +#~ "Pri zagonu pogovornega okna za overovitev za povezavo VPN vrste '%s' je " +#~ "prišlo do problema. Kontaktirajte sistemskega administratorja." +#~ msgid " " +#~ msgstr " " +#~ msgid "" +#~ "Active Connection Information" +#~ msgstr "" +#~ "Informacije o aktivni povezavi" +#~ msgid "" +#~ "Passphrase Required by Wireless " +#~ "Network\n" +#~ "\n" +#~ "A passphrase or encryption key is required to access the wireless network " +#~ "'%s'." +#~ msgstr "" +#~ "Šifrirna fraza, ki jo zahteva " +#~ "brezžično omrežje\n" +#~ "\n" +#~ "Za dostop do brezžičnega omrežja '%s' je zahtevana šifrirna fraza ali " +#~ "šifrirni ključ." +#~ msgid "" +#~ "Reduced Network Functionality\n" +#~ "\n" +#~ "%s It will not be completely functional." +#~ msgstr "" +#~ "Zmanjšana uporabnost omrežja\n" +#~ "\n" +#~ "%s ne bo popolnoma uporaben." +#~ msgid "" +#~ "Wireless Network Login " +#~ "Confirmation\n" +#~ "\n" +#~ "You have chosen to log in to the wireless network '%s'. If you are sure " +#~ "that this wireless network is secure, click the checkbox below and " +#~ "NetworkManager will not require confirmation on subsequent log ins." +#~ msgstr "" +#~ "Potrditev prijave v brezžično " +#~ "omrežje\n" +#~ "\n" +#~ "Izbrali ste prijavo v brezžično omrežje '%s'. Če ste prepričani, da je to " +#~ "brezžično omrežje varno, kliknite potrditveno polje spodaj in " +#~ "NetworkManager ne bo več zahteval potrditve za nadaljnje prijave." +#~ msgid "Anonymous Identity:" +#~ msgstr "Anonimna identiteta:" +#~ msgid "Authentication:" +#~ msgstr "Overovitev:" +#~ msgid "Broadcast Address:" +#~ msgstr "Naslov za razpršeno oddajanje:" +#~ msgid "CA Certificate File:" +#~ msgstr "Datoteka overiteljevega (CA) certifikata:" +#~ msgid "C_onnect" +#~ msgstr "Po_veži se" +#~ msgid "Client Certificate File:" +#~ msgstr "Datoteka odjemalčevega certifikata:" +#~ msgid "Connection Information" +#~ msgstr "Informacije o povezavi" +#~ msgid "Default Route:" +#~ msgstr "Privzeta smer:" +#~ msgid "Destination Address:" +#~ msgstr "Ciljni naslov:" +#~ msgid "Driver:" +#~ msgstr "Gonilnik:" +#~ msgid "EAP Method:" +#~ msgstr "Metoda EAP:" +#~ msgid "Hardware Address:" +#~ msgstr "Naslov strojne opreme:" +#~ msgid "IP Address:" +#~ msgstr "IP naslov:" +#~ msgid "Identity:" +#~ msgstr "Identiteta:" +#~ msgid "Interface:" +#~ msgstr "Vmesnik:" +#~ msgid "Key Type:" +#~ msgstr "Vrsta ključa:" +#~ msgid "Key management:" +#~ msgstr "Upravljanje s ključi:" +#~ msgid "Key:" +#~ msgstr "Ključ:" +#~ msgid "" +#~ "None\n" +#~ "WEP 128-bit Passphrase\n" +#~ "WEP 64/128-bit Hex\n" +#~ "WEP 64/128-bit ASCII\n" +#~ msgstr "" +#~ "Brez\n" +#~ "WEP 128-bit šifrirna fraza\n" +#~ "WEP 64/128-bit Hex\n" +#~ "WEP 64/128-bit ASCII\n" +#~ msgid "" +#~ "Open System\n" +#~ "Shared Key" +#~ msgstr "" +#~ "Odprti sistem\n" +#~ "Deljeni ključ" +#~ msgid "Other Wireless Network..." +#~ msgstr "Drugo brezžično omrežje ..." +#~ msgid "Passphrase:" +#~ msgstr "Šifrirna fraza:" +#~ msgid "Password:" +#~ msgstr "Geslo:" +#~ msgid "Primary DNS:" +#~ msgstr "Primarni DNS;" +#~ msgid "Private Key File:" +#~ msgstr "Datoteka zasebnega ključa:" +#~ msgid "Private Key Password:" +#~ msgstr "Geslo zasebnega ključa:" +#~ msgid "Secondary DNS:" +#~ msgstr "Sekundarni DNS:" +#~ msgid "Select the CA Certificate File" +#~ msgstr "Izberite datoteko overiteljevega (CA) certifikata" +#~ msgid "Select the Client Certificate File" +#~ msgstr "Izberite datoteko odjemalčevega certifikata" +#~ msgid "Select the Private Key File" +#~ msgstr "Izberite datoteko zasebnega ključa" +#~ msgid "Show key" +#~ msgstr "Pokaži ključ" +#~ msgid "Show passphrase" +#~ msgstr "Pokaži šifrirno frazo" +#~ msgid "Show password" +#~ msgstr "Pokaži geslo" +#~ msgid "Show passwords" +#~ msgstr "Pokaži gesla" +#~ msgid "Speed:" +#~ msgstr "Hitrost:" +#~ msgid "Subnet Mask:" +#~ msgstr "Maska podomrežja:" +#~ msgid "Type:" +#~ msgstr "Vrsta:" +#~ msgid "User Name:" +#~ msgstr "Uporabniško ime:" +#~ msgid "Wireless Network Key Required" +#~ msgstr "Zahtevan ključ brezžičnega omrežja" +#~ msgid "Wireless _adapter:" +#~ msgstr "Brezžični _vmesnik:" +#~ msgid "_Always Trust this Wireless Network" +#~ msgstr "Vedno _zaupaj temu brezžičnemu omrežju" +#~ msgid "_Don't remind me again" +#~ msgstr "_Ne spomni me več" +#~ msgid "_Login to Network" +#~ msgstr "_Prijava v omrežje" +#~ msgid "_Network Name:" +#~ msgstr "_Ime omrežja:" +#~ msgid "_Wireless Security:" +#~ msgstr "_Zaščita omrežja:" +#~ msgid "Cannot add VPN connection" +#~ msgstr "Ni mogoče dodati povezave VPN" +#~ msgid "" +#~ "No suitable VPN software was found on your system. Contact your system " +#~ "administrator." +#~ msgstr "" +#~ "Ustrezna programska oprema za VPN ni bila najdena na vašem sistemu. " +#~ "Kontaktirajte vašega sistemskega administratorja." +#~ msgid "Cannot import VPN connection" +#~ msgstr "Ni mogoče uvoziti povezave VPN" +#~ msgid "" +#~ "Cannot find suitable software for VPN connection type '%s' to import the " +#~ "file '%s'. Contact your system administrator." +#~ msgstr "" +#~ "Ni mogoče najti ustrezne programske opreme za povezavo VPN vrste '%s' za " +#~ "uvoz datoteke '%s'. Kontaktirajte vašega sistemskega administratorja." +#~ msgid "Error retrieving VPN connection '%s'" +#~ msgstr "Napaka pri pridobivanju povezave VPN '%s'" +#~ msgid "" +#~ "Could not find the UI files for VPN connection type '%s'. Contact your " +#~ "system administrator." +#~ msgstr "" +#~ "Ni mogoče najti datotek uporabniškega vmesnika za povezavo VPN vrste \"%s" +#~ "\". Kontaktirajte vašega sistemskega administratorja." +#~ msgid "Delete VPN connection \"%s\"?" +#~ msgstr "Ali želite izbrisati povezavo VPN \"%s\"?" +#~ msgid "" +#~ "All information about the VPN connection \"%s\" will be lost and you may " +#~ "need your system administrator to provide information to create a new " +#~ "connection." +#~ msgstr "" +#~ "Vse informacije o povezavi VPN \"%s\" bodo izgubljene in mogoče boste " +#~ "potrebovali vašega sistemskega administratorja, da vam priskrbi " +#~ "informacije za ustvarjanje nove povezave." +#~ msgid "Unable to load" +#~ msgstr "Ni mogoče naložiti" +#~ msgid "Cannot find some needed resources (the glade file)!" +#~ msgstr "Ni mogoče najti nekaterih potrebnih virov (datoteke glade)!" +#~ msgid "Create VPN Connection" +#~ msgstr "Ustvari povezavo VPN" +#~ msgid "Edit VPN Connection" +#~ msgstr "Uredi povezavo VPN" +#~ msgid "Add a new VPN connection" +#~ msgstr "Dodaj novo povezavo VPN" +#~ msgid "Delete the selected VPN connection" +#~ msgstr "Izbriši izbrano povezavo VPN" +#~ msgid "E_xport" +#~ msgstr "I_zvozi" +#~ msgid "Edit the selected VPN connection" +#~ msgstr "Uredi izbrano povezavo VPN" +#~ msgid "Export the VPN settings to a file" +#~ msgstr "Izvozi nastavitve VPN v datoteko" +#~ msgid "Export the selected VPN connection to a file" +#~ msgstr "Izvozi izbrano povezavo VPN v datoteko" +#~ msgid "Manage Virtual Private Network Connections" +#~ msgstr "Upravljanje povezav navideznega zasebnega omrežja (VPN)" +#~ msgid "VPN Connections" +#~ msgstr "Povezave VPN" +#~ msgid "40-bit WEP" +#~ msgstr "40-bitni WEP" +#~ msgid "104-bit WEP" +#~ msgstr "104-bitni WEP" +#~ msgid "WPA TKIP" +#~ msgstr "WPA TKIP" +#~ msgid "WPA CCMP" +#~ msgstr "WPA CCMP" +#~ msgid "WPA Automatic" +#~ msgstr "Samodejni WPA" +#~ msgid "WPA2 TKIP" +#~ msgstr "WPA2 TKIP" +#~ msgid "WPA2 CCMP" +#~ msgstr "WPA2 CCMP" +#~ msgid "WPA2 Automatic" +#~ msgstr "Samodejni WPA2" +#~ msgid "none" +#~ msgstr "brez" +#~ msgid "operation took too long" +#~ msgstr "operacija je trajala predolgo" +#~ msgid "received data from wrong type of sender" +#~ msgstr "prejeti podatki od pošiljatelja napačne vrste" +#~ msgid "received data from unexpected sender" +#~ msgstr "prejeti podatki od nepričakovanega pošiljatelja" +#~ msgid "too much data was sent over socket and some of it was lost" +#~ msgstr "" +#~ "preveč podatkov je bilo poslano preko vtiča in nekaj se jih je izgubilo" +#~ msgid "You are now connected to the Ad-Hoc wireless network '%s'." +#~ msgstr "Zdaj ste povezani v ad-hoc brezžično omrežje '%s'." +#~ msgid "You are now connected to the wireless network '%s'." +#~ msgstr "Zdaj ste povezani z brezžičnim omrežjem '%s'." +#~ msgid "You are now connected to the wired network." +#~ msgstr "Zdaj ste povezani z žičnim omrežjem." +#~ msgid "Connection Established" +#~ msgstr "Povezava vzpostavljena" +#~ msgid "Disconnected" +#~ msgstr "Prekinjena povezava" +#~ msgid "The network connection has been disconnected." +#~ msgstr "Omrežna povezava je bila prekinjena." +#~ msgid "LEAP" +#~ msgstr "LEAP" diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 5b860aae0a..5c5ae4027b 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -315,9 +315,9 @@ update_etc_hosts (const char *hostname) /* Hmm, /etc/hosts was empty for some reason */ if (!added) { - g_string_append (new_contents, "# Do not remove the following line, or various programs"); - g_string_append (new_contents, "# that require network functionality will fail."); - g_string_append (new_contents, "127.0.0.1\t" FALLBACK_HOSTNAME "\tlocalhost"); + g_string_append (new_contents, "# Do not remove the following line, or various programs\n"); + g_string_append (new_contents, "# that require network functionality will fail.\n"); + g_string_append (new_contents, "127.0.0.1\t" FALLBACK_HOSTNAME "\tlocalhost\n"); } error = NULL; diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index 65c96b591e..0e037c41d1 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -49,6 +49,10 @@ if TARGET_MANDRIVA libnmbackend_la_SOURCES += NetworkManagerMandriva.c endif +if TARGET_PARDUS +libnmbackend_la_SOURCES += NetworkManagerPardus.c +endif + libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) libnmbackend_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ diff --git a/src/backends/NetworkManagerPardus.c b/src/backends/NetworkManagerPardus.c new file mode 100644 index 0000000000..52703e23d2 --- /dev/null +++ b/src/backends/NetworkManagerPardus.c @@ -0,0 +1,57 @@ +/* NetworkManager -- Network link manager + * + * Ozan Caglayan + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * (C) Copyright 2004 RedHat, Inc. + * (C) Copyright 2009 TUBITAK/UEKAE + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "NetworkManagerGeneric.h" +#include "NetworkManagerSystem.h" + +/* + * nm_system_enable_loopback + * + * Bring up the loopback interface + * + */ +void nm_system_enable_loopback (void) +{ + nm_generic_enable_loopback (); +} + + +/* + * nm_system_update_dns + * + * Make glibc/nscd aware of any changes to the resolv.conf file by + * restarting nscd. + * + */ +void nm_system_update_dns (void) +{ + /* I'm not running nscd */ +} + diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c index ad81a5a78b..9c229d5804 100644 --- a/src/nm-device-olpc-mesh.c +++ b/src/nm-device-olpc-mesh.c @@ -682,7 +682,10 @@ get_property (GObject *object, guint prop_id, g_value_take_string (value, nm_ether_ntop (&hw_addr)); break; case PROP_COMPANION: - g_value_set_string (value, nm_device_get_path (priv->companion)); + if (priv->companion) + g_value_set_boxed (value, nm_device_get_path (priv->companion)); + else + g_value_set_boxed (value, "/"); break; case PROP_ACTIVE_CHANNEL: g_value_set_uint (value, nm_device_olpc_mesh_get_channel (device)); @@ -749,13 +752,15 @@ nm_device_olpc_mesh_class_init (NMDeviceOlpcMeshClass *klass) "Hardware MAC address", NULL, G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_COMPANION, - g_param_spec_string (NM_DEVICE_OLPC_MESH_COMPANION, - "Companion device", - "Companion device object path", - NULL, - G_PARAM_READABLE)); + g_param_spec_boxed (NM_DEVICE_OLPC_MESH_COMPANION, + "Companion device", + "Companion device object path", + DBUS_TYPE_G_OBJECT_PATH, + G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_ACTIVE_CHANNEL, g_param_spec_uint (NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL, @@ -801,7 +806,11 @@ companion_notify_cb (NMDeviceWifi *companion, GParamSpec *pspec, gpointer user_d /* disconnect from mesh if someone starts using the companion */ static void -companion_state_changed_cb (NMDeviceWifi *companion, NMDeviceState state, NMDeviceState old_state, NMDeviceStateReason reason, gpointer user_data) +companion_state_changed_cb (NMDeviceWifi *companion, + NMDeviceState state, + NMDeviceState old_state, + NMDeviceStateReason reason, + gpointer user_data) { NMDeviceOlpcMesh *self = NM_DEVICE_OLPC_MESH (user_data); NMDeviceState self_state = nm_device_get_state (NM_DEVICE (self)); @@ -880,6 +889,8 @@ is_companion (NMDeviceOlpcMesh *self, NMDevice *other) g_signal_connect (G_OBJECT (other), "autoconnect-allowed", G_CALLBACK (companion_autoconnect_allowed_cb), self); + g_object_notify (G_OBJECT (self), NM_DEVICE_OLPC_MESH_COMPANION); + return TRUE; } diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index e0bf397652..2c3987c3d5 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -560,6 +560,19 @@ nm_netlink_monitor_get_flags_sync (NMNetlinkMonitor *self, return FALSE; } + /* HACK: Apparently to get it working we have to refill the cache twice; + * otherwise some kernels (or maybe libnl?) only send a few of the + * interfaces in the refill request. + */ + if (nl_cache_refill (priv->nlh, priv->nlh_link_cache)) { + g_set_error (error, + NM_NETLINK_MONITOR_ERROR, + NM_NETLINK_MONITOR_ERROR_LINK_CACHE_UPDATE, + _("error updating link cache: %s"), + nl_geterror ()); + return FALSE; + } + /* Set up the filter */ filter = rtnl_link_alloc (); if (!filter) { diff --git a/system-settings/plugins/keyfile/io/reader.c b/system-settings/plugins/keyfile/io/reader.c index 13c4b12703..3a4ec42e84 100644 --- a/system-settings/plugins/keyfile/io/reader.c +++ b/system-settings/plugins/keyfile/io/reader.c @@ -15,8 +15,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008 - 2009 Novell, Inc. + * Copyright (C) 2008 - 2010 Red Hat, Inc. */ #include @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,7 @@ get_one_int (const char *str, guint32 max_val, const char *key_name, guint32 *ou errno = 0; tmp = strtol (str, NULL, 10); if (errno || (tmp < 0) || (tmp > max_val)) { - g_warning ("%s: ignoring invalid IPv4 %s item '%s'", __func__, key_name, str); + g_warning ("%s: ignoring invalid IP %s item '%s'", __func__, key_name, str); return FALSE; } @@ -78,13 +79,13 @@ get_one_int (const char *str, guint32 max_val, const char *key_name, guint32 *ou } static void -free_one_address (gpointer data, gpointer user_data) +free_one_ip4_address (gpointer data, gpointer user_data) { g_array_free ((GArray *) data, TRUE); } static GPtrArray * -read_addresses (GKeyFile *file, +read_ip4_addresses (GKeyFile *file, const char *setting_name, const char *key) { @@ -166,27 +167,27 @@ ip4_addr_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) GPtrArray *addresses; const char *setting_name = nm_setting_get_name (setting); - addresses = read_addresses (keyfile, setting_name, key); + addresses = read_ip4_addresses (keyfile, setting_name, key); /* Work around for previous syntax */ if (!addresses && !strcmp (key, NM_SETTING_IP4_CONFIG_ADDRESSES)) - addresses = read_addresses (keyfile, setting_name, "address"); + addresses = read_ip4_addresses (keyfile, setting_name, "address"); if (addresses) { g_object_set (setting, key, addresses, NULL); - g_ptr_array_foreach (addresses, free_one_address, NULL); + g_ptr_array_foreach (addresses, free_one_ip4_address, NULL); g_ptr_array_free (addresses, TRUE); } } static void -free_one_route (gpointer data, gpointer user_data) +free_one_ip4_route (gpointer data, gpointer user_data) { g_array_free ((GArray *) data, TRUE); } static GPtrArray * -read_routes (GKeyFile *file, +read_ip4_routes (GKeyFile *file, const char *setting_name, const char *key) { @@ -272,10 +273,10 @@ ip4_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) GPtrArray *routes; const char *setting_name = nm_setting_get_name (setting); - routes = read_routes (keyfile, setting_name, key); + routes = read_ip4_routes (keyfile, setting_name, key); if (routes) { g_object_set (setting, key, routes, NULL); - g_ptr_array_foreach (routes, free_one_route, NULL); + g_ptr_array_foreach (routes, free_one_ip4_route, NULL); g_ptr_array_free (routes, TRUE); } } @@ -303,8 +304,9 @@ ip4_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) continue; } - g_array_append_val (array, addr.s_addr); + g_array_append_val (array, addr.s_addr); } + g_strfreev (list); if (array) { g_object_set (setting, key, array, NULL); @@ -312,6 +314,294 @@ ip4_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) } } +static void +free_one_ip6_address (gpointer data, gpointer user_data) +{ + g_value_array_free ((GValueArray *) data); +} + +static char * +split_prefix (char *addr) +{ + char *slash; + + g_return_val_if_fail (addr != NULL, NULL); + + /* Find the prefix and split the string */ + slash = strchr (addr, '/'); + if (slash && slash > addr) { + slash++; + *(slash - 1) = '\0'; + } + + return slash; +} + +static GPtrArray * +read_ip6_addresses (GKeyFile *file, + const char *setting_name, + const char *key) +{ + GPtrArray *addresses; + struct in6_addr addr; + guint32 prefix; + int i = 0; + + addresses = g_ptr_array_sized_new (3); + + /* Look for individual addresses */ + while (i++ < 1000) { + char *tmp, *key_name, *str_prefix; + int ret; + GValueArray *values; + GByteArray *address; + GValue value = { 0 }; + + key_name = g_strdup_printf ("%s%d", key, i); + tmp = g_key_file_get_string (file, setting_name, key_name, NULL); + g_free (key_name); + + if (!tmp) + break; /* all done */ + + /* convert the string array into IPv6 addresses */ + values = g_value_array_new (2); /* NMIP6Address has 2 items */ + + /* Split the address and prefix */ + str_prefix = split_prefix (tmp); + + /* address */ + ret = inet_pton (AF_INET6, tmp, &addr); + if (ret <= 0) { + g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp); + g_value_array_free (values); + goto next; + } + address = g_byte_array_new (); + g_byte_array_append (address, (guint8 *) addr.s6_addr, 16); + g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY); + g_value_take_boxed (&value, address); + g_value_array_append (values, &value); + g_value_unset (&value); + + /* prefix */ + prefix = 0; + if (str_prefix) { + if (!get_one_int (str_prefix, 128, key_name, &prefix)) { + g_value_array_free (values); + goto next; + } + } else { + /* Missing prefix defaults to /64 */ + prefix = 64; + } + + g_value_init (&value, G_TYPE_UINT); + g_value_set_uint (&value, prefix); + g_value_array_append (values, &value); + g_value_unset (&value); + + g_ptr_array_add (addresses, values); + +next: + g_free (tmp); + } + + if (addresses->len < 1) { + g_ptr_array_free (addresses, TRUE); + addresses = NULL; + } + + return addresses; +} + +static void +ip6_addr_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + GPtrArray *addresses; + const char *setting_name = nm_setting_get_name (setting); + + addresses = read_ip6_addresses (keyfile, setting_name, key); + + if (addresses) { + g_object_set (setting, key, addresses, NULL); + g_ptr_array_foreach (addresses, free_one_ip6_address, NULL); + g_ptr_array_free (addresses, TRUE); + } +} + +static void +free_one_ip6_route (gpointer data, gpointer user_data) +{ + g_value_array_free ((GValueArray *) data); +} + +static GPtrArray * +read_ip6_routes (GKeyFile *file, + const char *setting_name, + const char *key) +{ + GPtrArray *routes; + struct in6_addr addr; + guint32 prefix, metric; + int i = 0; + + routes = g_ptr_array_sized_new (3); + + /* Look for individual routes */ + while (i++ < 1000) { + gchar **tmp; + char *key_name, *str_prefix; + gsize length = 0; + int ret; + GValueArray *values; + GByteArray *address; + GValue value = { 0 }; + + key_name = g_strdup_printf ("%s%d", key, i); + tmp = g_key_file_get_string_list (file, setting_name, key_name, &length, NULL); + g_free (key_name); + + if (!tmp || !length) + break; /* all done */ + + if (length != 3) { + g_warning ("%s: ignoring invalid IPv6 address item '%s'", __func__, key_name); + goto next; + } + + /* convert the string array into IPv6 routes */ + values = g_value_array_new (4); /* NMIP6Route has 4 items */ + + /* Split the route and prefix */ + str_prefix = split_prefix (tmp[0]); + + /* destination address */ + ret = inet_pton (AF_INET6, tmp[0], &addr); + if (ret <= 0) { + g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp[0]); + g_value_array_free (values); + goto next; + } + address = g_byte_array_new (); + g_byte_array_append (address, (guint8 *) addr.s6_addr, 16); + g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY); + g_value_take_boxed (&value, address); + g_value_array_append (values, &value); + g_value_unset (&value); + + /* prefix */ + prefix = 0; + if (str_prefix) { + if (!get_one_int (str_prefix, 128, key_name, &prefix)) { + g_value_array_free (values); + goto next; + } + } else { + /* default to 64 if unspecified */ + prefix = 64; + } + g_value_init (&value, G_TYPE_UINT); + g_value_set_uint (&value, prefix); + g_value_array_append (values, &value); + g_value_unset (&value); + + /* next hop address */ + ret = inet_pton (AF_INET6, tmp[1], &addr); + if (ret <= 0) { + g_warning ("%s: ignoring invalid IPv6 %s element '%s'", __func__, key_name, tmp[1]); + g_value_array_free (values); + goto next; + } + address = g_byte_array_new (); + g_byte_array_append (address, (guint8 *) addr.s6_addr, 16); + g_value_init (&value, DBUS_TYPE_G_UCHAR_ARRAY); + g_value_take_boxed (&value, address); + g_value_array_append (values, &value); + g_value_unset (&value); + + /* metric */ + metric = 0; + if (!get_one_int (tmp[2], G_MAXUINT32, key_name, &metric)) { + g_value_array_free (values); + goto next; + } + g_value_init (&value, G_TYPE_UINT); + g_value_set_uint (&value, metric); + g_value_array_append (values, &value); + g_value_unset (&value); + + g_ptr_array_add (routes, values); + +next: + g_strfreev (tmp); + } + + if (routes->len < 1) { + g_ptr_array_free (routes, TRUE); + routes = NULL; + } + + return routes; +} + +static void +ip6_route_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + GPtrArray *routes; + const char *setting_name = nm_setting_get_name (setting); + + routes = read_ip6_routes (keyfile, setting_name, key); + + if (routes) { + g_object_set (setting, key, routes, NULL); + g_ptr_array_foreach (routes, free_one_ip6_route, NULL); + g_ptr_array_free (routes, TRUE); + } +} + +static void +free_one_ip6_dns (gpointer data, gpointer user_data) +{ + g_byte_array_free ((GByteArray *) data, TRUE); +} + +static void +ip6_dns_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) +{ + const char *setting_name = nm_setting_get_name (setting); + GPtrArray *array = NULL; + gsize length; + char **list, **iter; + int ret; + + list = g_key_file_get_string_list (keyfile, setting_name, key, &length, NULL); + if (!list || !g_strv_length (list)) + return; + + array = g_ptr_array_sized_new (length); + for (iter = list; *iter; iter++) { + GByteArray *byte_array; + struct in6_addr addr; + + ret = inet_pton (AF_INET6, *iter, &addr); + if (ret <= 0) { + g_warning ("%s: ignoring invalid DNS server IPv6 address '%s'", __func__, *iter); + continue; + } + byte_array = g_byte_array_new (); + g_byte_array_append (byte_array, (guint8 *) addr.s6_addr, 16); + + g_ptr_array_add (array, byte_array); + } + g_strfreev (list); + + if (array) { + g_object_set (setting, key, array, NULL); + g_ptr_array_foreach (array, free_one_ip6_dns, NULL); + g_ptr_array_free (array, TRUE); + } +} static void mac_address_parser (NMSetting *setting, const char *key, GKeyFile *keyfile) @@ -407,22 +697,35 @@ typedef struct { /* A table of keys that require further parsing/conversion becuase they are * stored in a format that can't be automatically read using the key's type. - * i.e. IP addresses, which are stored in NetworkManager as guint32, but are - * stored in keyfiles as strings, eg "10.1.1.2". + * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored + * in struct in6_addr internally, but as string in keyfiles. */ static KeyParser key_parsers[] = { { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES, FALSE, ip4_addr_parser }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES, + FALSE, + ip6_addr_parser }, { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ROUTES, FALSE, ip4_route_parser }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES, + FALSE, + ip6_route_parser }, { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS, FALSE, ip4_dns_parser }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS, + FALSE, + ip6_dns_parser }, { NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS, TRUE, diff --git a/system-settings/plugins/keyfile/io/writer.c b/system-settings/plugins/keyfile/io/writer.c index efa5d1d4e5..d9f36af7a6 100644 --- a/system-settings/plugins/keyfile/io/writer.c +++ b/system-settings/plugins/keyfile/io/writer.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008 - 2010 Red Hat, Inc. */ #include @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -184,6 +185,189 @@ ip4_route_writer (GKeyFile *file, write_ip4_values (file, setting_name, key, array, 4, 0, 2); } +static void +ip6_dns_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GPtrArray *array; + GByteArray *byte_array; + char **list; + int i, num = 0; + + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR)); + + array = (GPtrArray *) g_value_get_boxed (value); + if (!array || !array->len) + return; + + list = g_new0 (char *, array->len + 1); + + for (i = 0; i < array->len; i++) { + char buf[INET6_ADDRSTRLEN]; + + byte_array = g_ptr_array_index (array, i); + if (!inet_ntop (AF_INET6, (struct in6_addr *) byte_array->data, buf, sizeof (buf))) { + int j; + GString *ip6_str = g_string_new (NULL); + g_string_append_printf (ip6_str, "%02X", byte_array->data[0]); + for (j = 1; j < 16; j++) + g_string_append_printf (ip6_str, " %02X", byte_array->data[j]); + nm_warning ("%s: error converting IP6 address %s", + __func__, ip6_str->str); + g_string_free (ip6_str, TRUE); + } else + list[num++] = g_strdup (buf); + } + + g_key_file_set_string_list (file, nm_setting_get_name (setting), key, (const char **) list, num); + g_strfreev (list); +} + +static gboolean +ip6_array_to_addr (GValueArray *values, guint32 idx, char *buf, size_t buflen) +{ + GByteArray *byte_array; + GValue *addr_val; + + g_return_val_if_fail (buflen >= INET6_ADDRSTRLEN, FALSE); + + /* address */ + addr_val = g_value_array_get_nth (values, idx); + byte_array = g_value_get_boxed (addr_val); + errno = 0; + if (!inet_ntop (AF_INET6, (struct in6_addr *) byte_array->data, buf, buflen)) { + GString *ip6_str = g_string_sized_new (INET6_ADDRSTRLEN + 10); + + /* error converting the address */ + g_string_append_printf (ip6_str, "%02X", byte_array->data[0]); + for (idx = 1; idx < 16; idx++) + g_string_append_printf (ip6_str, " %02X", byte_array->data[idx]); + nm_warning ("%s: error %d converting IP6 address %s", + __func__, errno, ip6_str->str); + g_string_free (ip6_str, TRUE); + return FALSE; + } + + return TRUE; +} + +static char * +ip6_array_to_addr_prefix (GValueArray *values) +{ + GValue *prefix_val; + char *ret = NULL; + GString *ip6_str; + char buf[INET6_ADDRSTRLEN]; + + /* address */ + if (ip6_array_to_addr (values, 0, buf, sizeof (buf))) { + /* Enough space for the address, '/', and the prefix */ + ip6_str = g_string_sized_new (INET6_ADDRSTRLEN + 5); + + /* prefix */ + g_string_append (ip6_str, buf); + prefix_val = g_value_array_get_nth (values, 1); + g_string_append_printf (ip6_str, "/%u", g_value_get_uint (prefix_val)); + + ret = ip6_str->str; + g_string_free (ip6_str, FALSE); + } + + return ret; +} + +static void +ip6_addr_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GPtrArray *array; + const char *setting_name = nm_setting_get_name (setting); + int i, j; + + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS)); + + array = (GPtrArray *) g_value_get_boxed (value); + if (!array || !array->len) + return; + + for (i = 0, j = 1; i < array->len; i++) { + GValueArray *values = g_ptr_array_index (array, i); + char *key_name, *ip6_addr; + + if (values->n_values % 2) { + nm_warning ("%s: error writing IP6 address %d; address array length" + " %d is not a multiple of 2.", + __func__, i, values->n_values); + continue; + } + + ip6_addr = ip6_array_to_addr_prefix (values); + if (ip6_addr) { + /* Write it out */ + key_name = g_strdup_printf ("%s%d", key, j++); + g_key_file_set_string (file, setting_name, key_name, ip6_addr); + g_free (key_name); + g_free (ip6_addr); + } + } +} + +static void +ip6_route_writer (GKeyFile *file, + NMSetting *setting, + const char *key, + const GValue *value) +{ + GPtrArray *array; + const char *setting_name = nm_setting_get_name (setting); + char *list[3]; + int i, j; + + g_return_if_fail (G_VALUE_HOLDS (value, DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE)); + + array = (GPtrArray *) g_value_get_boxed (value); + if (!array || !array->len) + return; + + for (i = 0, j = 1; i < array->len; i++) { + GValueArray *values = g_ptr_array_index (array, i); + char *key_name; + guint32 int_val; + char buf[INET6_ADDRSTRLEN]; + + memset (list, 0, sizeof (list)); + + /* Address and prefix */ + list[0] = ip6_array_to_addr_prefix (values); + if (!list[0]) + continue; + + /* Next Hop */ + if (!ip6_array_to_addr (values, 2, buf, sizeof (buf))) + continue; + list[1] = g_strdup (buf); + + /* Metric */ + value = g_value_array_get_nth (values, 3); + int_val = g_value_get_uint (value); + list[2] = g_strdup_printf ("%d", int_val); + + /* Write it out */ + key_name = g_strdup_printf ("%s%d", key, j++); + g_key_file_set_string_list (file, setting_name, key_name, (const char **) list, 3); + g_free (key_name); + + g_free (list[0]); + g_free (list[1]); + g_free (list[2]); + } +} + + static void mac_address_writer (GKeyFile *file, NMSetting *setting, @@ -259,19 +443,29 @@ typedef struct { /* A table of keys that require further parsing/conversion becuase they are * stored in a format that can't be automatically read using the key's type. - * i.e. IP addresses, which are stored in NetworkManager as guint32, but are - * stored in keyfiles as strings, eg "10.1.1.2". + * i.e. IPv4 addresses, which are stored in NetworkManager as guint32, but are + * stored in keyfiles as strings, eg "10.1.1.2" or IPv6 addresses stored + * in struct in6_addr internally, but as string in keyfiles. */ static KeyWriter key_writers[] = { { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES, ip4_addr_writer }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES, + ip6_addr_writer }, { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ROUTES, ip4_route_writer }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES, + ip6_route_writer }, { NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_DNS, ip4_dns_writer }, + { NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS, + ip6_dns_writer }, { NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS, mac_address_writer }, diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection index f542811551..5785dc2485 100644 --- a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection +++ b/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection @@ -20,3 +20,13 @@ addresses1=192.168.0.5;24;192.168.0.1; addresses2=1.2.3.4;16;1.2.1.1; ignore-auto-routes=false ignore-auto-dns=false + +[ipv6] +method=manual +dns=1111:dddd::aaaa;1::cafe; +dns-search=super-domain.com;redhat.com;gnu.org; +addresses1=abcd:1234:ffff::cdde/64 +addresses2=1:2:3:4:5:6:7:8/96 +routes1=a:b:c:d::/64;f:e:d:c:1:2:3:4;99; +ignore-auto-routes=false +ignore-auto-dns=false diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/system-settings/plugins/keyfile/tests/test-keyfile.c index 0f8c2ccbe3..58ec940301 100644 --- a/system-settings/plugins/keyfile/tests/test-keyfile.c +++ b/system-settings/plugins/keyfile/tests/test-keyfile.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "nm-test-helpers.h" @@ -50,6 +51,7 @@ test_read_valid_wired_connection (void) NMSettingConnection *s_con; NMSettingWired *s_wired; NMSettingIP4Config *s_ip4; + NMSettingIP6Config *s_ip6; GError *error = NULL; const GByteArray *array; char expected_mac_address[ETH_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 }; @@ -66,6 +68,18 @@ test_read_valid_wired_connection (void) const char *expected_address1_gw = "192.168.0.1"; const char *expected_address2_gw = "1.2.1.1"; NMIP4Address *ip4_addr; + const char *expected6_dns1 = "1111:dddd::aaaa"; + const char *expected6_dns2 = "1::cafe"; + const char *expected6_dnssearch1 = "super-domain.com"; + const char *expected6_dnssearch2 = "redhat.com"; + const char *expected6_dnssearch3 = "gnu.org"; + struct in6_addr addr6; + const char *expected6_address1 = "abcd:1234:ffff::cdde"; + const char *expected6_address2 = "1:2:3:4:5:6:7:8"; + const char *expected6_route_dest = "a:b:c:d::"; + const char *expected6_route_nh = "f:e:d:c:1:2:3:4"; + NMIP6Address *ip6_addr; + NMIP6Route *ip6_route; connection = connection_from_file (TEST_WIRED_FILE); ASSERT (connection != NULL, @@ -215,7 +229,7 @@ test_read_valid_wired_connection (void) NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 24, - "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 gateway", + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1 prefix", TEST_WIRED_FILE, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); @@ -251,7 +265,7 @@ test_read_valid_wired_connection (void) NM_SETTING_IP4_CONFIG_ADDRESSES); ASSERT (nm_ip4_address_get_prefix (ip4_addr) == 16, - "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 gateway", + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #2 prefix", TEST_WIRED_FILE, NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); @@ -278,6 +292,172 @@ test_read_valid_wired_connection (void) NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); + /* ===== IPv6 SETTING ===== */ + + s_ip6 = NM_SETTING_IP6_CONFIG (nm_connection_get_setting (connection, NM_TYPE_SETTING_IP6_CONFIG)); + ASSERT (s_ip6 != NULL, + "connection-verify-ip6", "failed to verify %s: missing %s setting", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME); + + /* Method */ + tmp = nm_setting_ip6_config_get_method (s_ip6); + ASSERT (strcmp (tmp, NM_SETTING_IP6_CONFIG_METHOD_MANUAL) == 0, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_METHOD); + + /* DNS Addresses */ + ASSERT (nm_setting_ip6_config_get_num_dns (s_ip6) == 2, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + + ASSERT (inet_pton (AF_INET6, expected6_dns1, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert DNS IP6 address #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_setting_ip6_config_get_dns (s_ip6, 0), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + + ASSERT (inet_pton (AF_INET6, expected6_dns2, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert DNS IP address #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_setting_ip6_config_get_dns (s_ip6, 1), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + + ASSERT (nm_setting_ip6_config_get_num_addresses (s_ip6) == 2, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + + /* DNS Searches */ + ASSERT (nm_setting_ip6_config_get_num_dns_searches (s_ip6) == 3, + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS_SEARCH); + + ASSERT (!strcmp (nm_setting_ip6_config_get_dns_search (s_ip6, 0), expected6_dnssearch1), + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS_SEARCH); + ASSERT (!strcmp (nm_setting_ip6_config_get_dns_search (s_ip6, 1), expected6_dnssearch2), + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS_SEARCH); + ASSERT (!strcmp (nm_setting_ip6_config_get_dns_search (s_ip6, 2), expected6_dnssearch3), + "connection-verify-wired", "failed to verify %s: unexpected %s / %s key value #3", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS_SEARCH); + + /* Address #1 */ + ip6_addr = nm_setting_ip6_config_get_address (s_ip6, 0); + ASSERT (ip6_addr, + "connection-verify-wired", "failed to verify %s: missing IP6 address #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + ASSERT (nm_ip6_address_get_prefix (ip6_addr) == 64, + "connection-verify-wired", "failed to verify %s: unexpected IP6 address #1 prefix", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET6, expected6_address1, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_address (ip6_addr), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected IP4 address #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + /* Address #2 */ + ip6_addr = nm_setting_ip6_config_get_address (s_ip6, 1); + ASSERT (ip6_addr, + "connection-verify-wired", "failed to verify %s: missing IP6 address #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + ASSERT (nm_ip6_address_get_prefix (ip6_addr) == 96, + "connection-verify-wired", "failed to verify %s: unexpected IP6 address #2 prefix", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + ASSERT (inet_pton (AF_INET6, expected6_address2, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP address #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_address_get_address (ip6_addr), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected IP6 address #2", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ADDRESSES); + + /* Route #1 */ + ip6_route = nm_setting_ip6_config_get_route (s_ip6, 0); + ASSERT (ip6_route, + "connection-verify-wired", "failed to verify %s: missing IP6 route #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES); + + ASSERT (inet_pton (AF_INET6, expected6_route_dest, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP route dest #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_route_get_dest (ip6_route), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected IP4 route dest #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES); + + ASSERT (nm_ip6_route_get_prefix (ip6_route) == 64, + "connection-verify-wired", "failed to verify %s: unexpected IP6 route #1 prefix", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES); + + ASSERT (inet_pton (AF_INET6, expected6_route_nh, &addr6) > 0, + "connection-verify-wired", "failed to verify %s: couldn't convert IP route next hop #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_DNS); + ASSERT (IN6_ARE_ADDR_EQUAL (nm_ip6_route_get_next_hop (ip6_route), &addr6), + "connection-verify-wired", "failed to verify %s: unexpected IP4 route dest #1", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES); + + ASSERT (nm_ip6_route_get_metric (ip6_route) == 99, + "connection-verify-wired", "failed to verify %s: unexpected IP6 route #1 metric", + TEST_WIRED_FILE, + NM_SETTING_IP6_CONFIG_SETTING_NAME, + NM_SETTING_IP6_CONFIG_ROUTES); + g_object_unref (connection); } @@ -327,6 +507,49 @@ add_one_ip4_route (NMSettingIP4Config *s_ip4, nm_ip4_route_unref (route); } +static void +add_one_ip6_address (NMSettingIP6Config *s_ip6, + const char *addr, + guint32 prefix) +{ + struct in6_addr tmp; + NMIP6Address *ip6_addr; + + ip6_addr = nm_ip6_address_new (); + nm_ip6_address_set_prefix (ip6_addr, prefix); + + inet_pton (AF_INET6, addr, &tmp); + nm_ip6_address_set_address (ip6_addr, &tmp); + + nm_setting_ip6_config_add_address (s_ip6, ip6_addr); + nm_ip6_address_unref (ip6_addr); +} + +static void +add_one_ip6_route (NMSettingIP6Config *s_ip6, + const char *dest, + const char *nh, + guint32 prefix, + guint32 metric) +{ + struct in6_addr addr; + NMIP6Route *route; + + route = nm_ip6_route_new (); + nm_ip6_route_set_prefix (route, prefix); + nm_ip6_route_set_metric (route, metric); + + inet_pton (AF_INET6, dest, &addr); + nm_ip6_route_set_dest (route, &addr); + + inet_pton (AF_INET6, nh, &addr); + nm_ip6_route_set_next_hop (route, &addr); + + nm_setting_ip6_config_add_route (s_ip6, route); + nm_ip6_route_unref (route); +} + + static void test_write_wired_connection (void) { @@ -334,6 +557,7 @@ test_write_wired_connection (void) NMSettingConnection *s_con; NMSettingWired *s_wired; NMSettingIP4Config *s_ip4; + NMSettingIP6Config *s_ip6; char *uuid; GByteArray *mac; unsigned char tmpmac[] = { 0x99, 0x88, 0x77, 0x66, 0x55, 0x44 }; @@ -344,6 +568,7 @@ test_write_wired_connection (void) pid_t owner_grp; uid_t owner_uid; struct in_addr addr; + struct in6_addr addr6; const char *dns1 = "4.2.2.1"; const char *dns2 = "4.2.2.2"; const char *address1 = "192.168.0.5"; @@ -354,6 +579,14 @@ test_write_wired_connection (void) const char *route1_nh = "10.10.10.1"; const char *route2 = "0.0.0.0"; const char *route2_nh = "1.2.1.1"; + const char *dns6_1 = "1::cafe"; + const char *dns6_2 = "2::cafe"; + const char *address6_1 = "abcd::beef"; + const char *address6_2 = "dcba::beef"; + const char *route6_1 = "1:2:3:4:5:6:7:8"; + const char *route6_1_nh = "8:7:6:5:4:3:2:1"; + const char *route6_2 = "::"; + const char *route6_2_nh = "2001::1111"; guint64 timestamp = 0x12345678L; connection = nm_connection_new (); @@ -420,6 +653,35 @@ test_write_wired_connection (void) inet_pton (AF_INET, dns2, &addr); nm_setting_ip4_config_add_dns (s_ip4, addr.s_addr); + /* IP6 setting */ + + s_ip6 = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new ()); + ASSERT (s_ip6 != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_IP6_CONFIG_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_ip6)); + + g_object_set (s_ip6, + NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_MANUAL, + NULL); + + /* Addresses */ + add_one_ip6_address (s_ip6, address6_1, 64); + add_one_ip6_address (s_ip6, address6_2, 56); + + /* Routes */ + add_one_ip6_route (s_ip6, route6_1, route6_1_nh, 64, 3); + add_one_ip6_route (s_ip6, route6_2, route6_2_nh, 56, 1); + + /* DNS servers */ + inet_pton (AF_INET6, dns6_1, &addr6); + nm_setting_ip6_config_add_dns (s_ip6, &addr6); + inet_pton (AF_INET6, dns6_2, &addr6); + nm_setting_ip6_config_add_dns (s_ip6, &addr6); + + /* DNS searches */ + nm_setting_ip6_config_add_dns_search (s_ip6, "wallaceandgromit.com"); + /* Write out the connection */ owner_uid = geteuid (); owner_grp = getegid (); @@ -570,6 +832,7 @@ test_write_wireless_connection (void) NMSettingConnection *s_con; NMSettingWireless *s_wireless; NMSettingIP4Config *s_ip4; + NMSettingIP6Config *s_ip6; char *uuid; GByteArray *bssid; unsigned char tmpbssid[] = { 0xaa, 0xb9, 0xa1, 0x74, 0x55, 0x44 }; @@ -640,6 +903,18 @@ test_write_wireless_connection (void) NM_SETTING_IP4_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); + /* IP6 setting */ + + s_ip6 = NM_SETTING_IP6_CONFIG (nm_setting_ip6_config_new ()); + ASSERT (s_ip6 != NULL, + "connection-write", "failed to allocate new %s setting", + NM_SETTING_IP6_CONFIG_SETTING_NAME); + nm_connection_add_setting (connection, NM_SETTING (s_ip6)); + + g_object_set (s_ip6, + NM_SETTING_IP6_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, + NULL); + /* Write out the connection */ owner_uid = geteuid (); owner_grp = getegid (); @@ -688,6 +963,7 @@ int main (int argc, char **argv) base = g_path_get_basename (argv[0]); fprintf (stdout, "%s: SUCCESS\n", base); g_free (base); + dbus_g_connection_unref (bus); return 0; }