diff --git a/po/de.po b/po/de.po
index d736e0a2..8da51faa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,44 +1,44 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Fabian Affolter <fab@fedoraproject.org>, 2007.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-27 10:05-0700\n"
-"PO-Revision-Date: 2007-07-30 11:06+0100\n"
-"Last-Translator: Fabian Affolter <fab@fedoraproject.org>\n"
+"POT-Creation-Date: 2008-01-18 18:19+0000\n"
+"PO-Revision-Date: 2008-01-25 12:05-0500\n"
+"Last-Translator: Gerhard Steiner <gerhard.steiner@duichwir.at>\n"
 "Language-Team: German <fedora-trans-de@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Pootle 1.0.2\n"
 "X-Poedit-Language: German\n"
 
-#: ../shell/intro/intro.py:61
+#: ../shell/intro/intro.py:67
 msgid "Name:"
 msgstr "Name:"
 
-#: ../shell/intro/intro.py:84
+#: ../shell/intro/intro.py:96
 msgid "Click to change color:"
 msgstr "Klicke zum Wechseln der Farbe"
 
-#: ../shell/intro/intro.py:134
+#: ../shell/intro/intro.py:146
 msgid "Back"
 msgstr "Zurück"
 
-#: ../shell/intro/intro.py:142
+#: ../shell/intro/intro.py:160
 msgid "Done"
 msgstr "Fertig"
 
-#: ../shell/intro/intro.py:145
+#: ../shell/intro/intro.py:163
 msgid "Next"
 msgstr "Nächste"
 
-#: ../shell/view/BuddyMenu.py:82
+#: ../shell/view/BuddyMenu.py:59
 msgid "Remove friend"
 msgstr "Freund entfernen"
 
-#: ../shell/view/BuddyMenu.py:85
+#: ../shell/view/BuddyMenu.py:62
 msgid "Make friend"
 msgstr "Freunde werden"
 
@@ -47,11 +47,11 @@ msgstr "Freunde werden"
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../shell/view/clipboardmenu.py:66
+#: ../shell/view/clipboardmenu.py:58
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../shell/view/clipboardmenu.py:70
+#: ../shell/view/clipboardmenu.py:63
 msgid "Open"
 msgstr "Öffnen"
 
@@ -59,28 +59,28 @@ msgstr "Öffnen"
 #. TODO: Implement stopping downloads
 #. self._stop_item.connect('activate', self._stop_item_activate_cb)
 #. self.append_menu_item(self._stop_item)
-#: ../shell/view/clipboardmenu.py:79
+#: ../shell/view/clipboardmenu.py:73
 msgid "Add to journal"
 msgstr "Zum Journal hinzufügen"
 
-#: ../shell/view/clipboardmenu.py:180
+#: ../shell/view/clipboardmenu.py:213
 #, python-format
 msgid "Clipboard object: %s."
-msgstr "Zwischenablage-Objekte: %s."
+msgstr "Zwischenablage-Objekt: %s."
 
-#: ../shell/view/frame/zoombox.py:42
+#: ../shell/view/frame/zoomtoolbar.py:42
 msgid "Neighborhood"
-msgstr "Nachbarnschaft"
+msgstr "Umgebung"
 
-#: ../shell/view/frame/zoombox.py:55
+#: ../shell/view/frame/zoomtoolbar.py:54
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../shell/view/frame/zoombox.py:68
+#: ../shell/view/frame/zoomtoolbar.py:66
 msgid "Home"
 msgstr "Zuhause"
 
-#: ../shell/view/frame/zoombox.py:81
+#: ../shell/view/frame/zoomtoolbar.py:78
 msgid "Activity"
 msgstr "Aktivität"
 
@@ -92,52 +92,345 @@ msgstr "Text"
 msgid "Image"
 msgstr "Bild"
 
-#: ../shell/view/Shell.py:203
+#: ../shell/view/Shell.py:285
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: ../shell/view/home/HomeBox.py:140
+#: ../shell/view/home/HomeBox.py:164
 msgid "Shutdown"
 msgstr "Ausschalten"
 
-#: ../shell/view/home/MeshBox.py:126
+#: ../shell/view/home/MeshBox.py:195 ../shell/view/devices/network/mesh.py:37
+#: ../shell/view/devices/network/mesh.py:62
+#: ../shell/view/devices/network/mesh.py:66
+#, fuzzy
 msgid "Mesh Network"
-msgstr "Knoten-Netzwerk"
+msgstr "Mesh Netzwerk"
 
-#: ../shell/view/devices/battery.py:34
+#: ../shell/view/devices/battery.py:38
 msgid "My Battery life"
-msgstr "Meine Batterie-Lebensdauer"
+msgstr "Meine Akku-Laufzeit"
 
-#: ../shell/view/devices/battery.py:87
+#: ../shell/view/devices/battery.py:94
 msgid "Battery charging"
-msgstr "Batterie wird geladen"
+msgstr "Akku wird geladen"
 
-#: ../shell/view/devices/battery.py:89
+#: ../shell/view/devices/battery.py:96
 msgid "Battery discharging"
-msgstr "Batterie entläd sich"
+msgstr "Akku in Benutzung"
 
-#: ../shell/view/devices/battery.py:91
+#: ../shell/view/devices/battery.py:98
 msgid "Battery fully charged"
-msgstr "Batterie komplett geladen"
+msgstr "Akku vollständig geladen"
 
-#: ../sugar/activity/activity.py:73
+#: ../lib/sugar/activity/activity.py:117
 msgid "Private"
 msgstr "Privat"
 
-#: ../sugar/activity/activity.py:75
+#: ../lib/sugar/activity/activity.py:118
 msgid "My Neighborhood"
-msgstr "Meine Nachbarschaft"
+msgstr "Meine Umgebung"
 
-#: ../sugar/activity/activity.py:83
+#: ../lib/sugar/activity/activity.py:126
 msgid "Keep"
 msgstr "Behalten"
 
-#: ../sugar/activity/activity.py:89
+#: ../shell/view/home/activitiesdonut.py:111
+#: ../lib/sugar/activity/activity.py:132
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../sugar/activity/activity.py:262
+#: ../lib/sugar/activity/activity.py:454
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivität"
 
+#: ../shell/view/BuddyMenu.py:84
+#, python-format
+msgid "Invite to %s"
+msgstr "Einladen zu %s"
+
+#: ../shell/hardware/keydialog.py:149
+msgid "Key Type:"
+msgstr "Schlüsseltyp"
+
+#: ../shell/hardware/keydialog.py:169
+msgid "Authentication Type:"
+msgstr "Authentifizierungstyp"
+
+#: ../shell/hardware/keydialog.py:250
+msgid "Encryption Type:"
+msgstr "Verschlüsselungstyp"
+
+#: ../shell/view/home/activitiesdonut.py:90
+msgid "Starting..."
+msgstr "Starten..."
+
+#: ../shell/view/home/activitiesdonut.py:104 ../shell/view/home/MeshBox.py:295
+#, fuzzy
+msgid "Resume"
+msgstr "Fortsetzen"
+
+#: ../shell/view/home/HomeBox.py:159
+msgid "Reboot"
+msgstr "Neu starten"
+
+#: ../shell/view/home/HomeBox.py:170
+msgid "Register"
+msgstr "Registrieren"
+
+#. Only show disconnect when there's a mesh device, because mesh takes
+#. priority over the normal wireless device.  NM doesn't have a "disconnect"
+#. method for a device either (for various reasons) so this doesn't
+#. have a good mapping
+#: ../shell/view/home/MeshBox.py:90 ../shell/view/home/MeshBox.py:197
+#: ../shell/view/devices/network/wireless.py:113
+#: ../shell/view/devices/network/mesh.py:83
+msgid "Disconnect..."
+msgstr "Verbindung trennen..."
+
+#: ../shell/view/home/MeshBox.py:300
+msgid "Join"
+msgstr "Mitmachen"
+
+#: ../shell/view/devices/network/wireless.py:61
+msgid "Disconnected"
+msgstr "Nicht verbunden"
+
+#: ../shell/view/devices/network/wireless.py:131
+msgid "Channel"
+msgstr "Kanal"
+
+# Alternative: Gemeinsam mit:
+#: ../lib/sugar/activity/activity.py:115
+#, fuzzy
+msgid "Share with:"
+msgstr "Teilen mit:"
+
+#: ../lib/sugar/activity/activity.py:245
+msgid "Undo"
+msgstr "Rückgängig"
+
+#: ../lib/sugar/activity/activity.py:250
+msgid "Redo"
+msgstr "Wiederholen"
+
+#: ../lib/sugar/activity/activity.py:260
+msgid "Copy"
+msgstr "Kopieren"
+
+#: ../lib/sugar/activity/activity.py:265
+msgid "Paste"
+msgstr "Einfügen"
+
+#: ../lib/sugar/activity/activity.py:824
+msgid "Keep error"
+msgstr "Fehler beim Speichern"
+
+#: ../lib/sugar/activity/activity.py:825
+msgid "Keep error: all changes will be lost"
+msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren"
+
+#: ../lib/sugar/activity/activity.py:828
+msgid "Don't stop"
+msgstr "Nicht stoppen"
+
+#: ../lib/sugar/activity/activity.py:831
+#, fuzzy
+msgid "Stop anyway"
+msgstr "Trotzdem stoppen"
+
+#: ../lib/sugar/graphics/alert.py:164 ../lib/sugar/graphics/alert.py:206
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../lib/sugar/graphics/alert.py:168
+msgid "Ok"
+msgstr "Ok"
+
+#: ../lib/sugar/graphics/alert.py:216
+msgid "Continue"
+msgstr "Weitermachen"
+
+#: ../lib/sugar/graphics/alert.py:244
+msgid "OK"
+msgstr "OK"
+
+#: ../lib/sugar/graphics/objectchooser.py:175
+#, python-format
+msgid "%d year"
+msgstr "%d Jahr"
+
+#: ../lib/sugar/graphics/objectchooser.py:175
+#, python-format
+msgid "%d years"
+msgstr "%d Jahre"
+
+#: ../lib/sugar/graphics/objectchooser.py:176
+#, python-format
+msgid "%d month"
+msgstr "%d Monat"
+
+#: ../lib/sugar/graphics/objectchooser.py:176
+#, python-format
+msgid "%d months"
+msgstr "%d Monate"
+
+#: ../lib/sugar/graphics/objectchooser.py:177
+#, python-format
+msgid "%d week"
+msgstr "%d Woche"
+
+#: ../lib/sugar/graphics/objectchooser.py:177
+#, python-format
+msgid "%d weeks"
+msgstr "%d Wochen"
+
+#: ../lib/sugar/graphics/objectchooser.py:178
+#, python-format
+msgid "%d day"
+msgstr "%d Tag"
+
+#: ../lib/sugar/graphics/objectchooser.py:178
+#, python-format
+msgid "%d days"
+msgstr "%d Tage"
+
+#: ../lib/sugar/graphics/objectchooser.py:179
+#, python-format
+msgid "%d hour"
+msgstr "%d Stunde"
+
+#: ../lib/sugar/graphics/objectchooser.py:179
+#, python-format
+msgid "%d hours"
+msgstr "%d Stunden"
+
+#: ../lib/sugar/graphics/objectchooser.py:180
+#, python-format
+msgid "%d minute"
+msgstr "%d Minute"
+
+#: ../lib/sugar/graphics/objectchooser.py:180
+#, python-format
+msgid "%d minutes"
+msgstr "%d Minuten"
+
+#: ../lib/sugar/graphics/objectchooser.py:181
+#, python-format
+msgid "%d second"
+msgstr "%d Sekunde"
+
+#: ../lib/sugar/graphics/objectchooser.py:181
+#, python-format
+msgid "%d seconds"
+msgstr "%d Sekunden"
+
+#: ../lib/sugar/graphics/objectchooser.py:191
+msgid " and "
+msgstr " und "
+
+#: ../lib/sugar/graphics/objectchooser.py:193
+msgid ", "
+msgstr ", "
+
+#: ../shell/controlpanel/control.py:213
+msgid "To apply your changes you have to restart sugar.\n"
+msgstr "Um die Änderungen zu übernehmen, muss Sugar neu gestartet werden.\n"
+
+#: ../shell/controlpanel/control.py:267
+msgid "Error in specified color modifiers."
+msgstr "Fehler in den definierten Farbänderungen."
+
+#: ../shell/controlpanel/control.py:270
+msgid "Error in specified colors."
+msgstr "Fehler in den definierten Farben."
+
+#: ../shell/controlpanel/control.py:307
+msgid "off"
+msgstr "aus"
+
+#: ../shell/controlpanel/control.py:309
+msgid "on"
+msgstr "an"
+
+#: ../shell/controlpanel/control.py:310
+msgid "State is unknown."
+msgstr "Status ist unbekannt."
+
+#: ../shell/controlpanel/control.py:332
+msgid "Error in specified radio argument use on/off."
+msgstr "Fehler im angegebenen 'radio' Argument - Verwendung von 'an'/'aus'."
+
+#: ../shell/controlpanel/control.py:336
+msgid "Permission denied. You need to be root to run this method."
+msgstr "Zugriffsrechte notwendig. Du musst root sein für diese Aktion."
+
+#: ../shell/controlpanel/control.py:366
+msgid "Error in reading timezone"
+msgstr "Fehler beim Lesen der Zeitzone"
+
+#: ../shell/controlpanel/control.py:397
+#, python-format
+msgid "Error copying timezone (from %s): %s"
+msgstr "Fehler beim Kopieren der Zeitzone (von %s): %s"
+
+#: ../shell/controlpanel/control.py:402
+#, python-format
+msgid "Changing permission of timezone: %s"
+msgstr "Änderung der Berechtigung für Zeitzone: %s"
+
+#: ../shell/controlpanel/control.py:412
+msgid "Error timezone does not exist."
+msgstr "Fehler: unbekannte Zeitzone"
+
+#: ../shell/controlpanel/control.py:417 ../shell/controlpanel/control.py:436
+#, python-format
+msgid "Could not access %s. Create standard settings."
+msgstr "Kann nicht auf %s zugreifen. Erstelle Standardeinstellungen."
+
+#: ../shell/controlpanel/control.py:463
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "Sprache für Code=%s konnte nicht ermittelt werden."
+
+#: ../shell/controlpanel/control.py:473
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "Entschuldigung, ich spreche nicht '%s'."
+
+#: ../shell/view/devices/network/mesh.py:105
+msgid "Connected to a School Mesh Portal"
+msgstr "Verbunden mit einem Schul-Maschennetzwerk-Portal"
+
+#: ../shell/view/devices/network/mesh.py:107
+msgid "Looking for a School Mesh Portal..."
+msgstr "Suche Schul-Maschennetzwerk-Portal..."
+
+#: ../shell/view/devices/network/mesh.py:110
+msgid "Connected to an XO Mesh Portal"
+msgstr "Verbunden mit einem XO Maschennetzwerk-Portal..."
+
+#: ../shell/view/devices/network/mesh.py:112
+msgid "Looking for an XO Mesh Portal..."
+msgstr "Suche XO Maschennetzwerk-Portal..."
+
+#: ../shell/view/devices/network/mesh.py:115
+msgid "Connected to a Simple Mesh"
+msgstr "Verbunden mit einem einfachen Maschennetzwerk"
+
+#: ../shell/view/devices/network/mesh.py:117
+msgid "Starting a Simple Mesh"
+msgstr "Starte ein einfaches Maschennetzwerk"
+
+#: ../shell/view/devices/network/mesh.py:124
+msgid "Unknown Mesh"
+msgstr "Unbekanntes Maschennetzwerk"
+
+#: ../shell/view/home/HomeBox.py:175 ../shell/view/home/HomeBox.py:216
+msgid "About this XO"
+msgstr "Infos zu diesem XO"
+
+#: ../shell/view/home/HomeBox.py:222
+msgid "Not available"
+msgstr "Nicht verfügbar"