diff --git a/po/de.po b/po/de.po
index 05709384d..ea2fe025c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,20 +7,867 @@
 # Thomas Gier <info@thomasgier.de>, 2007.
 # Andre Klapper <ak-47@gmx.net>, 2007.
 # Hauke Mehrtens <hauke@hauke-m.de>, 2008.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009.
-#
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: NetworkManager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-15 23:02+0200\n"
-"PO-Revision-Date: 2009-10-14 11:27+0200\n"
+"POT-Creation-Date: 2010-03-12 08:15+0100\n"
+"PO-Revision-Date: 2010-03-12 08:17+0100\n"
 "Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n"
-"Language-Team: German <gnome-de@gnome.org>\n"
+"Language-Team: Deutsch <gnome-de@gnome.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../cli/src/connections.c:86
+#, c-format
+msgid ""
+"Usage: nmcli con { COMMAND | help }\n"
+"  COMMAND := { list | status | up | down }\n"
+"\n"
+"  list [id <id> | uuid <id> | system | user]\n"
+"  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
+"<timeout>]\n"
+"  down id <id> | uuid <id>\n"
+msgstr ""
+"Aufruf: nmcli con { BEFEHL | help }\n"
+"  BEFEHL := { list | status | up | down }\n"
+"\n"
+"  list [id <id> | uuid <id> | system | user]\n"
+"  status\n"
+"  up id <id> | uuid <id> [iface <iface>] [ap <hwaddr>] [--nowait] [--timeout "
+"<timeout>]\n"
+"  down id <id> | uuid <id>\n"
+
+#: ../cli/src/connections.c:158
+msgid "Connections"
+msgstr "Verbindungen"
+
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/devices.c:298 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "Type"
+msgstr "Typ"
+
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "UUID"
+msgstr "UUID"
+
+#: ../cli/src/connections.c:158 ../cli/src/connections.c:160
+#: ../cli/src/connections.c:196 ../cli/src/connections.c:198
+#: ../cli/src/connections.c:205 ../cli/src/connections.c:207
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Name"
+msgstr "Name"
+
+#: ../cli/src/connections.c:163
+#, c-format
+msgid "System connections:\n"
+msgstr "System-Verbindungen:\n"
+
+#: ../cli/src/connections.c:167
+#, c-format
+msgid "User connections:\n"
+msgstr "Benutzer-Verbindungen:\n"
+
+#: ../cli/src/connections.c:178 ../cli/src/connections.c:967
+#: ../cli/src/connections.c:983 ../cli/src/connections.c:992
+#: ../cli/src/connections.c:1003 ../cli/src/connections.c:1085
+#: ../cli/src/devices.c:604 ../cli/src/devices.c:614 ../cli/src/devices.c:699
+#: ../cli/src/devices.c:785 ../cli/src/devices.c:792
+#, c-format
+msgid "Error: %s argument is missing."
+msgstr "Fehler: %s Argument fehlt."
+
+#: ../cli/src/connections.c:189
+#, c-format
+msgid "Error: %s - no such connection."
+msgstr "Fehler: %s - keine solche Verbindung."
+
+#: ../cli/src/connections.c:196
+msgid "System-wide connections"
+msgstr "Systemweite Verbindungen"
+
+#: ../cli/src/connections.c:205
+msgid "User connections"
+msgstr "Benutzer-Verbindungen"
+
+#: ../cli/src/connections.c:212 ../cli/src/connections.c:1016
+#: ../cli/src/connections.c:1103 ../cli/src/devices.c:446
+#: ../cli/src/devices.c:494 ../cli/src/devices.c:628 ../cli/src/devices.c:706
+#: ../cli/src/devices.c:798
+#, c-format
+msgid "Unknown parameter: %s\n"
+msgstr "Unbekannter Parameter: %s\n"
+
+#: ../cli/src/connections.c:221
+#, c-format
+msgid "Error: no valid parameter specified."
+msgstr "Fehler: Kein gültiger Parameter angegeben."
+
+#. FIXME: Fix the output
+#: ../cli/src/connections.c:268 ../cli/src/devices.c:302
+#: ../cli/src/devices.c:321 ../cli/src/devices.c:353 ../cli/src/devices.c:355
+#: ../cli/src/devices.c:357 ../cli/src/devices.c:359 ../cli/src/devices.c:361
+msgid "yes"
+msgstr "ja"
+
+#: ../cli/src/connections.c:268 ../cli/src/devices.c:304
+msgid "no"
+msgstr "nein"
+
+#: ../cli/src/connections.c:297
+msgid "Active connections"
+msgstr "Aktive Verbindungen "
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+#: ../cli/src/devices.c:302 ../cli/src/devices.c:304
+msgid "Default"
+msgstr "Vorgabe"
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Service"
+msgstr "Dienst"
+
+#: ../cli/src/connections.c:297 ../cli/src/connections.c:299
+msgid "Devices"
+msgstr "Gerät"
+
+#: ../cli/src/connections.c:659
+#, c-format
+msgid "no active connection on device '%s'"
+msgstr "keine aktive Verbindung auf Gerät »%s«"
+
+#: ../cli/src/connections.c:667
+#, c-format
+msgid "no active connection or device"
+msgstr "keine aktive Verbindung auf Gerät"
+
+#: ../cli/src/connections.c:730
+msgid "activating"
+msgstr "wird aktiviert"
+
+#: ../cli/src/connections.c:732
+msgid "activated"
+msgstr "aktiviert"
+
+#: ../cli/src/connections.c:735 ../cli/src/connections.c:758
+#: ../cli/src/connections.c:791 ../cli/src/devices.c:111
+#: ../cli/src/network-manager.c:76 ../cli/src/network-manager.c:98
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../cli/src/connections.c:744
+msgid "VPN connecting (prepare)"
+msgstr "VPN wird verbunden (vorbereiten)"
+
+#: ../cli/src/connections.c:746
+msgid "VPN connecting (need authentication)"
+msgstr "VPN wird verbunden (Legitimierung erforderlich)"
+
+#: ../cli/src/connections.c:748
+msgid "VPN connecting"
+msgstr "VPN wird verbunden"
+
+#: ../cli/src/connections.c:750
+msgid "VPN connecting (getting IP configuration)"
+msgstr "VPN wird verbunden (IP-Konfiguration wird ermittelt)"
+
+#: ../cli/src/connections.c:752
+msgid "VPN connected"
+msgstr "VPN verbunden"
+
+#: ../cli/src/connections.c:754
+msgid "VPN connection failed"
+msgstr "VPN-Verbindung fehlgeschlagen"
+
+#: ../cli/src/connections.c:756
+msgid "VPN disconnected"
+msgstr "VPN getrennt"
+
+#: ../cli/src/connections.c:767
+msgid "unknown reason"
+msgstr "unbekannter Grund"
+
+#: ../cli/src/connections.c:769
+msgid "none"
+msgstr "kein"
+
+#: ../cli/src/connections.c:771
+msgid "the user was disconnected"
+msgstr "der Benutzer wurde getrennt"
+
+#: ../cli/src/connections.c:773
+msgid "the base network connection was interrupted"
+msgstr "die Basisverbindung wurde unterbrochen"
+
+#: ../cli/src/connections.c:775
+msgid "the VPN service stopped unexpectedly"
+msgstr "der VPN-Dienst brach unerwartet ab"
+
+#: ../cli/src/connections.c:777
+msgid "the VPN service returned invalid configuration"
+msgstr "der VPN-Dienst gab eine ungültige Konfiguration zurück"
+
+#: ../cli/src/connections.c:779
+msgid "the connection attempt timed out"
+msgstr "Der Verbindungsversuch ist zeitlich abgelaufen"
+
+#: ../cli/src/connections.c:781
+msgid "the VPN service did not start in time"
+msgstr "der VPN-Dienst ist nicht rechtzeitig gestartet"
+
+#: ../cli/src/connections.c:783
+msgid "the VPN service failed to start"
+msgstr "der VPN-Dienst konnte nicht starten"
+
+#: ../cli/src/connections.c:785
+msgid "no valid VPN secrets"
+msgstr "keine gültigen VPN-Geheimnisse"
+
+#: ../cli/src/connections.c:787
+msgid "invalid VPN secrets"
+msgstr "ungültige VPN-Geheimnisse"
+
+#: ../cli/src/connections.c:789
+msgid "the connection was removed"
+msgstr "Die Verbindung wurde entfernt"
+
+#: ../cli/src/connections.c:803
+#, c-format
+msgid "state: %s\n"
+msgstr "Zustand: %s\n"
+
+#: ../cli/src/connections.c:806 ../cli/src/connections.c:832
+#, c-format
+msgid "Connection activated\n"
+msgstr "Verbindung aktiviert\n"
+
+#: ../cli/src/connections.c:809
+#, c-format
+msgid "Error: Connection activation failed."
+msgstr "Fehler: Aktivierung der Verbindung fehlgeschlagen."
+
+#: ../cli/src/connections.c:828
+#, c-format
+msgid "state: %s (%d)\n"
+msgstr "Zustand: %s (%d)\n"
+
+#: ../cli/src/connections.c:838
+#, c-format
+msgid "Error: Connection activation failed: %s."
+msgstr "Fehler: Aktivierung der Verbindung fehlgeschlagen: %s."
+
+#: ../cli/src/connections.c:855 ../cli/src/devices.c:551
+#, c-format
+msgid "Error: Timeout %d sec expired."
+msgstr "Fehler: Zeitbeschränkung von %d Sekunden abgelaufen."
+
+#: ../cli/src/connections.c:898
+#, c-format
+msgid "Error: Connection activation failed: %s"
+msgstr "Fehler: Aktivierung der Verbindung fehlgeschlagen: %s"
+
+#: ../cli/src/connections.c:912
+#, c-format
+msgid "Error: Obtaining active connection for '%s' failed."
+msgstr "Fehler: Erlangen der Verbindung für »%s« ist fehlgeschlagen."
+
+#: ../cli/src/connections.c:921
+#, c-format
+msgid "Active connection state: %s\n"
+msgstr "Zustand der aktiven Verbindung: %s\n"
+
+#: ../cli/src/connections.c:922
+#, c-format
+msgid "Active connection path: %s\n"
+msgstr "Pfad der aktiven Verbindung: %s\n"
+
+#: ../cli/src/connections.c:976 ../cli/src/connections.c:1094
+#, c-format
+msgid "Error: Unknown connection: %s."
+msgstr "Fehler: Unbekannte Verbindung: %s."
+
+#: ../cli/src/connections.c:1011 ../cli/src/devices.c:622
+#, c-format
+msgid "Error: timeout value '%s' is not valid."
+msgstr "Fehler: Der Wert »%s« für den Zeitablauf ist nicht gültig."
+
+#: ../cli/src/connections.c:1024 ../cli/src/connections.c:1111
+#, c-format
+msgid "Error: id or uuid has to be specified."
+msgstr "Fehler: id oder uuid muss angegeben werden."
+
+#: ../cli/src/connections.c:1044
+#, c-format
+msgid "Error: No suitable device found: %s."
+msgstr "Fehler: Kein passendes Gerät gefunden: %s."
+
+#: ../cli/src/connections.c:1046
+#, c-format
+msgid "Error: No suitable device found."
+msgstr "Fehler: Kein passendes Gerät gefunden."
+
+#: ../cli/src/connections.c:1138
+#, c-format
+msgid "Warning: Connection not active\n"
+msgstr "Warnung: Verbindung ist derzeit nicht aktiv\n"
+
+#: ../cli/src/connections.c:1189
+#, c-format
+msgid "Error: 'con' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »con« ist nicht gültig."
+
+#: ../cli/src/connections.c:1216
+#, c-format
+msgid "Error: could not connect to D-Bus."
+msgstr "Fehler: Es konnte nicht mit D-Bus verbunden werden."
+
+#: ../cli/src/connections.c:1223
+#, c-format
+msgid "Error: Could not get system settings."
+msgstr "Fehler: Systemeinstellungen konnten nicht ermittelt werden"
+
+#: ../cli/src/connections.c:1231
+#, c-format
+msgid "Error: Could not get user settings."
+msgstr "Fehler: Benutzereinstellungen konnten nicht ermittelt werden."
+
+#: ../cli/src/connections.c:1241
+#, c-format
+msgid "Error: Can't obtain connections: settings services are not running."
+msgstr ""
+"Fehler: Verbindungen können nicht erlangt werden: Die Einstellungsdienste "
+"werden nicht ausgeführt."
+
+#: ../cli/src/devices.c:73
+#, c-format
+msgid ""
+"Usage: nmcli dev { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface <iface>]\n"
+"  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"\n"
+msgstr ""
+"Aufruf: nmcli dev { BEFEHL | help }\n"
+"\n"
+"  BEFEHL := { status | list | disconnect | wifi }\n"
+"\n"
+"  status\n"
+"  list [iface <iface>]\n"
+"  disconnect iface <iface> [--nowait] [--timeout <timeout>]\n"
+"  wifi [list [iface <iface>] | apinfo iface <iface> hwaddr <hwaddr>]\n"
+"\n"
+
+#: ../cli/src/devices.c:93
+msgid "unmanaged"
+msgstr "nicht verwaltet"
+
+#: ../cli/src/devices.c:95
+msgid "unavailable"
+msgstr "nicht verfügbar"
+
+#: ../cli/src/devices.c:97 ../cli/src/network-manager.c:73
+msgid "disconnected"
+msgstr "getrennt"
+
+#: ../cli/src/devices.c:99
+msgid "connecting (prepare)"
+msgstr "wird verbunden (vorbereiten)"
+
+#: ../cli/src/devices.c:101
+msgid "connecting (configuring)"
+msgstr "wird verbunden (konfigurieren)"
+
+#: ../cli/src/devices.c:103
+msgid "connecting (need authentication)"
+msgstr "wird verbunden (Legitimierung erforderlich)"
+
+#: ../cli/src/devices.c:105
+msgid "connecting (getting IP configuration)"
+msgstr "wird verbunden (IP-Konfiguration wird ermittelt)"
+
+#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:71
+msgid "connected"
+msgstr "verbunden"
+
+#: ../cli/src/devices.c:109
+msgid "connection failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: ../cli/src/devices.c:132 ../cli/src/devices.c:876
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#. print them
+#: ../cli/src/devices.c:164 ../cli/src/devices.c:266 ../cli/src/devices.c:861
+#: ../cli/src/devices.c:879
+msgid "(none)"
+msgstr "(keine)"
+
+#: ../cli/src/devices.c:209
+#, c-format
+msgid "%s: error converting IP4 address 0x%X"
+msgstr "%s: Fehler bei Umwandlung der IPv4-Addresse 0x%X"
+
+#: ../cli/src/devices.c:238
+#, c-format
+msgid "%s, %s, Freq %d MHz, Rate %d Mb/s, Strength %d"
+msgstr "%s, %s, Frequenz %d MHz, Durchsatz %d Mb/s, Stärke %d"
+
+#: ../cli/src/devices.c:239
+msgid "Ad-Hoc"
+msgstr "Ad-Hoc"
+
+#: ../cli/src/devices.c:248
+msgid ", Encrypted: "
+msgstr ", Verschlüsselt:"
+
+#: ../cli/src/devices.c:253
+msgid " WEP"
+msgstr " WEP"
+
+#: ../cli/src/devices.c:255
+msgid " WPA"
+msgstr " WPA"
+
+#: ../cli/src/devices.c:257
+msgid " WPA2"
+msgstr " WPA2"
+
+# Das ergibt z.B. WPA-Enterprise, klingt komisch mit »Unternehmen«
+#: ../cli/src/devices.c:260
+msgid " Enterprise"
+msgstr "Enterprise"
+
+#: ../cli/src/devices.c:294 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "Device"
+msgstr "Gerät"
+
+#: ../cli/src/devices.c:299
+msgid "Driver"
+msgstr "Treiber"
+
+#: ../cli/src/devices.c:299 ../cli/src/devices.c:567
+msgid "(unknown)"
+msgstr "(unbekannt)"
+
+#: ../cli/src/devices.c:300 ../cli/src/devices.c:458 ../cli/src/devices.c:460
+msgid "State"
+msgstr "Zustand"
+
+#: ../cli/src/devices.c:313
+msgid "HW Address"
+msgstr "Hardware-Adresse"
+
+#: ../cli/src/devices.c:319
+#, c-format
+msgid ""
+"\n"
+"  Capabilities:\n"
+msgstr ""
+"\n"
+"Fähigkeiten:\n"
+
+#: ../cli/src/devices.c:321
+msgid "Carrier Detect"
+msgstr "Trägersignal erkannt"
+
+#: ../cli/src/devices.c:336
+#, c-format
+msgid "%u Mb/s"
+msgstr "%u Mb/s"
+
+#: ../cli/src/devices.c:337
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: ../cli/src/devices.c:348
+#, c-format
+msgid ""
+"\n"
+"  Wireless Properties\n"
+msgstr ""
+"\n"
+"  Eigenschaften der drahtlosen Verbindung\n"
+
+#: ../cli/src/devices.c:353
+msgid "WEP Encryption"
+msgstr "WEP-Verschlüsselung"
+
+#: ../cli/src/devices.c:355
+msgid "WPA Encryption"
+msgstr "WPA-Verschlüsselung"
+
+#: ../cli/src/devices.c:357
+msgid "WPA2 Encryption"
+msgstr "WPA2-Verschlüsselung"
+
+#: ../cli/src/devices.c:359
+msgid "TKIP cipher"
+msgstr "TKIP-Chiffre"
+
+#: ../cli/src/devices.c:361
+msgid "CCMP cipher"
+msgstr "CCMP-Chiffre"
+
+#: ../cli/src/devices.c:368
+#, c-format
+msgid ""
+"\n"
+"  Wireless Access Points %s\n"
+msgstr ""
+"\n"
+"  Zugangspunkte für Drahtlosnetzwerk %s\n"
+
+#: ../cli/src/devices.c:368
+msgid "(* = current AP)"
+msgstr "(* = aktueller Zugangspunkt)"
+
+#: ../cli/src/devices.c:374
+#, c-format
+msgid ""
+"\n"
+"  Wired Properties\n"
+msgstr ""
+"\n"
+"  Eigenschaften der kabelgebundenen Verbindung\n"
+
+#: ../cli/src/devices.c:377 ../cli/src/devices.c:379
+msgid "Carrier"
+msgstr "Trägersignal"
+
+#: ../cli/src/devices.c:377
+msgid "on"
+msgstr "an"
+
+#: ../cli/src/devices.c:379
+msgid "off"
+msgstr "aus"
+
+#: ../cli/src/devices.c:387
+#, c-format
+msgid ""
+"\n"
+"  IPv4 Settings:\n"
+msgstr ""
+"\n"
+"  IPv4-Einstellungen:\n"
+
+#: ../cli/src/devices.c:395
+msgid "Address"
+msgstr "Adresse"
+
+#: ../cli/src/devices.c:401
+msgid "Prefix"
+msgstr "Präfix"
+
+#: ../cli/src/devices.c:405
+msgid "Gateway"
+msgstr "Gateway"
+
+#: ../cli/src/devices.c:416
+msgid "DNS"
+msgstr "DNS"
+
+#: ../cli/src/devices.c:458
+msgid "Status of devices"
+msgstr "Status von Geräten"
+
+#: ../cli/src/devices.c:487
+#, c-format
+msgid "Error: '%s' argument is missing."
+msgstr "Fehler: Argument »%s« fehlt."
+
+#: ../cli/src/devices.c:516 ../cli/src/devices.c:655 ../cli/src/devices.c:729
+#, c-format
+msgid "Error: Device '%s' not found."
+msgstr "Fehler: Gerät »%s« wurde nicht gefunden"
+
+#: ../cli/src/devices.c:539
+#, c-format
+msgid "Success: Device '%s' successfully disconnected."
+msgstr "Erfolg: Gerät »%s« wurde erfolgreich getrennt."
+
+#: ../cli/src/devices.c:564
+#, c-format
+msgid "Error: Device '%s' (%s) disconnecting failed: %s"
+msgstr "Fehler: Trennung des Gerätes »%s« (%s) ist fehlgeschlagen: %s"
+
+#: ../cli/src/devices.c:572
+#, c-format
+msgid "Device state: %d (%s)\n"
+msgstr "Gerätezustand:  %d (%s)\n"
+
+#: ../cli/src/devices.c:636
+#, c-format
+msgid "Error: iface has to be specified."
+msgstr "Fehler: Schnittstelle muss angegeben werden."
+
+#: ../cli/src/devices.c:736 ../cli/src/devices.c:746
+msgid "WiFi scan list"
+msgstr "Suchliste für WiFi"
+
+#: ../cli/src/devices.c:740
+#, c-format
+msgid "Error: Device '%s' is not a WiFi device."
+msgstr "Fehler: Gerät »%s« ist kein WiFi-Gerät."
+
+#: ../cli/src/devices.c:754
+msgid "Device:"
+msgstr "Gerät:"
+
+#: ../cli/src/devices.c:806
+#, c-format
+msgid "Error: hwaddr has to be specified."
+msgstr "Fehler: Hardware-Adresse muss angegeben werden."
+
+#: ../cli/src/devices.c:844
+#, c-format
+msgid "Error: Access point with hwaddr '%s' not found."
+msgstr ""
+"Fehler: Der Zugangspunkt mit Hardware-Adresse »%s« wurde nicht gefunden."
+
+#: ../cli/src/devices.c:862
+#, c-format
+msgid "%u MHz"
+msgstr "%u MHz"
+
+#: ../cli/src/devices.c:863
+#, c-format
+msgid "%u MB/s"
+msgstr "%u MB/s"
+
+#: ../cli/src/devices.c:869 ../cli/src/devices.c:871
+msgid "AP parameters"
+msgstr "Parameter des Zugangspunktes"
+
+#: ../cli/src/devices.c:873
+msgid "SSID:"
+msgstr "SSID:"
+
+#: ../cli/src/devices.c:874
+msgid "BSSID:"
+msgstr "BSSID:"
+
+#: ../cli/src/devices.c:875
+msgid "Frequency:"
+msgstr "Frequenz:"
+
+#: ../cli/src/devices.c:876
+msgid "Mode:"
+msgstr "Modus:"
+
+#: ../cli/src/devices.c:876
+msgid "Ad-hoc"
+msgstr "Ad-hoc"
+
+#: ../cli/src/devices.c:876
+msgid "Infrastructure"
+msgstr "Infrastuktur"
+
+#: ../cli/src/devices.c:877
+msgid "Maximal bitrate:"
+msgstr "Maximale Bitrate:"
+
+#: ../cli/src/devices.c:878
+msgid "Strength:"
+msgstr "Stärke:"
+
+#: ../cli/src/devices.c:879
+msgid "Flags:"
+msgstr "Flags:"
+
+#: ../cli/src/devices.c:879
+msgid "privacy"
+msgstr "Datenschutzmodus"
+
+#: ../cli/src/devices.c:880
+msgid "WPA flags:"
+msgstr "WPA-Flags:"
+
+#: ../cli/src/devices.c:881
+msgid "RSN flags:"
+msgstr "RSN-Flags:"
+
+#: ../cli/src/devices.c:907
+#, c-format
+msgid "Error: 'dev wifi' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »dev wifi« ist nicht gültig."
+
+#: ../cli/src/devices.c:943
+#, c-format
+msgid "Error: 'dev' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »dev« ist nicht gültig."
+
+#: ../cli/src/network-manager.c:46
+#, c-format
+msgid ""
+"Usage: nmcli nm { COMMAND | help }\n"
+"\n"
+"  COMMAND := { status | sleep | wakeup | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  sleep\n"
+"  wakeup\n"
+"  wifi [on|off]\n"
+"  wwan [on|off]\n"
+"\n"
+msgstr ""
+"Aufruf: nmcli nm { BEFEHL | help }\n"
+"\n"
+"  BEFEHL := { status | sleep | wakeup | wifi | wwan }\n"
+"\n"
+"  status\n"
+"  sleep\n"
+"  wakeup\n"
+"  wifi [on|off]\n"
+"  wwan [on|off]\n"
+"\n"
+
+#: ../cli/src/network-manager.c:67
+msgid "asleep"
+msgstr "schlafend"
+
+#: ../cli/src/network-manager.c:69
+msgid "connecting"
+msgstr "wird verbunden"
+
+#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
+msgid "enabled"
+msgstr "aktiviert"
+
+#: ../cli/src/network-manager.c:93 ../cli/src/network-manager.c:94
+#: ../cli/src/network-manager.c:95 ../cli/src/network-manager.c:96
+#: ../cli/src/network-manager.c:143 ../cli/src/network-manager.c:160
+msgid "disabled"
+msgstr "deaktiviert"
+
+#: ../cli/src/network-manager.c:102
+msgid "NetworkManager status"
+msgstr "Status von NetworkManager"
+
+#: ../cli/src/network-manager.c:104
+msgid "NM running:"
+msgstr "NM läuft:"
+
+#: ../cli/src/network-manager.c:104
+msgid "running"
+msgstr "wird ausgeführt"
+
+#: ../cli/src/network-manager.c:104
+msgid "not running"
+msgstr "wird nicht ausgeführt"
+
+#: ../cli/src/network-manager.c:105
+msgid "NM state:"
+msgstr "Status von NM:"
+
+#: ../cli/src/network-manager.c:106
+msgid "NM wireless hardware:"
+msgstr "NM Drahtlos-Hardware:"
+
+#. no argument, show current state
+#: ../cli/src/network-manager.c:107 ../cli/src/network-manager.c:143
+msgid "NM wireless:"
+msgstr "NM drahtlos:"
+
+#: ../cli/src/network-manager.c:108
+msgid "NM WWAN hardware:"
+msgstr "NM WWAN-Hardware:"
+
+#. no argument, show current state
+#: ../cli/src/network-manager.c:109 ../cli/src/network-manager.c:160
+msgid "NM WWAN:"
+msgstr "NM WWAN:"
+
+#: ../cli/src/network-manager.c:150
+#, c-format
+msgid "Error: invalid 'wifi' parameter: '%s'."
+msgstr "Fehler: Ungültiger »wifi«-Parameter: »%s«."
+
+#: ../cli/src/network-manager.c:167
+#, c-format
+msgid "Error: invalid 'wwan' parameter: '%s'."
+msgstr "Fehler: Ungültiger »wwan«-Parameter: »%s«."
+
+#: ../cli/src/network-manager.c:178
+#, c-format
+msgid "Error: 'nm' command '%s' is not valid."
+msgstr "Fehler: Der Befehl »%s« für »nm« ist nicht gültig."
+
+#: ../cli/src/nmcli.c:65
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n"
+"\n"
+"OPTIONS\n"
+"  -t[erse]    terse output\n"
+"  -p[retty]   pretty output\n"
+"  -v[ersion]  show program version\n"
+"  -h[elp]     print this help\n"
+"\n"
+"OBJECT\n"
+"  nm          NetworkManager status\n"
+"  con         NetworkManager connections\n"
+"  dev         devices managed by NetworkManager\n"
+"\n"
+msgstr ""
+"Aufruf: %s [OPTIONEN] OBJEKT { BEFEHL | help }\n"
+"\n"
+"OPTIONEN\n"
+"  -t[erse]    knappe Ausgabe\n"
+"  -p[retty]   hübsche Ausgabe\n"
+"  -v[ersion]  Programm-Version anzeigen\n"
+"  -h[elp]     dies Hilfe ausgeben\n"
+"\n"
+"OBJEKT\n"
+"  nm          Status von NetworkManager\n"
+"  con         Verbindungen von NetworkManager\n"
+"  dev         von NetworkManager verwaltete Verbindungen\n"
+"\n"
+
+#: ../cli/src/nmcli.c:106
+#, c-format
+msgid "Object '%s' is unknown, try 'nmcli help'."
+msgstr "Objekt »%s« ist unbekannt, versuchen Sie »nmcli help«."
+
+#: ../cli/src/nmcli.c:139
+#, c-format
+msgid "nmcli tool, version %s\n"
+msgstr "nmcli, Version %s\n"
+
+#: ../cli/src/nmcli.c:145
+#, c-format
+msgid "Option '%s' is unknown, try 'nmcli -help'."
+msgstr "Option »%s« ist unbekannt, versuchen Sie »nmcli -help«."
+
+#: ../cli/src/nmcli.c:164
+#, c-format
+msgid "Caught signal %d, shutting down..."
+msgstr "Signal %d wurde empfangen, wird beendet …"
+
+#: ../cli/src/nmcli.c:189
+#, c-format
+msgid "Error: Could not connect to NetworkManager."
+msgstr "Fehler: Verbindung konnte nicht mit NetworkManager hergestellt werden."
+
+#: ../cli/src/nmcli.c:205
+msgid "Success"
+msgstr "Erfolg"
 
 #: ../libnm-util/crypto.c:120
 #, c-format
@@ -237,7 +1084,7 @@ msgstr "PKCS#12 konnte nicht decodiert werden: %s"
 msgid "Couldn't verify PKCS#12 file: %s"
 msgstr "PKCS#12-Datei konnte nicht überprüft werden: %s"
 
-#: ../libnm-util/crypto_nss.c:57
+#: ../libnm-util/crypto_nss.c:56
 #, c-format
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "Fehler beim Initialisieren der Verschlüsselung: %d."
@@ -351,38 +1198,38 @@ msgstr "PKCS#12-Datei konnte nicht überprüft werden: %d"
 msgid "Could not generate random data."
 msgstr "Zufällige Daten konnten nicht erstellt werden."
 
-#: ../libnm-util/nm-utils.c:1522
+#: ../libnm-util/nm-utils.c:1545
 #, 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
+#: ../libnm-util/nm-utils.c:1655
 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
+#: ../libnm-util/nm-utils.c:1667
 #, 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
+#: ../libnm-util/nm-utils.c:1679
 #, 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
+#: ../libnm-util/nm-utils.c:1698
 #, 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/nm-netlink-monitor.c:582
 #: ../src/ip6-manager/nm-netlink-listener.c:352
 #, c-format
 msgid "error processing netlink message: %s"
@@ -421,23 +1268,23 @@ msgstr ""
 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
+#: ../src/nm-netlink-monitor.c:558 ../src/nm-netlink-monitor.c:571
 #, c-format
 msgid "error updating link cache: %s"
 msgstr "Fehler beim Aktualisieren des Verbindungs-Cache: %s"
 
-#: ../src/NetworkManager.c:330
+#: ../src/main.c:494
 #, 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 "
+"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
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:300
 msgid "# Created by NetworkManager\n"
 msgstr "# Erstellt von NetworkManager\n"
 
-#: ../src/dhcp-manager/nm-dhcp-dhclient.c:310
+#: ../src/dhcp-manager/nm-dhcp-dhclient.c:316
 #, c-format
 msgid ""
 "# Merged from %s\n"
@@ -478,7 +1325,7 @@ msgstr ""
 msgid "Auto %s"
 msgstr "Auto %s"
 
-#: ../system-settings/plugins/ifcfg-rh/reader.c:2406
+#: ../system-settings/plugins/ifcfg-rh/reader.c:3213
 msgid "System"
 msgstr "System"