From ca1ee28844fda1099036a5138cc35834c8f62f31 Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Sun, 22 Jul 2012 05:30:40 +0000
Subject: commit multiple PO files, resolve Poolte conflict

---
(limited to 'po/de.po')

diff --git a/po/de.po b/po/de.po
index 01c16a5..04870c0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -59,8 +59,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-06-07 00:36-0400\n"
-"PO-Revision-Date: 2012-02-19 12:51+0200\n"
-"Last-Translator: olenz <olaf@lenz.name>\n"
+"PO-Revision-Date: 2012-06-25 21:48+0200\n"
+"Last-Translator: mattthias <matthias@sigxcpu.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -230,7 +230,7 @@ msgstr "Meine Umgebung"
 
 #: toolkit/activity_widgets.py:213
 msgid "Description"
-msgstr ""
+msgstr "Beschreibung"
 
 #: toolkit/activity_widgets.py:393
 msgid "Activity"
--
cgit v0.9.1