From 4c3999b608c2357541371e5a8fa749ae990b34c0 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Thu, 25 Aug 2011 20:09:27 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:fototoon/mainline

---
diff --git a/po/da.po b/po/da.po
index b2b9ed7..2ef421f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,85 +2,84 @@
 # 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
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-16 04:16-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-08 09:01-0300\n"
+"PO-Revision-Date: 2011-08-08 19:10+0200\n"
+"Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "FotoToon"
-msgstr ""
-
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:32
-msgid "Globes"
-msgstr ""
-
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:36
-msgid "Text"
-msgstr ""
+msgstr "FotoTegneseriefigur"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:51
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:64
+#: toolbar.py:82
 msgid "Add Photo"
-msgstr ""
+msgstr "Tilføj foto"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:61
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:74
+#: toolbar.py:93
 msgid "Add Globe"
-msgstr ""
+msgstr "Tilføj globe"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:67
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:80
+#: toolbar.py:100
 msgid "Add Think"
-msgstr ""
+msgstr "Tilføj tanke"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:73
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:86
+#: toolbar.py:107
 msgid "Add Whisper"
-msgstr ""
+msgstr "Tilføj hvisken"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:79
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:92
+#: toolbar.py:114
 msgid "Add Exclamation"
-msgstr ""
+msgstr "Tilføj udråb"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:85
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:98
+#: toolbar.py:121
 msgid "Add Box"
-msgstr ""
+msgstr "Tilføj boks"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:95
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:108
+#: toolbar.py:131
 msgid "Turn"
-msgstr ""
+msgstr "Vend"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:101
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:114
+#: toolbar.py:137
 msgid "Delete"
-msgstr ""
+msgstr "Slet"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:179
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:181
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:186
+#: toolbar.py:213 toolbar.py:217
 msgid "Choose image"
-msgstr ""
+msgstr "Vælg billede"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:211
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:216
+#: toolbar.py:250
 msgid "Bold"
-msgstr ""
+msgstr "Fed"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:217
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:222
+#: toolbar.py:255
 msgid "Italic"
-msgstr ""
+msgstr "Kursiv"
+
+#: toolbar.py:270
+msgid "Text Color"
+msgstr "Tekstfarve"
+
+#: historietaactivity.py:35
+msgid "Save as Image"
+msgstr "Gem som billede"
+
+#: historietaactivity.py:35
+msgid "PNG"
+msgstr "PNG"
+
+#: historietaactivity.py:63
+msgid "Text"
+msgstr "Tekst"
+
+#~ msgid "Globes"
+#~ msgstr "Glober"
diff --git a/po/en.po b/po/en.po
index cd1dd40..a081171 100644
--- a/po/en.po
+++ b/po/en.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-16 04:16-0300\n"
-"PO-Revision-Date: 2011-02-10 07:43+0200\n"
+"POT-Creation-Date: 2011-08-08 09:01-0300\n"
+"PO-Revision-Date: 2011-08-08 17:51+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -15,72 +15,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.3\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "FotoToon"
 msgstr "FotoToon"
 
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:32
-msgid "Globes"
-msgstr "Globes"
-
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:36
-msgid "Text"
-msgstr "Text"
-
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:51
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:64
+#: toolbar.py:82
 msgid "Add Photo"
 msgstr "Add Photo"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:61
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:74
+#: toolbar.py:93
 msgid "Add Globe"
 msgstr "Add Globe"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:67
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:80
+#: toolbar.py:100
 msgid "Add Think"
 msgstr "Add Think"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:73
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:86
+#: toolbar.py:107
 msgid "Add Whisper"
 msgstr "Add Whisper"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:79
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:92
+#: toolbar.py:114
 msgid "Add Exclamation"
 msgstr "Add Exclamation"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:85
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:98
+#: toolbar.py:121
 msgid "Add Box"
 msgstr "Add Box"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:95
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:108
+#: toolbar.py:131
 msgid "Turn"
 msgstr "Turn"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:101
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:114
+#: toolbar.py:137
 msgid "Delete"
 msgstr "Delete"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:179
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:181
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:186
+#: toolbar.py:213 toolbar.py:217
 msgid "Choose image"
 msgstr "Choose image"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:211
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:216
+#: toolbar.py:250
 msgid "Bold"
 msgstr "Bold"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:217
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:222
+#: toolbar.py:255
 msgid "Italic"
 msgstr "Italic"
+
+#: toolbar.py:270
+msgid "Text Color"
+msgstr "Text Color"
+
+#: historietaactivity.py:35
+msgid "Save as Image"
+msgstr "Save as Image"
+
+#: historietaactivity.py:35
+msgid "PNG"
+msgstr "PNG"
+
+#: historietaactivity.py:63
+msgid "Text"
+msgstr "Text"
+
+#~ msgid "Globes"
+#~ msgstr "Globes"
diff --git a/po/en_GB.po b/po/en_GB.po
index 48bf206..a081171 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-16 04:16-0300\n"
-"PO-Revision-Date: 2011-02-14 17:08+0200\n"
+"POT-Creation-Date: 2011-08-08 09:01-0300\n"
+"PO-Revision-Date: 2011-08-08 17:51+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -21,66 +21,65 @@ msgstr ""
 msgid "FotoToon"
 msgstr "FotoToon"
 
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:32
-msgid "Globes"
-msgstr "Globes"
-
-#: /home/gonzalo/Activities/FotoToon.activity/historietaactivity.py:36
-msgid "Text"
-msgstr "Text"
-
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:51
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:64
+#: toolbar.py:82
 msgid "Add Photo"
 msgstr "Add Photo"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:61
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:74
+#: toolbar.py:93
 msgid "Add Globe"
 msgstr "Add Globe"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:67
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:80
+#: toolbar.py:100
 msgid "Add Think"
 msgstr "Add Think"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:73
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:86
+#: toolbar.py:107
 msgid "Add Whisper"
 msgstr "Add Whisper"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:79
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:92
+#: toolbar.py:114
 msgid "Add Exclamation"
 msgstr "Add Exclamation"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:85
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:98
+#: toolbar.py:121
 msgid "Add Box"
 msgstr "Add Box"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:95
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:108
+#: toolbar.py:131
 msgid "Turn"
 msgstr "Turn"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:101
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:114
+#: toolbar.py:137
 msgid "Delete"
 msgstr "Delete"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:179
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:181
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:186
+#: toolbar.py:213 toolbar.py:217
 msgid "Choose image"
 msgstr "Choose image"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:211
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:216
+#: toolbar.py:250
 msgid "Bold"
 msgstr "Bold"
 
-#: /home/gonzalo/Activities/FotoToon.activity/toolbar.py:217
-#: /home/gonzalo/Activities/FotoToon.activity/mainline/toolbar.py:222
+#: toolbar.py:255
 msgid "Italic"
 msgstr "Italic"
+
+#: toolbar.py:270
+msgid "Text Color"
+msgstr "Text Color"
+
+#: historietaactivity.py:35
+msgid "Save as Image"
+msgstr "Save as Image"
+
+#: historietaactivity.py:35
+msgid "PNG"
+msgstr "PNG"
+
+#: historietaactivity.py:63
+msgid "Text"
+msgstr "Text"
+
+#~ msgid "Globes"
+#~ msgstr "Globes"
diff --git a/po/hus.po b/po/hus.po
new file mode 100644
index 0000000..3392818
--- /dev/null
+++ b/po/hus.po
@@ -0,0 +1,87 @@
+# 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: 2011-08-08 09:01-0300\n"
+"PO-Revision-Date: 2011-08-10 16:36+0200\n"
+"Last-Translator: <saulleoart@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \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"
+"X-Generator: Pootle 2.0.1\n"
+
+#: activity/activity.info:2
+msgid "FotoToon"
+msgstr "Foto Toon"
+
+#: toolbar.py:82
+msgid "Add Photo"
+msgstr "Ka punk'uy an walek"
+
+# An kaw globo yab in kwa'al in bijil ti láb jaxtám nana´ u inkiy juni ít kaw.
+# tokow= nube
+# t'íl= ibnal ti al an kaw" t'ilomtaláb"
+# GLOBO= TOKOWT'ÏL
+#
+#: toolbar.py:93
+msgid "Add Globe"
+msgstr "Ka punk'uy an t'iplab Tokowt'íl"
+
+#: toolbar.py:100
+msgid "Add Think"
+msgstr "Ka punk'uy an dhuchlab"
+
+#: toolbar.py:107
+msgid "Add Whisper"
+msgstr "Ka punk'uy an t'iplab tokowt'íl-kwé'-kaw"
+
+#: toolbar.py:114
+msgid "Add Exclamation"
+msgstr "Ka punk'uy an t'iplab tokowt'íl-jik'paxtaláab"
+
+#: toolbar.py:121
+msgid "Add Box"
+msgstr "Ka punk'uy an pek'madh balixtaláb"
+
+#: toolbar.py:131
+msgid "Turn"
+msgstr "Wilk'iy"
+
+#: toolbar.py:137
+msgid "Delete"
+msgstr "Pakuw"
+
+#: toolbar.py:213 toolbar.py:217
+msgid "Choose image"
+msgstr "Taluy an kot'bixtaláb"
+
+#: toolbar.py:250
+msgid "Bold"
+msgstr "T'unk'ux"
+
+#: toolbar.py:255
+msgid "Italic"
+msgstr "Itálica"
+
+#: toolbar.py:270
+msgid "Text Color"
+msgstr "Mukuxtal an dhuchlab"
+
+#: historietaactivity.py:35
+msgid "Save as Image"
+msgstr "Ka dhaya' jant'ini' i k'ot'bixtaláb"
+
+#: historietaactivity.py:35
+msgid "PNG"
+msgstr "PNG"
+
+#: historietaactivity.py:63
+msgid "Text"
+msgstr "Dhuchlab"
diff --git a/po/son.po b/po/son.po
new file mode 100644
index 0000000..ee5edcb
--- /dev/null
+++ b/po/son.po
@@ -0,0 +1,82 @@
+# 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.
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-08 09:01-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.7.0\n"
+
+#: activity/activity.info:2
+msgid "FotoToon"
+msgstr ""
+
+#: toolbar.py:82
+msgid "Add Photo"
+msgstr ""
+
+#: toolbar.py:93
+msgid "Add Globe"
+msgstr ""
+
+#: toolbar.py:100
+msgid "Add Think"
+msgstr ""
+
+#: toolbar.py:107
+msgid "Add Whisper"
+msgstr ""
+
+#: toolbar.py:114
+msgid "Add Exclamation"
+msgstr ""
+
+#: toolbar.py:121
+msgid "Add Box"
+msgstr ""
+
+#: toolbar.py:131
+msgid "Turn"
+msgstr ""
+
+#: toolbar.py:137
+msgid "Delete"
+msgstr ""
+
+#: toolbar.py:213 toolbar.py:217
+msgid "Choose image"
+msgstr ""
+
+#: toolbar.py:250
+msgid "Bold"
+msgstr ""
+
+#: toolbar.py:255
+msgid "Italic"
+msgstr ""
+
+#: toolbar.py:270
+msgid "Text Color"
+msgstr ""
+
+#: historietaactivity.py:35
+msgid "Save as Image"
+msgstr ""
+
+#: historietaactivity.py:35
+msgid "PNG"
+msgstr ""
+
+#: historietaactivity.py:63
+msgid "Text"
+msgstr ""
--
cgit v0.9.1