[anjuta] Updated German translation

From: Mario Blättermann <mariobl src gnome org>
To: commits-list gnome org
Cc:
Subject: [anjuta] Updated German translation
Date: Wed, 3 Mar 2010 21:11:52 +0000 (UTC)

commit 0524afc88371c6c0880852576ecc5c855ecd2269
Author: Mario BlÃ¤ttermann <mariobl gnome org>
Date:   Wed Mar 3 22:07:56 2010 +0100

    Updated German translation

 po/de.po |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/po/de.po b/po/de.po
index f1585ec..3d75b63 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,15 +26,6 @@
 # Philipp Kerling <k philipp gmail com>, 2008.
 # Mario BlÃ¤ttermann <mariobl gnome org>, 2010.
 # Christian Kirbach <Christian Kirbach googlemail com>, 2008, 2009, 2010.
-<<<<<<< HEAD
-msgid ""
-msgstr ""
-"Project-Id-Version: anjuta 2.1.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-13 19:54+0100\n"
-"PO-Revision-Date: 2010-02-13 19:55+0100\n"
-"Last-Translator: Christian Kirbach <Christian Kirbach googlemail com>\n"
-=======
 #
 msgid ""
 msgstr ""
@@ -44,7 +35,6 @@ msgstr ""
 "POT-Creation-Date: 2010-03-03 20:33+0000\n"
 "PO-Revision-Date: 2010-03-03 21:51+0100\n"
 "Last-Translator: Mario BlÃ¤ttermann <mariobl gnome org>\n"
->>>>>>> Updated German translation
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]