Merge branch 'master' of git.sugarlabs.org:distance/distancev25

4 files changed, 399 insertions, 39 deletions

diff --git a/po/en.po b/po/en.po
index f62063e..af62d33 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-12-29 01:08-0500\n"
-"PO-Revision-Date: 2011-03-11 23:36+0200\n"
+"POT-Creation-Date: 2011-08-09 11:43-0500\n"
+"PO-Revision-Date: 2011-08-24 07:01+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en\n"
@@ -21,11 +21,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Distance"
 
-#: activity.py:98
+#: activity.py:153
 msgid "Atmosphere"
 msgstr "Atmosphere"
 
-#: activity.py:117
+#: activity.py:156
+msgid "Custom metric"
+msgstr "Custom metric"
+
+#: activity.py:178
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -33,54 +37,97 @@ msgstr ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 
-#: activity.py:118
+#: activity.py:180
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Press the button to measure the distance to another laptop"
 
-#: activity.py:119
+#: activity.py:182
 msgid "Preparing to measure distance"
 msgstr "Preparing to measure distance"
 
-#: activity.py:120
+#: activity.py:183
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Ready to make a measurement.  Waiting for partner to be ready."
 
-#: activity.py:121
+#: activity.py:185
 msgid "Recording sound from each laptop."
 msgstr "Recording sound from each laptop."
 
-#: activity.py:122
+#: activity.py:186
 msgid "Processing recorded audio."
 msgstr "Processing recorded audio."
 
-#: activity.py:124
+#: activity.py:188
 msgid "This activity already has two participants, so you cannot join."
 msgstr "This activity already has two participants, so you cannot join."
 
-#: activity.py:126
+#: activity.py:191
 msgid "Begin Measuring Distance"
 msgstr "Begin Measuring Distance"
 
-#: activity.py:127
+#: activity.py:192
 msgid "Stop Measuring Distance"
 msgstr "Stop Measuring Distance"
 
-#: activity.py:160
-msgid "Measured Distance in Meters"
-msgstr "Measured Distance in Meters"
+#: activity.py:226 smoot_toolbar.py:100
+#, python-format
+#, python-format,
+msgid "Measured distance in %s"
+msgstr "Measured distance in %s"
+
+#: activity.py:226 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:79
+#: smoot_toolbar.py:101
+msgid "meters"
+msgstr "meters"
 
-#: atm_toolbars.py:30
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperature (C): "
 
-#: atm_toolbars.py:40
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Relative Humidity (%): "
 
-#: atm_toolbars.py:50
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Speed of Sound (m/s): "
 
 #: calibration_toolbar.py:27
 msgid "Calibration Offset (meters): "
 msgstr "Calibration Offset (meters): "
+
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
+msgid "centimeters"
+msgstr "centimeters"
+
+#. TRANS: English units of measure
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
+msgid "inches"
+msgstr "inches"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
+msgid "feet"
+msgstr "feet"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
+msgid "yards"
+msgstr "yards"
+
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
+msgid "custom units"
+msgstr "custom units"
+
+#: smoot_toolbar.py:83
+msgid "Choose a unit of measure:"
+msgstr "Choose a unit of measure:"
+
+#: smoot_toolbar.py:86
+msgid "select units"
+msgstr "select units"
+
+#: smoot_toolbar.py:104
+msgid "%2$0.2f %1$s per meter"
+msgstr "%0.2f %s per meter"
+
+#~ msgid "Measured Distance in Meters"
+#~ msgstr "Measured Distance in Meters"
diff --git a/po/en_GB.po b/po/en_GB.po
index fefcbb0..e69f9c0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -26,26 +26,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-29 01:08-0500\n"
-"PO-Revision-Date: 2010-08-04 23:13+0200\n"
-"Last-Translator: Robert <robert_readman@hotmail.com>\n"
+"POT-Creation-Date: 2011-08-09 11:43-0500\n"
+"PO-Revision-Date: 2011-08-10 21:54+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_GB\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.3\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Distance"
 msgstr "Distance"
 
-#: activity.py:98
+#: activity.py:153
 msgid "Atmosphere"
 msgstr "Atmosphere"
 
-#: activity.py:117
+#: activity.py:156
+msgid "Custom metric"
+msgstr "Custom metric"
+
+#: activity.py:178
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -53,54 +57,97 @@ msgstr ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 
-#: activity.py:118
+#: activity.py:180
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Press the button to measure the distance to another laptop"
 
-#: activity.py:119
+#: activity.py:182
 msgid "Preparing to measure distance"
 msgstr "Preparing to measure distance"
 
-#: activity.py:120
+#: activity.py:183
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Ready to make a measurement.  Waiting for partner to be ready."
 
-#: activity.py:121
+#: activity.py:185
 msgid "Recording sound from each laptop."
 msgstr "Recording sound from each laptop."
 
-#: activity.py:122
+#: activity.py:186
 msgid "Processing recorded audio."
 msgstr "Processing recorded audio."
 
-#: activity.py:124
+#: activity.py:188
 msgid "This activity already has two participants, so you cannot join."
 msgstr "This activity already has two participants, so you cannot join."
 
-#: activity.py:126
+#: activity.py:191
 msgid "Begin Measuring Distance"
 msgstr "Begin Measuring Distance"
 
-#: activity.py:127
+#: activity.py:192
 msgid "Stop Measuring Distance"
 msgstr "Stop Measuring Distance"
 
-#: activity.py:160
-msgid "Measured Distance in Meters"
-msgstr "Measured Distance in Metres"
+#: activity.py:226 smoot_toolbar.py:100
+#, python-format
+#, python-format,
+msgid "Measured distance in %s"
+msgstr "Measured distance in %s"
+
+#: activity.py:226 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:79
+#: smoot_toolbar.py:101
+msgid "meters"
+msgstr "metres"
 
-#: atm_toolbars.py:30
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperature (C): "
 
-#: atm_toolbars.py:40
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Relative Humidity (%): "
 
-#: atm_toolbars.py:50
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Speed of Sound (m/s): "
 
 #: calibration_toolbar.py:27
 msgid "Calibration Offset (meters): "
 msgstr "Calibration Offset (metres): "
+
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
+msgid "centimeters"
+msgstr "centimetres"
+
+#. TRANS: English units of measure
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
+msgid "inches"
+msgstr "inches"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
+msgid "feet"
+msgstr "feet"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
+msgid "yards"
+msgstr "yards"
+
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
+msgid "custom units"
+msgstr "custom units"
+
+#: smoot_toolbar.py:83
+msgid "Choose a unit of measure:"
+msgstr "Choose a unit of measure:"
+
+#: smoot_toolbar.py:86
+msgid "select units"
+msgstr "select units"
+
+#: smoot_toolbar.py:104
+msgid "%2$0.2f %1$s per meter"
+msgstr "%2$0.2f %1$s per metre"
+
+#~ msgid "Measured Distance in Meters"
+#~ msgstr "Measured Distance in Metres"
diff --git a/po/hus.po b/po/hus.po
new file mode 100644
index 0000000..819ba75
--- /dev/null
+++ b/po/hus.po
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Chris Leonard <cjl@laptop.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 11:43-0500\n"
+"PO-Revision-Date: 2011-08-19 07:51+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: hus\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 "Distance"
+msgstr "In owát"
+
+#: activity.py:153
+msgid "Atmosphere"
+msgstr "Éb"
+
+#: activity.py:156
+msgid "Custom metric"
+msgstr "kwete' ajixlejbaxtaláb"
+
+#: activity.py:178
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+"Abal ka lejban in owdhá' k'al tsáb i abatnom pat'ál, ja'its in yejenchal ka "
+"tolmixnáj axi t'ojláb."
+
+#: activity.py:180
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+"Ka ni'chij in k'watab xuts an t'él abal ka lejban in owdha' k'al júnake i "
+"abatnom pat'ál"
+
+#: activity.py:182
+msgid "Preparing to measure distance"
+msgstr "T'ojojnal abal ka lejban in owdha'"
+
+#: activity.py:183
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr "T'ojojodh abal kin lejbay.  Aychix abal in juntal ka k'wajiy t'ojojodh."
+
+#: activity.py:185
+msgid "Recording sound from each laptop."
+msgstr "Ts'atal an janidhtaláb ti junchik an abatnom pat'ál."
+
+#: activity.py:186
+msgid "Processing recorded audio."
+msgstr "Tsab t'ajadh ti kwentaj an janidhtaláb axi k'wajatits ts'at'adh."
+
+# sonido - janidhtaláb
+#: activity.py:188
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+"Axe' xi t'ojláb in kwa'alits tsáb i juntal t'ojnalchik, jaxtámits yabáts a "
+"ejtowal kit otsits."
+
+#: activity.py:191
+msgid "Begin Measuring Distance"
+msgstr "Ka ts'ikin ti lejbayáb an owdha'taláb"
+
+#: activity.py:192
+msgid "Stop Measuring Distance"
+msgstr "Ka pútun ti lejbayáb an owdha'taláb"
+
+# lejbaxtaláb smd
+#: activity.py:226 smoot_toolbar.py:100
+#, python-format
+#, python-format,
+msgid "Measured distance in %s"
+msgstr "Lejbadh owdha'taláb ti %s"
+
+#: activity.py:226 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:79
+#: smoot_toolbar.py:101
+msgid "meters"
+msgstr "metros"
+
+#: atm_toolbars.py:65
+msgid "Temperature (C): "
+msgstr "K'ak'em (°C): "
+
+# Humedad - molowtaláb
+#: atm_toolbars.py:70
+msgid "Relative Humidity (%): "
+msgstr "Yáb junini' an Molowtaláb (%): "
+
+#: atm_toolbars.py:75
+msgid "Speed of Sound (m/s): "
+msgstr "In adhik an janidhtaláb (m/s): "
+
+# tolmixtaláb- compensación
+# t'ójojon - calibración
+#: calibration_toolbar.py:27
+msgid "Calibration Offset (meters): "
+msgstr "Tolmixtaláb abal ka alwa' t'ójojon (metros): "
+
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
+msgid "centimeters"
+msgstr "centímetros"
+
+#. TRANS: English units of measure
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
+msgid "inches"
+msgstr "pulgadas"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
+msgid "feet"
+msgstr "pies"
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
+msgid "yards"
+msgstr "yardas"
+
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
+msgid "custom units"
+msgstr "custom units"
+
+#: smoot_toolbar.py:83
+msgid "Choose a unit of measure:"
+msgstr "Choose a unit of measure:"
+
+#: smoot_toolbar.py:86
+msgid "select units"
+msgstr "select units"
+
+#: smoot_toolbar.py:104
+msgid "%2$0.2f %1$s per meter"
+msgstr "%0.2f %s ti metro"
diff --git a/po/son.po b/po/son.po
new file mode 100644
index 0000000..a5db8f5
--- /dev/null
+++ b/po/son.po
@@ -0,0 +1,127 @@
+# 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-09 11:43-0500\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 "Distance"
+msgstr ""
+
+#: activity.py:153
+msgid "Atmosphere"
+msgstr ""
+
+#: activity.py:156
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:178
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+
+#: activity.py:180
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+
+#: activity.py:182
+msgid "Preparing to measure distance"
+msgstr ""
+
+#: activity.py:183
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr ""
+
+#: activity.py:185
+msgid "Recording sound from each laptop."
+msgstr ""
+
+#: activity.py:186
+msgid "Processing recorded audio."
+msgstr ""
+
+#: activity.py:188
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+
+#: activity.py:191
+msgid "Begin Measuring Distance"
+msgstr ""
+
+#: activity.py:192
+msgid "Stop Measuring Distance"
+msgstr ""
+
+#: activity.py:226 smoot_toolbar.py:100
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:226 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:79
+#: smoot_toolbar.py:101
+msgid "meters"
+msgstr ""
+
+#: atm_toolbars.py:65
+msgid "Temperature (C): "
+msgstr ""
+
+#: atm_toolbars.py:70
+msgid "Relative Humidity (%): "
+msgstr ""
+
+#: atm_toolbars.py:75
+msgid "Speed of Sound (m/s): "
+msgstr ""
+
+#: calibration_toolbar.py:27
+msgid "Calibration Offset (meters): "
+msgstr ""
+
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
+msgid "centimeters"
+msgstr ""
+
+#. TRANS: English units of measure
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
+msgid "inches"
+msgstr ""
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
+msgid "feet"
+msgstr ""
+
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
+msgid "yards"
+msgstr ""
+
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
+msgid "custom units"
+msgstr ""
+
+#: smoot_toolbar.py:83
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:86
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:104
+msgid "%2$0.2f %1$s per meter"
+msgstr ""