Commit from Sugar Labs: Translation System by user RafaelOrtiz.: 5 of 5 messages translated (0 fuzzy).

4 files changed, 39 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index dd69bf4..8ddbf84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 AC_INIT([sugar-base],[0.87.2],[],[sugar-base])
+=======
+AC_INIT([sugar-base],[0.92.0],[],[sugar-base])
+>>>>>>> eb7ada51259747e39c064abb1eae9be7c01e71d3
 
 AC_PREREQ([2.59])
 
diff --git a/po/de.po b/po/de.po
index 16dfd63..1f4de24 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,13 +7,15 @@ msgstr ""
 "Project-Id-Version: sugar-base\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-06-24 00:21+0530\n"
-"PO-Revision-Date: 2008-06-28 10:18-0400\n"
-"Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
+"PO-Revision-Date: 2011-01-09 16:53+0200\n"
+"Last-Translator: Zeinab <zazou_06_05@hotmail.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0rc2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.3\n"
 
 #: ../src/sugar/mime.py:29
 msgid "Text"
diff --git a/po/en.po b/po/en.po
index c3145a6..e74a69e 100644
--- a/po/en.po
+++ b/po/en.po
@@ -2,36 +2,41 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:21+0530\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-09-28 11:45-0400\n"
+"PO-Revision-Date: 2011-01-17 09:11+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.3\n"
 
-#: ../src/sugar/mime.py:29
+#: ../src/sugar/mime.py:43
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
-#: ../src/sugar/mime.py:37
+#: ../src/sugar/mime.py:52
 msgid "Image"
-msgstr ""
+msgstr "Image"
 
-#: ../src/sugar/mime.py:42
+#: ../src/sugar/mime.py:58
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
-#: ../src/sugar/mime.py:47
+#: ../src/sugar/mime.py:66
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
-#: ../src/sugar/mime.py:52
+#: ../src/sugar/mime.py:72
 msgid "Link"
-msgstr ""
+msgstr "Link"
diff --git a/po/fr.po b/po/fr.po
index 38f1598..abce698 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,11 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:21+0530\n"
+"POT-Creation-Date: 2010-09-28 11:45-0400\n"
 "PO-Revision-Date: 2008-06-26 12:17-0400\n"
 "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,22 +19,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/sugar/mime.py:29
+#: ../src/sugar/mime.py:43
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/sugar/mime.py:37
+#: ../src/sugar/mime.py:52
 msgid "Image"
 msgstr "Image"
 
-#: ../src/sugar/mime.py:42
+#: ../src/sugar/mime.py:58
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/sugar/mime.py:47
+#: ../src/sugar/mime.py:66
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/sugar/mime.py:52
+#: ../src/sugar/mime.py:72
 msgid "Link"
 msgstr "Lien"