From db1f97db8b46e6e8d24cb51eaa9547c7c0299d15 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Wed, 29 Feb 2012 14:36:06 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:ruler/mainline

---
diff --git a/po/th.po b/po/th.po
index df01248..63a62b1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2,19 +2,41 @@
 # Copyright (C) 2007 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: 2007-11-29 16:45-0500\n"
-"PO-Revision-Date: 2007-11-29 17:37-0500\n"
-"Last-Translator:  <olpc@xo-12-34-56.localdomain>\n"
+"POT-Creation-Date: 2011-05-23 16:56-0400\n"
+"PO-Revision-Date: 2011-11-19 05:51+0200\n"
+"Last-Translator: fah <ifah.fah22@hotmail.com>\n"
 "Language-Team: Thai\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#: activity/activity.info:2 RulerActivity.py:162 RulerActivity.py:298
 msgid "Ruler"
 msgstr "ไม้บรรทัด"
+
+#: show_rulers.py:50
+msgid "Use this ruler from the outside edge of the computer."
+msgstr "ใช้บรรทัดอันนี้จากขอบนอกของคอมพิวเตอร์"
+
+#: RulerActivity.py:170 RulerActivity.py:306
+msgid "Grid"
+msgstr "แนวตาราง"
+
+#: RulerActivity.py:178 RulerActivity.py:314
+msgid "Angles"
+msgstr "มุม"
+
+#: RulerActivity.py:186 RulerActivity.py:322
+msgid "Checker"
+msgstr "ผู้ตรวจ"
+
+#: RulerActivity.py:230
+msgid "Rulers"
+msgstr "ไม้บรรทัด"
--
cgit v0.9.1