Push L10n updates

85 files changed, 2969 insertions, 3055 deletions

diff --git a/po/Distance.pot b/po/Distance.pot
index 5e99d5e..f47bce5 100644
--- a/po/Distance.pot
+++ b/po/Distance.pot
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,117 +20,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/af.po b/po/af.po
index d0d74dc..b40ca39 100644
--- a/po/af.po
+++ b/po/af.po
@@ -51,7 +51,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -65,117 +65,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ak.po b/po/ak.po
index 3dda413..cda1b5f 100644
--- a/po/ak.po
+++ b/po/ak.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -21,117 +21,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index 5d667b6..6d68897 100644
--- a/po/am.po
+++ b/po/am.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -53,117 +53,108 @@ msgstr ""
 msgid "Distance"
 msgstr "ርቀት"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 1ae825d..cc11c86 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-02-19 17:51+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -23,120 +23,111 @@ msgstr ""
 msgid "Distance"
 msgstr "المسافة"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "الجو"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "لقياس المسافة بين جهازين، عليك مشاركة هذا النشاط."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "اضغط على الزر لقياس المسافة إلى جهاز آخر"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "يستعد لقياس المسافة"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "مستعد لقياس المسافة. ينتظر استعداد الشريك."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "يسجل الصوت من كل جهاز."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "يعالج الصوت المسجل."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "شارك اثنين بالفعل في هذا النشاط لذا لا يمكنك الانضمام."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "ابدأ قياس المسافة"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "أوقف قياس المسافة"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "المسافة المقاسة بالمتر"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "درجة الحرارة (م): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "الرطوبة النسبية (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "سرعة الصوت (م\\ث): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/ayc.po b/po/ayc.po
new file mode 100644
index 0000000..48cb6e7
--- /dev/null
+++ b/po/ayc.po
@@ -0,0 +1,129 @@
+# 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: 2012-04-27 00:33-0400\n"
+"PO-Revision-Date: 2011-11-23 09:39+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\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.5\n"
+
+#  "Distancia"
+#: activity/activity.info:2
+msgid "Distance"
+msgstr "Jaya"
+
+#: activity.py:162
+msgid "Atmosphere"
+msgstr ""
+
+#: activity.py:165
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:187
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+
+#: activity.py:189
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+
+#: activity.py:191
+msgid "Preparing to measure distance"
+msgstr ""
+
+#: activity.py:192
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr ""
+
+#: activity.py:194
+msgid "Recording sound from each laptop."
+msgstr ""
+
+#: activity.py:195
+msgid "Processing recorded audio."
+msgstr ""
+
+#: activity.py:197
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+
+#: activity.py:200
+msgid "Begin Measuring Distance"
+msgstr ""
+
+#: activity.py:201
+msgid "Stop Measuring Distance"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:99
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
+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:28
+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:81
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:84
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/aym.po b/po/aym.po
index 7fe59ed..48cb6e7 100644
--- a/po/aym.po
+++ b/po/aym.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-11-23 09:39+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,117 +22,108 @@ msgstr ""
 msgid "Distance"
 msgstr "Jaya"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index ac67c39..afe82ca 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2008-01-11 14:08+0000\n"
 "Last-Translator: Alexander Todorov <atodorov@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,15 +52,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Разстояние"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Атмосфверни условия"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -68,106 +68,97 @@ msgstr ""
 "За да измерите разстоянието между два лаптопа, първо трябва да споделите "
 "това действие."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Моля, натиснете бутона, за да измерите разстоянието до друг лаптоп"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Подготвяне за измерване"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Подготвен за измерване.  Изчакване на другия партньор."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Записване на звук от всеки лаптоп."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Обработване на записания звук."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Не можете да се присъедините, т.к. вече има двама участници."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Начало на измерването"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Край на измерването"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Измерено разстояние в метри"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Температура (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Относителна влажност на въздуха (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Скорост на звука (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/bn.po b/po/bn.po
index f0f930b..c509482 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: honey VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-01-12 08:08+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "Distance"
 msgstr "দূরত্ব"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "পরিবেশ"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -69,108 +69,99 @@ msgstr ""
 "দুটি ল্যাপটপের মধ্যে দূরত্ব পরিমাপ করার জন্য আপনাকে অবশ্যই সসর্প্রথম এই "
 "কাজটি ভাগ করে নিতে হবে।"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "অন্য একটি ল্যাপটপের দূরত্ব পরিমাপের জন্য বোতামটি চাপুন"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "দূরত্ব পরিমাপের প্রস্তুতি নিচ্ছে"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "পরিমাপ নেয়ার জন্য প্রস্তুত।  সঙ্গীর প্রস্তুতির জন্য অপেক্ষা করছে।"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "প্রতিটি ল্যাপটপ থেকে শব্দ ধারণ করা হচ্ছে।"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "ধারণকৃত অডিও প্রসেস হচ্ছে।"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "এই কাজটির ইতোমধ্যেই দুইজন অংশগ্রহনকারী রয়েছে, ফলে আপনি অংশগ্রহন করতে পারবেন "
 "না।"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "দূরত্ব পরিমাপ শুরু করুন"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "দূরত্ব পরিমাপ বন্ধ করুন"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "মিটারে পরিমাপকৃত দূরত্ব"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "তাপমাত্রা (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "আপেক্ষিক আর্দ্রতা (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "শব্দের গতি (মিলিমিটার/সেকেন্ড): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index a35a645..c2c7b49 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2008-02-04 05:22-0500\n"
 "Last-Translator: Sankarshan Mukhopadhyay <sankarshan.mukhopadhyay@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,15 +52,15 @@ msgstr ""
 msgid "Distance"
 msgstr "দুরত্ব"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "বায়ুমন্ডল"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 #, fuzzy
 msgid ""
 "To measure the distance between two laptops, you must first share this "
@@ -68,107 +68,98 @@ msgid ""
 msgstr ""
 "দুটি ল্যাপটপের মধ্যে দুরত্ব নির্ণয় করার জন্য এই অ্যাক্টিভিটিটি ভাগ করতে হবে"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "অন্য ল্যাপটপের দুরত্ব মাপার জন্য বোতাম টিপুন"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "দুরত্ব মাপার প্রস্তুতি করা হচ্ছে"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "মাপ নেওয়ার জন্য প্রস্তুত পার্টনারের প্রস্তুতির অপেক্ষায়"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "প্রত্যেক ল্যাপটপ থেকে শব্দ রেকর্ড করা হচ্ছে"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 #, fuzzy
 msgid "Processing recorded audio."
 msgstr "রেকর্ড করা শব্দকে প্রসেস করা হচ্ছে"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "এই অ্যাক্টিভিটিতে আগে থেকেই দুজন আছে, তাই আপনি যোগ করতে পারবেন না"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "দুরত্ব মাপা শুরু করুন"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "দুরত্ব মাপা বন্ধ করুন"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "মিটারে দুরত্ব মাপা"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "তাপমাত্রা(C):"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "শব্দের গতি (মিটার প্রতি সেকেন্ড):"
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/bs.po b/po/bs.po
index 610ec3e..bd6bf36 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1e4f938..546cbcf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 05:02+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,117 +57,108 @@ msgstr ""
 msgid "Distance"
 msgstr "Distància"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Humitat relativa (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/cpp.po b/po/cpp.po
index 2331b46..5b2c2d0 100644
--- a/po/cpp.po
+++ b/po/cpp.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -53,117 +53,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 9391e5f..62d278b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -58,7 +58,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-11-27 15:26+0200\n"
 "Last-Translator: hombresiniestro <mkerz@me.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Abstandsmessung"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosphäre"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "Metrik anpassen"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -90,113 +90,108 @@ msgstr ""
 "Zur Messung des Abstandes zwischen zwei Laptops musst Du diese Aktivität mit "
 "jemanden gemeinsam ausführen."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 "Drücke die Schaltfläche um den Abstand zu einem anderen Laptop zu messen"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Vorbereitung der Distanzmessung"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 "Bereit zur Durchführung der Messung.  Warte auf die Bereitschaft des "
 "Partners."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Zeichne den Ton von jedem Laptop auf."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Verarbeite die aufgezeichneten Töne."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "Diese Aktivität hat bereits zwei Teilnehmer, du kannst daher nicht "
 "mitmachen."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Abstandsmessung beginnen"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Abstandsmessung stoppen"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "Gemessene Distanz in %s"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "Meter"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatur (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Relative Luftfeuchtigkeit (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Schallgeschwindigkeit (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Justierungsversatz (Meter): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "Zentimeter"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "Zoll"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "Fuß"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "Yard"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "Benutzerdefinierte Einheiten"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "Wähle eine Maßeinheit:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "Einheiten auswählen"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
 #, python-format
 #, python-format,
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %1$s pro Meter"
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %1$s pro Meter"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "Gemessene Distanz in Metern"
diff --git a/po/dz.po b/po/dz.po
index 7566816..7c2c811 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -57,117 +57,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index acab1fc..7162066 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 16:11+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,120 +49,111 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "جو"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "برای اندازه گیری فاصله میان دو لپ تاپ شما باید این کار را شریک کنید"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "دکمه را فشار دهید تا فاصله با لپ تاپ دیگر را اندازه نماید"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "درحال آماده شدن برای اندازه گیری فاصله"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "آماده برای ین اندازه گیری._ _ منتظر همکار تا آماده شود"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "در حال ثبت صدا از هر دو لپ تاپ"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "در حال تهیه صدا"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "این فعالیت قبلا دو کارمند مشترک دارد لذا شما نمیتوانید بدان پیوست شوید"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "اندازی گیری فاصله را شروع کن"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "اندازی گیری فاصله رامتوقف کن"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "فاصله اندازه گیری شد به متر"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "درجه حرارت (سانتی گراد): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "رطوبت نسبی (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "سرعت صدا (متر فی ثانیه): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index 1ccfa18..61c15ef 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2009-06-11 07:00-0400\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,120 +49,111 @@ msgstr ""
 msgid "Distance"
 msgstr "فاصله"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "آب و هوا"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "برای اندازه گیری فاصله میان دو لپ تاپ شما باید این فعالیت را شریک کنید."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "دکمه را فشار دهید تا فاصله با لپ تاپ دیگر را اندازه نماید"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "درحال آمادگی برای اندازه گیری فاصله"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "آماده برای یک اندازه گیری.  منتظر همکار، تا آماده شود."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "در حال ثبت صدا از هر دو لپ تاپ."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "در حال تهیه صدا."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "این فعالیت قبلا دو شرکت کننده دارد لذا شما نمیتوانید بدان پیوست شوید."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "اندازی گیری فاصله را شروع کن"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "اندازی گیری فاصله رامتوقف کن"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "فاصله اندازه گیری شد به متر"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "درجه حرارت (سانتی گراد): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "رطوبت نسبی (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "سرعت صدا (متر فی ثانیه): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/ff.po b/po/ff.po
index b9392b0..e93b253 100644
--- a/po/ff.po
+++ b/po/ff.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 610ec3e..bd6bf36 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/fil.po b/po/fil.po
index ffeee90..db525c1 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/gn.po b/po/gn.po
new file mode 100644
index 0000000..cda1b5f
--- /dev/null
+++ b/po/gn.po
@@ -0,0 +1,128 @@
+# 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: 2012-04-27 00:33-0400\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:162
+msgid "Atmosphere"
+msgstr ""
+
+#: activity.py:165
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:187
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+
+#: activity.py:189
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+
+#: activity.py:191
+msgid "Preparing to measure distance"
+msgstr ""
+
+#: activity.py:192
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr ""
+
+#: activity.py:194
+msgid "Recording sound from each laptop."
+msgstr ""
+
+#: activity.py:195
+msgid "Processing recorded audio."
+msgstr ""
+
+#: activity.py:197
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+
+#: activity.py:200
+msgid "Begin Measuring Distance"
+msgstr ""
+
+#: activity.py:201
+msgid "Stop Measuring Distance"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:99
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
+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:28
+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:81
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:84
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/gu.po b/po/gu.po
index b9392b0..e93b253 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ha.po b/po/ha.po
index b9392b0..e93b253 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 971054c..91ffda9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index d2f743b..fbcbe2b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: acoustic-measure-activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-10-14 04:24+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -49,120 +49,111 @@ msgstr ""
 msgid "Distance"
 msgstr "दूरी"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "वातावरण"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "दो लॅपटॉप की बीच की दूरी जानने के लिए पहले ये कार्य साझा करें."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "दूसरे लॅपटॉप की बीच की दूरी जानने के लिए यह कुंजी दबाएँ"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "दूरी मापने की तैयारी की जा रही है"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "मापने के लिए तैयार. साथी के तैयार होने का इंतज़ार किया जा रहा है."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "प्रत्येक लैपटॉप से आवाज़ रेकॉर्ड."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "रेकॉर्ड किए आवाज़ को प्रोसेस किया जा रहा है."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "इस कार्य में पहले से ही दो सहभागी है, इसलिए आप शामिल नहीं हो सकते हैं."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "दूरी मापना शुरु करें"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "दूरी नापना रोकें"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "मापी गई दूरी मीटर में"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "तापमान (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "संबन्द्धित नमी (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "आवाज़ की गति (मी/सेकेंड): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "केलिब्रेशन ऑफ़सेट (मीटर): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "सेन्टीमीटर"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "इंचेस"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/ht.po b/po/ht.po
index 54f8f12..3f34466 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 06:00+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,121 +53,112 @@ msgstr ""
 msgid "Distance"
 msgstr "Distans"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfè"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 #, fuzzy
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "Sispann mezire distans"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "peze bouton an pou mezire distans a yon lòt laptop"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Prepare pou mezire distans"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Prè pou pwan yon mezi._ Tann patnè-a pwè."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Anrejistre son nan chak laptop."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Odio anrejistreman an progrè."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Aktivite sa deja gen 2 patisipan, ou paka rantre kounye a."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Kòmanse mezire distans"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Sispann mezire distans"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Distans mezire an mèt"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Tanperati (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "imidite relatif (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "vitès son (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/hu.po b/po/hu.po
index df0c4bd..574678f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2009-12-21 22:35-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,117 +48,108 @@ msgstr ""
 msgid "Distance"
 msgstr "Távolság"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ig.po b/po/ig.po
index b9392b0..e93b253 100644
--- a/po/ig.po
+++ b/po/ig.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index b9392b0..e93b253 100644
--- a/po/is.po
+++ b/po/is.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 67bcb7e..de690a0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-14 06:30+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Distanza"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,110 +65,101 @@ msgstr ""
 "Per misurare la distanza fra due laptop, per prima cosa è necessario "
 "condividere questa Attività."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Premere il pulsante per misurare la distanza da un altro laptop"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Inizio misurazione della distanza"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 "Pronto ad effettuare una misura.  In attesa che l'altro computer sia pronto."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Registrazione di un suono da ognuno dei laptop."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Elaborazione della registrazione audio."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "Questa attività possiede già due partecipanti, quindi non è più possibile "
 "associarsi."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Inizio Misurazione Distanza"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Fine Misurazione Distanza"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Distanza misurata in %s"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 #, fuzzy
 msgid "meters"
 msgstr "metri"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Umidità Relativa (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Velocità del Suono (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Distanza di Calibrazione (metri): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/ja.po b/po/ja.po
index 68c96fc..1efe973 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-12-16 06:04+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,120 +49,111 @@ msgstr ""
 msgid "Distance"
 msgstr "距離"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "空気"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "2台のラップトップ間の距離を測定するには、まず相手とこのアクティビティを共有してください。"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "ボタンを押して、相手のラップトップとの距離を測定してください。"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "距離の測定を準備しています"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "測定の準備ができました。  相手の準備を待っています。"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "ラップトップ同士で音を録音しています。"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "録音を解析中。"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "このアクティビティはすでに2名が参加しているため、これ以上参加できません。"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "距離の測定を開始"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "距離の測定を終了"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "%s で測定された距離"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "気温(C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "湿度(%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "音速(メートル/秒): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "校正ずれ量(メートル): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/km.po b/po/km.po
index f43129c..9c9cb9f 100644
--- a/po/km.po
+++ b/po/km.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2008-12-24 01:57-0500\n"
 "Last-Translator: Noy Shoung <noy_shoung@nida.gov.kh>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,121 +20,112 @@ msgstr ""
 msgid "Distance"
 msgstr "ចំងាយ"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "បរិយាកាស"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 "អ្នក​ត្រូវ​មាន​សកម្មភាព​រួមដើម្បី​វាស់​ចំងាយ​រវាង​កុំព្យូទ័រ​យួរ​ដៃ​ទាំង​ពីរ"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "ចុច​ប៊ូតុង​​ដើម្បី​វាស់​ចំងាយ​រវាង​កុំព្យូទ័រ​យួរ​ដៃ​ដទៃ​ទៀត"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "ត្រៀម​រៀបចំ​​វាស់​ចំងាយ"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "បាន​វាស់វែង​រួចរាល​ហើយ នៅ​រង​ចាំ​ដៃ​គូ​ដែល​នឹង​រួចរាល​ដែរ"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "ថតចំលងសំឡេងពីកុំព្យូទ័រ​យួរ​ដៃនិមួយៗ"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "បានដំណើរការ​ចំឡងសំលេង"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "មាន​ពីរ​​នាក់​បាន​ចូល​រួម​សកម្មភាព​នេះ "
 "ដូច្នេះ​អ្នក​មិន​អាច​ចូល​រួម​នៅ​ពេល​នេះ​ទេ"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "ចាប់​ផ្តើម​វាស់​ចំងាយ"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "បញ្ឈប់​​វាស់​ចំងាយ"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "ការ​វាស់​ចំងាយ​ជា​ម៉ែត្រ"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "ម៉ែត្រ"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "សីតុណ្ហភាព (C)"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "ពាក់ពាន់​ទៅ​នឹង​សំណើម​ (%)"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "ល្បឿន​នៃ​សំឡេង (m/s):"
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "សង់ទីម៉ែត្រ"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "អ៊ិន្ឈ៍"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "ហ្វ៊ីតថ៍"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 610ec3e..bd6bf36 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index b9392b0..e93b253 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/kos.po b/po/kos.po
index ffeee90..db525c1 100644
--- a/po/kos.po
+++ b/po/kos.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 3dda413..cda1b5f 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -21,117 +21,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 3dda413..cda1b5f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -21,117 +21,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 610ec3e..bd6bf36 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/mg.po b/po/mg.po
index 67e8eb8..b860bc6 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-03-12 09:15+0200\n"
 "Last-Translator: Zafimamy Gabriella Ralaivao <gabriella@intnet.mu>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Halavirana"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Sosondrivotra"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,103 +65,94 @@ msgstr ""
 "Raha handrefy ny halavirana manasaraka solosaina finday roa dia tsy maintsy "
 "zarainao aloha ity Sahanasa ity. "
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Hafanana (C):"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index b3311c2..79a1244 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2007-12-17 15:29+0000\n"
 "Last-Translator: Marko Doda <mark0d0da@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,15 +53,15 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Атмосфера"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -69,106 +69,97 @@ msgstr ""
 "За да го измериш растојанието меѓу два лаптопи, мора да ја споделиш оваа "
 "Активност,"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Притисни на копчето за да го измериш растојанието до друг лаптоп"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Се подготвувам да го измерам растојанието"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Спремен сум за мерење.  Чекам партнерот да се подготви."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Снимам звук од секој лаптоп."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Обработка на снимениот звук."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Во оваа активност веќе има двајца учесници, не можеш да се приклучиш."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Почни со мерење на растојание"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Престани со мерење на растојание"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Измерено растојание во метри"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Температура (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Релативна влажност (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Брзина на звукот (м/с): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/ml.po b/po/ml.po
index b9392b0..e93b253 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 8b97d83..5245c97 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-03-06 20:57+0200\n"
 "Last-Translator: Cris Anderson <anderson861@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,15 +29,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Хоорондын зай"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Агаар мандал"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -45,104 +45,95 @@ msgstr ""
 "2 зөөврийн компьютерүүдийн хоорондох зайг хэмжхийн тулд та эхэлж энэ үйл "
 "ажиллагааг хуваалцах хэрэгтэй."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Зөөврийн компьютерүүдийн хоорондох зайг хэмжхийн тулд товчин дээр дар"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Хоорондох зайг хэмжихэд бэлдэж байна"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Хэмжилтийг хийхэд бэлэн.  Хамтрагчын бэлэн болхыг хүлээж байна."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Зөөврийн компьютер бүрээс дууг бичиж байна."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Бичигдсэн дуу бичлэгийг боловсруулж байна."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Энэ үйл ажиллагаанд хоёр орлцогчид байгаа тул та нэгдэх боломжгүй."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Хоорондох зайг хэмжиж эхлэх"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Хоорондох зайн хэмжилтийг зогсоох"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Хэмжигдсэн зай метрээр"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Темпратур (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Чийгшилтийн түвшин (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Дууны хурд (м/сек): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index 01512b6..aaa2825 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-02-06 01:40+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,15 +57,15 @@ msgstr ""
 msgid "Distance"
 msgstr "अंतर"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "वातावरण"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "मोजमापानुसार बदल"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -73,108 +73,103 @@ msgstr ""
 "दोन लॅपटॉप चे मधील अंतर मपण्यासाठी तुम्हाला प्रथम ह्या एकटीवीटी मधे भाग "
 "घ्याव लागेल."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "दुसरया लॅपटोप्क चा अंतर मापण्यासाठी बटन दाबा"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "अंतर मापण्यासाठी तयार होत आहे"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "अंतर मापण्यासाठी तयार आहे.  जोडीदार तयार होण्याची वाट पाहते."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "प्रत्येक लॅपटॉप वरुन आवज़ नोंद करत आहे."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "नोंद केलेल्या ओडिओचा संसाधन होत आहे."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "ह्या एकटीवीटी मधे पहिलेच दोन भागीदार आहे म्हणून तुम्ही सहभागी होऊ शकत नाही."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "अंतर मापण्याची सुरुआत करा"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "अंतर मापणे बंद करा"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "मापलेला अंतर %s मध्ये आहे"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "मीटर्स"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "तापमान(C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "सबंधित नमी(%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "आवाज़ाची गती(मी/से): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "अंशांत्मक समायोजन(मीटर्स) "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "सेंटिमीटर"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "इंचेस"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "फुट"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "यार्ड"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "स्वरचीत एकके"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "मोजमाप करण्यासाठीचे एकक निवडा:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "एकके निवडा"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s प्रत्येकी मिटर"
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
+#, python-format
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %(1)s प्रत्येकी मिटर"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "मापलेला अंतर मीटर मधे आहे"
diff --git a/po/ms.po b/po/ms.po
index a23f849..40a5d27 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 16:01+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Jarak"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,108 +65,99 @@ msgstr ""
 "Untuk mengukur jarak diantara dua komputer riba, anda dikehendaki berkongsi "
 "aktiviti ini terlebih dahulu."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Tekan butang untuk mengukur jarak ke komputer riba yang lain."
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Penyediaan untuk mengukur jarak"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Bersedia untuk pengukuran. Menunggu rakan untuk bersedia."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Merakam bunyi dari setiap komputer riba."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Memproses audio yang dirakam."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "Aktiviti ini telah mempunyai dua peserta dan oleh itu anda tidak boleh "
 "sertai."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Mula Pengukuran Jarak"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Berhenti Pengukuran Jarak"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Mengukur Jarak dalam Meter"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Suhu (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Kelembapan Relatif (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Kelajuan Bunyi (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Penentukuran Ofset (meter): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/mvo.po b/po/mvo.po
index 971054c..91ffda9 100644
--- a/po/mvo.po
+++ b/po/mvo.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/na.po b/po/na.po
index 971054c..91ffda9 100644
--- a/po/na.po
+++ b/po/na.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 971054c..91ffda9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index ca9f451..f41f103 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-01-09 21:40+0200\n"
 "Last-Translator: dipesh.bhattarai <dipesh.bhattarai@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,120 +49,111 @@ msgstr ""
 msgid "Distance"
 msgstr "दुरि"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "वायुमण्डल"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "दुई ल्यापटप विचको दुरी नाप्न, पहिला यो क्रियाकलाप share गर्नुहोस"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "अर्को ल्यापटपसंगको दुरी नाप्न यो बटन थिच्नुहोस"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "दुरी नाप्ने तयारी गर्दै"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "दुरी नाप्नका लागि तयार। दुरी नाप्न साथीलाइ कुर्दै।"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "प्रत्येक ल्यापटपको आवाज रेकर्ड गर्दै"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "रेकर्ड गरीएको ध्वनी प्रोसेसीङ्ग गर्दै"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "यो क्रियाकलापमा भाग लिन सकिएन, दुइ जना भन्दा बढी भयो"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "दुरी नाप्न सुरु"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "दुरी नाप्न बन्द"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "नापिएको दुरी, मिटरमा"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "तापक्रम (C):"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "सापेक्षिक आद्रता (%):"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "आवाजको गति (मिटर प्रति सेकेण्ड)॰"
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "क्यलिव्रेशन अफसेट (मिटर)"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/nn.po b/po/nn.po
index 610ec3e..bd6bf36 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index b9392b0..e93b253 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/pap.po b/po/pap.po
index b757efa..97078fc 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-02-14 18:34+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Distansia"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,98 @@ msgstr ""
 "Pa midi e distansia entre dos laptop, primeramente bo mester komparti e "
 "Aktividat."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Primi e konopi pa midi e distansia entre un otro laptop"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Preparando pa midi e distansia"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Kla pa bai midi.  Wardando pa mi kompanje ta kla."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Grabando zonido for di kada laptop."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Prosesando grabashon di audio."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "E aktividat aki ja tin dos parcitipante, pues bo no por partisipa."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Kuminsa midi e distansha"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Para di midi e distansha"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Distansha midi den meter"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
 # Uit gesproken als= persentahe relativo di humdad
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Humidad relativo (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Velocidat di Zonido (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Kontrol pa kalibrishon (m): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/pbs.po b/po/pbs.po
new file mode 100644
index 0000000..cda1b5f
--- /dev/null
+++ b/po/pbs.po
@@ -0,0 +1,128 @@
+# 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: 2012-04-27 00:33-0400\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:162
+msgid "Atmosphere"
+msgstr ""
+
+#: activity.py:165
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:187
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+
+#: activity.py:189
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+
+#: activity.py:191
+msgid "Preparing to measure distance"
+msgstr ""
+
+#: activity.py:192
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr ""
+
+#: activity.py:194
+msgid "Recording sound from each laptop."
+msgstr ""
+
+#: activity.py:195
+msgid "Processing recorded audio."
+msgstr ""
+
+#: activity.py:197
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+
+#: activity.py:200
+msgid "Begin Measuring Distance"
+msgstr ""
+
+#: activity.py:201
+msgid "Stop Measuring Distance"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:99
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
+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:28
+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:81
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:84
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/ps.po b/po/ps.po
index f176ad9..431ffc3 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-01-19 07:46+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: PASHTO <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "واټن"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "چاپېریال"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,106 +65,97 @@ msgstr ""
 "د دوو لپټاپونو تر منځ د واټن اندازه کولو لپاره، تاسې بايد لومړی دغه فعاليت "
 "شريک کړﺉ."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "تر بل لپ ټاپ د واټن اندازه کولو لپاره تڼۍ کېکاږئ"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "د واټن اندازه کولو لپاره چمتو کېږي"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "د اندازه کولو لپاره چمتو دی  د شريکباڼي د چمتو کېدنې انتظار باسي"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "له هر لپټاپه غږ ريکارډوي."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "د ريکارډ شوی صوت بهيرېدنه"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "دغه فعاليت لا د مخه دوه ګډونوال لري، نو تاسې نشﺉ يو ځای کېدلای."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "د واټن اندازه کول پيل كړئ"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "د واټن اندازه کول ودروﺉ"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "اندازه شوی واټن په مترونو"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "د تودوخې درجه (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "نسبي رطوبت (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "د آواز سرعت (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/pt.po b/po/pt.po
index 652a4e8..47b573c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-04-12 23:58+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Distância"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "Métrica personalizada"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,102 @@ msgstr ""
 "Para medir a distância entre dois portáteis, tens que primeiro partilhar "
 "esta Atividade."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Pressiona o botão para medir a distância a outro portátil"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "A preparar para medir a distância"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Pronto para fazer uma medição.  À espera que o parceiro esteja pronto."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "A gravar som de cada portátil."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "A processar som gravado."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Esta atividade já tem dois participantes, por isso não podes juntar-te."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Começar a Medir a Distância"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Parar de Medir a Distância"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "Distância medida em %s"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "metros"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Humidade Relativa (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Velocidade de Som (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Distância de calibragem (metros): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "centímetros"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "polegadas"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "pés"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "jardas"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "unidades personalizadas"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "Escolhe uma unidade de medida:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "escolhe unidades"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s por metro"
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
+#, python-format
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %(1)s por metro"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "Distância Medida em Metros"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58fc877..1328b55 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -34,30 +34,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
-"PO-Revision-Date: 2010-02-12 05:09+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
+"PO-Revision-Date: 2012-05-06 23:46+0200\n"
+"Last-Translator: alcemir <alcemir.fernandes.soares@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: pt_BR\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"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Distance"
 msgstr "Distância"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,99 @@ msgstr ""
 "Para medir a distância entre dois laptops, deve primeiro compartilhar esta "
 "Atividade."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Aperte o botão para medir a distância até outro laptop"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Preparando para medir a distância"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Pronto para fazer uma medição.  Esperando que o parceiro esteja pronto."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Gravando som de cada laptop."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Processando o áudio gravado."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Esta atividade já tem dois participantes, por isso não pode juntar-se."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Começar Medição da Distância"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Parar Medição da Distância"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Distância Medida em Metros"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
-msgstr ""
+msgstr "metros"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Umidade Relativa (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Velocidade da Som (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Calibragem (metros): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
-msgstr ""
+msgstr "centímetros"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
-msgstr ""
+msgstr "polegadas"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
-msgstr ""
+msgstr "pé"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
-msgstr ""
+msgstr "metros"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
-msgstr ""
+msgstr "unidades personalizadas"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
-msgstr ""
+msgstr "Escolha uma unidade de medida:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
-msgstr ""
+msgstr "selecionar unidades"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr ""
+#, python-format, fuzzy
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr "%(unidade)20.2m %(nome)s por metro"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "Distância Medida em Metros"
diff --git a/po/quy.po b/po/quy.po
new file mode 100644
index 0000000..14e80f0
--- /dev/null
+++ b/po/quy.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.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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:162
+msgid "Atmosphere"
+msgstr ""
+
+#: activity.py:165
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:187
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+
+#: activity.py:189
+msgid "Press the button to measure the distance to another laptop"
+msgstr ""
+
+#: activity.py:191
+msgid "Preparing to measure distance"
+msgstr ""
+
+#: activity.py:192
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr ""
+
+#: activity.py:194
+msgid "Recording sound from each laptop."
+msgstr ""
+
+#: activity.py:195
+msgid "Processing recorded audio."
+msgstr ""
+
+#: activity.py:197
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+
+#: activity.py:200
+msgid "Begin Measuring Distance"
+msgstr ""
+
+#: activity.py:201
+msgid "Stop Measuring Distance"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:99
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
+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:28
+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:81
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:84
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/ro.po b/po/ro.po
index b9392b0..e93b253 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 7ca7e1e..e988f43 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2008-09-19 11:11-0400\n"
 "Last-Translator: Kirill Krinkin <homebox@pisem.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Расстояние"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Атмосфера"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -66,108 +66,99 @@ msgstr ""
 "Чтобы измерить расстояние между двумя компьютерами, надо сначала разрешить "
 "совместное использование этой Активности."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Нажмите клавишу, чтобы замерить расстояние между компьютерами"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Подготовка к измерению расстояния"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Готов произвести замер. Жду готовности партнера."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Записываю звуки с обоих компьютеров."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Обрабатываю записанный звук."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "Двое участников уже заняты этой Активностью, поэтому вы не можете "
 "просоединиться."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Начать мерить расстояние"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Остановить измерение расстояния"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Замеренное расстояние в метрах"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Температура (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Относительная влажность (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Скорость звука (м/с): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/rw.po b/po/rw.po
index 4827746..e0165a7 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-03-30 07:26+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Intera"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Ikirere"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,102 @@ msgstr ""
 "Kugirango upime uburebure burihagati ya mudasobwa ebyiri ugomba kubanza "
 "gusangira ikigikorwa."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Kanda akabuto kugirango upime uburebure bwo kuyindi mudasobwa"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Kwitegura gupima uburebure/intera"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Kwitegura gukora igipimo.  Tegereza mugenzi wawekugirango yitunganye."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Gufata amajwi aturutse muri buri mudasobwa."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Kugumagufata isohoramajwi."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Ik igikorwa akakanya gifite abitabiriye babiri,none ntagob wakwivanga."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Tangira upime uburebure"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Hagarika gupima intera"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Gupima uburebure muri metero"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "metero"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Igipimo cy`ubushyuhe/ubukonje (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Ubukonje bufitanye isano (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Umuvuduko w`ijwi(m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Ibipimo bitaregeye neza (metero): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "gukwira"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "amayabo"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "Hitamo umubare wogupimiraho"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "Hitamo imibare"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s kuri metero"
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
+#, python-format
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %(1)s kuri metero"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "Gupima uburebure muri metero"
diff --git a/po/sd.po b/po/sd.po
index 2331b46..5b2c2d0 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -53,117 +53,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 008f8b9..49c7307 100644
--- a/po/si.po
+++ b/po/si.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: acoustic-measure-activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 16:24+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Sinhalese <en@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "දුර"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "වටපිටාව"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,98 @@ msgstr ""
 "ලැප්ටොප් දෙකක් අතර දුර මැනීමට නම් ප්‍රථමයෙන් ඔබ මෙම ක්‍රියාකාරකම බෙදාගත "
 "යුතුය."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "වෙනත් ලැප්ටොපයක් වෙතට දුර මැනීම සඳහා මෙම බොත්තම ඔබන්න"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "දුර මැනිමට සැරසේ"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "මිනුමක් ගැනීමට සූදානම්.  හවුල්කරුවාද සූදානම් වනතෙක් සිටී."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "සෑම ලැප්ටොප් එකකින්ම පටිගත කිරීම."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "පටිගත කළ නාදය සැකසේ."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "මෙම ක්‍රියාකාරකමට දැනටමත් දෙදෙනෙක් සහභාගී වේ. එම නිසා ඔබට සම්බන්ධ විය නොහැක."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "දුර මැනීම අරඹන්න"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "දුර මැනීම නවත්වන්න"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "මනින ලද දුර මීටර වලින්මීටර"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "උණුසුම (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "සාපේක්ෂ ආර්ද්‍රතාව (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "ශබ්දයේ වේගය (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/sk.po b/po/sk.po
index 2a28305..215ecb8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr "Vzdialenosť"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 5557934..30347f4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-02-07 05:21+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Razdalja"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Podatki o vremenu"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -66,106 +66,97 @@ msgstr ""
 "Za izmero razdalje med dvema prenosnikoma mora biti ta aktivnost najprej v "
 "skupni rabi."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Za izmero razdalje do drugega prenosnika pritisni na gumb"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Priprava na izmero razdalje"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Pripravljen za izmero. Čakanje na odziv partnerja."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Snemanje zvoka iz vsakega prenosnika."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Obdelava posnetega zvoka."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Ta aktivnost že ima dva uporabnika zato se ne morete pridružiti."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Začni meriti razdaljo"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Prenehaj meriti razdaljo"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Izmerjena razdalja v metrih"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Relativna vlažnost (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Hitrost zvoka (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/sm.po b/po/sm.po
index ad6d596..ad09534 100644
--- a/po/sm.po
+++ b/po/sm.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-07-23 11:27+0200\n"
 "Last-Translator: Tabitha <tabitha.roder@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,117 +36,108 @@ msgstr ""
 msgid "Distance"
 msgstr "mamao"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/son.po b/po/son.po
index 4fd45ee..b1a5750 100644
--- a/po/son.po
+++ b/po/son.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-03-06 03:57+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,117 +22,108 @@ msgstr ""
 msgid "Distance"
 msgstr "Mooray"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index ecb5ff4..f86991f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-01-19 03:41+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,15 +57,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Largësia"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfera"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -73,107 +73,98 @@ msgstr ""
 "Për të matur distancën midis dy laptopëve, ju duhet së pari të ndani këtë "
 "aktivitet."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Shtypni butonin për të matur distancën te një laptop tjetër"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Përgatitja për të matur distancën"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Gati për të bërë një matje.  Pritje për partnerin të jetë gati."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Duke inçizuar tingujg nga secili laptop."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Duke përpunuar audion e regjistruar."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "Ky aktivitet tashmë ka dy pjesëmarrës, kështu që ju nuk mund të bashkoheni."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Filloni Matja e Distance"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Ndajo Matja e Distance"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Matja e largësia me metra"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatura (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Lageshtia relative (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Shpejtësinë e Zërit (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Kalibrimi kompensuar (m): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/sr.po b/po/sr.po
index 45a41bc..992853d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-02-16 07:44+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,15 +42,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Растојање"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Атмосвера"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "Прилагођени метрички"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -58,103 +58,98 @@ msgstr ""
 "Да бисте измерили растојање између два лаптопа, прво морате да делите ову "
 "активност."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Притисните дугме да би измери удаљеност до другог лаптопа"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Припрема за мерење растојања"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Спреман да направи мерење.  Чека се партнер да буде спреман."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Снимање звука из сваког лаптопа."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Обрада снимљеног звука."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Ова активност већ има два учесника, тако да не можеш да се придружиш."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Почните мерење дужине"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Заустави мерење дужина"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr "Измерено растојање у %s-ма"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "метри"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Температура (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Релативна влажност (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Брзина звука (м / с): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Подешавање иступа (метри): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "центимери"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "инчи"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "стопа"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "јарди"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "прилагођене јединице"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "Изаберите јединицу мере:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "изаберите јединице"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s с по метру"
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
+#, python-format
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %(1)s с по метру"
diff --git a/po/st.po b/po/st.po
index 610ec3e..bd6bf36 100644
--- a/po/st.po
+++ b/po/st.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -25,117 +25,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 9565c35..fb59f11 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2010-02-12 06:15+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Avstånd"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfär"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,107 +65,98 @@ msgstr ""
 "För att kunna mäta avståndet mellan två datorer måste du först dela ut den "
 "här aktiviteten."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Tryck på knappen för att mäta avståndet till en annan dator"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Förbereder för avståndsmätning"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 "Beredd att göra en mätning.  Väntar på att den andra datorn ska bli beredd."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Spelar in ljudet från varje dator."
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Analyserar det inspelade ljudet."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Denna aktivitet har redan två medlemmar, så du kan inte gå med i den."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Börja avståndsmätning"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Avsluta avståndsmätning"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Uppmätt avstånd i meter"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Temperatur (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Relativ luftfuktighet (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Ljudhastigheten (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "Kompensation för kalibrering (meter): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/sw.po b/po/sw.po
index 8858493..468ac23 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -42,7 +42,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 16:32+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,118 +57,109 @@ msgstr ""
 msgid "Distance"
 msgstr "umbali"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "anga"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "kupima umbali katika tarakilishi mbili, unapashwa kuanza na matendo"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Finya batone kupima umbali ya tarakilishi ingine"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "tayarisha kupima umbali"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "tayari ku tiya umbali>>>>kuchunga wengine wakuwe tayari"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Kutwala sauti kwenye kila tarakilishi"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Processing kumbukumbu audio"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "hizi michezo tayari hina washiriki wa wili, hivyo uweza ku unga"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Anza kupima umbali"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "acha kupima umbali"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Kipimo Umbali katika mita"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "kipimo ya hali ya hanga"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Uzito Unyevu(%) "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "mbio ya sauti "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "kukabiliana Calibration (mita) "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 68f70df..4b52ab7 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2012-03-10 16:40+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,15 +41,15 @@ msgstr ""
 msgid "Distance"
 msgstr "தூரம்"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "காலநிலை"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "வகுக்க இயலும் அளவு"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -57,110 +57,105 @@ msgstr ""
 "இரண்டு மடிக்கணணிகளுக்கிடையிலுள்ள தூரத்தை அளப்பதற்கு, முதலில் இந்தச் "
 "செயற்பாட்டை பகிர வேண்டும்"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "அடுத்த மடிக்கணணிக்கிடையிலுள்ள தூரத்தை அளப்பதற்கு, பொத்தானை அளக்கவும்"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "தூரத்தை அளப்பதற்கு தயாராகின்றது"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "தூரத்தை அளப்பதற்கு தயார்.   பங்காளி தயாராவதற்கு காத்திருக்கிறது"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "ஒவ்வொரு மடிக்கணணியின் சத்தத்தையும் பதிவு செய்கிறது"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "பதியப்பட்ட ஒலியை செயற்படுத்துகிறது"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "இந்தச் செயற்பாட்டில் ஏற்கனவே இருவர் பங்கு பற்றுகின்றனர், ஆகவே உம்மால் இணைய "
 "முடியாது"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "தூரத்தை அளப்பதற்கு ஆரம்பி"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "தூரத்தை அளப்பதை நிறுத்து"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "தூரமானது %s யில் அளக்கப்பட்டது"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "மீட்டர்"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "வெப்பநிலை (செல்சியஸ்): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "ஒப்பீட்டளவு ஈரப்பதன் (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "ஒலியின் வேகம் (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "திறமையான அச்சீடு(மீட்டர்கள்): "
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "சென்டிமீட்டர்"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "இன்ச்"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "அடி"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "யார்ட்ஸ்"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "வகுக்கக்கூடிய அளவுகள்"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "அலகளில் அளக்கப்பட்டதை தெரிவுசெய்:"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "தெரிவு செய்த அலகுகள்"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
+
 #, python-format
 #, python-format,
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s ஒரு மீட்டருக்கு"
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "%(20.2)f %(1)s ஒரு மீட்டருக்கு"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "மீற்றர்களில் அளந்த தூரம்"
diff --git a/po/te.po b/po/te.po
index bb4c72d..c07aebf 100644
--- a/po/te.po
+++ b/po/te.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2008-07-05 06:57+0100\n"
 "Last-Translator: Satyanarayana Murthy Saladi <saladism@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,15 +48,15 @@ msgstr ""
 msgid "Distance"
 msgstr "దూరం"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "ఆకాశము"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -64,106 +64,97 @@ msgstr ""
 "రెండు లేప్ టాప్ లమద్య దూరంకొలవడానికిముందు మీరు ఈ వ్యాపకమును పంచుకోవలిన అవసరం "
 "ఉంది."
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "రెండు లేప్ టాప్ లమద్య దూరంకొలవడానికి మీట నొక్కండి"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "దూరంకొలవడానికి తయారవుతుంది"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "దూరంకొలవడానికి తయారవుగాఉంది. జతగాడి తయారుకై ఎదురుచూస్తుంది."
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "ప్రతీ లేప్ టాప్ లనుంచీ శబ్దమును రికార్డు చేస్తుంది"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "రికార్డు చేసిన శబ్దమును విశ్లేషిస్తుంది."
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "ఈ వ్యాపకంలో ఇప్పటికే ఇద్దరు పాల్గొన్నారు. అందువలన మీరు పాల్గోలేరు."
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "దూరంకొలత మొదలుపెట్టు"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "దూరంకొలత ఆపు"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "కొలిచిన దూరం, మీటరులలో"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "ఉష్ణో్గ్రత (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "సాపేక్ష తేమ (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "ధ్వని వేగము (మీటరు/సెకను): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/th.po b/po/th.po
index d794bdd..9f74553 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2,171 +2,127 @@
 # 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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-09-26 20:33+0000\n"
-"PO-Revision-Date: 2012-03-08 11:09+0200\n"
-"Last-Translator: Meechai <malaku38@hotmail.com>\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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-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"
+"X-Generator: Translate Toolkit 1.7.0\n"
 
 #: activity/activity.info:2
 msgid "Distance"
-msgstr "ระยะห่าง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
-msgstr "บรรยากาศ"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
-msgstr "กำหนดตัวชี้วัด"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
-msgstr "ในการวัดระยะระหว่างเครื่อง 2 เครื่องคุณต้องแบ่งปันกิจกรรมนี้ก่อน"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
-msgstr "กดปุ่มเพื่อวัดระยะห่างกับอีกเครื่อง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
-msgstr "กำลังเตรียมวัดระยะทาง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
-msgstr "พร้อมจะวัดระยะแล้ว  กำลังรอเพื่อนให้พร้อม"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
-msgstr "กำลังบันทึกเสียงจากแต่ละเครื่อง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
-msgstr "กำลังประมวลผลเสียงที่บันทึก"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
-msgstr "กิจกรรมนี้มีผู้เข้าร่วม 2 คนแล้ว ดังนั้นคุณไม่สามารถเข้าร่วมได้"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
-msgstr "เริ่มวัดระยะทาง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
-msgstr "หยุดวัดระยะทาง"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
-#, python-format,
 msgid "Measured distance in %s"
-msgstr "ระยะทางที่วัดได้เป็น %s"
+msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
-msgstr "เมตร"
+msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
-msgstr "อุณหภูมิ (C): "
+msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
-msgstr "ความชื้นสัมพัทธ์ (%): "
+msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
-msgstr "ความเร็วของเสียง (เมตร/วินาที): "
+msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
-msgstr "การเทียบมาตรฐาน (เมตร): "
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
-msgstr "เซนติเมตร"
+msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
-msgstr "นิ้ว"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
-msgstr "ฟุต"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
-msgstr "หลา"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
-msgstr "กำหนดหน่วยวัด"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
-msgstr "เลือกหน่วยของการวัด:"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
-msgstr "เลือกหน่วยวัด"
+msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
-msgstr "%(20.2)f %(1)s ต่อ เมตร"
-
-#~ msgid "Measured Distance in Meters"
-#~ msgstr "ระยะทางที่วัดได้เป็นเมตร"
-
-#~ msgid "Acoustic Tape Measure"
-#~ msgstr "เทปเสียงวัดระยะ"
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/to.po b/po/to.po
new file mode 100644
index 0000000..3e58311
--- /dev/null
+++ b/po/to.po
@@ -0,0 +1,132 @@
+# 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: 2012-04-27 00:33-0400\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 "Mama'o"
+
+#: activity.py:162
+msgid "Atmosphere"
+msgstr "'Etimosifia"
+
+#: activity.py:165
+msgid "Custom metric"
+msgstr ""
+
+#: activity.py:187
+msgid ""
+"To measure the distance between two laptops, you must first share this "
+"Activity."
+msgstr ""
+"Ke fua e mama'o'oha ongo lepitopu, kuopau keke tomu'a vahevahe atu e "
+"'Ekitiviti ko 'eni."
+
+#: activity.py:189
+msgid "Press the button to measure the distance to another laptop"
+msgstr "Lomi'i e patoni ke fua e mama'o ki ha toe lepitopu kehe"
+
+#: activity.py:191
+msgid "Preparing to measure distance"
+msgstr "Teuteu ke fua e  va mama'o"
+
+#: activity.py:192
+msgid "Ready to make a measurement.  Waiting for partner to be ready."
+msgstr "Mateuteu ke fakahoko hono fua Fakatatali ke maau e hoa."
+
+#: activity.py:194
+msgid "Recording sound from each laptop."
+msgstr "Lolotonga lekooti e ngaahi ongo meihe ngaahi lepitopu."
+
+#: activity.py:195
+msgid "Processing recorded audio."
+msgstr "Lolotonga poloosesi e audio ne lekooti."
+
+#: activity.py:197
+msgid "This activity already has two participants, so you cannot join."
+msgstr ""
+"Kuo 'osi kau mai e tokoua ia kihe 'ekitiviti ko 'eni, ko ia ai 'oku 'ikai "
+"teke lava koe 'o kau mai."
+
+#: activity.py:200
+msgid "Begin Measuring Distance"
+msgstr "Kamata hono Fua e Mama'o"
+
+#: activity.py:201
+msgid "Stop Measuring Distance"
+msgstr "Ta'ofi hono fua e Mama'o"
+
+#: activity.py:235 smoot_toolbar.py:99
+#, python-format
+msgid "Measured distance in %s"
+msgstr ""
+
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
+msgid "meters"
+msgstr ""
+
+#: atm_toolbars.py:65
+msgid "Temperature (C): "
+msgstr "Fuamafana (C): "
+
+#: atm_toolbars.py:70
+msgid "Relative Humidity (%): "
+msgstr ""
+
+#: atm_toolbars.py:75
+msgid "Speed of Sound (m/s): "
+msgstr "Koe vave pe oma 'oe Ongo (m/s): "
+
+#: calibration_toolbar.py:28
+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:81
+msgid "Choose a unit of measure:"
+msgstr ""
+
+#: smoot_toolbar.py:84
+msgid "select units"
+msgstr ""
+
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 48e23da..2c731ae 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
 "PO-Revision-Date: 2011-08-10 16:44+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "Mesafe"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "Atmosfer"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,106 +65,97 @@ msgstr ""
 "İki laptop arasındaki mesafeyi ölçmek için, önce bu aktiviteyi paylaşmanız "
 "gerekir"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "Diğer laptopla olan uzaklığı hesaplamak için butona bas"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "Mesafeyi hesaplamak için hazırlanıyor"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "Ölçüm yapmak için hazır, diğer bilgisayarın hazır olmasını bekliyor"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "Her laptoptan ses kaydediyor"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "Kaydedilmiş sesleri yürütüyor"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "Aktivite zaten iki katılımcıya sahip, siz katılamazsınız"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "Mesafeyi ölçmeye başla"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "Mesafeyi ölçmeyi durdur"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "Metreler arası ölçülen mesafe"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "Sıcaklık"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "Bağıl nem (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "Ses hızı (m/s): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
 #~ msgid "Measured Distance in Meters"
diff --git a/po/tyv.po b/po/tyv.po
index 3dda413..cda1b5f 100644
--- a/po/tyv.po
+++ b/po/tyv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -21,117 +21,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/tzm.po b/po/tzm.po
index 3dda413..cda1b5f 100644
--- a/po/tzm.po
+++ b/po/tzm.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -21,117 +21,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/tzo.po b/po/tzo.po
index 9d4ce8f..ae3ab52 100644
--- a/po/tzo.po
+++ b/po/tzo.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -53,117 +53,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 971054c..91ffda9 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 67bdfec..f3a985c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -41,117 +41,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 89496b9..a549380 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
-"PO-Revision-Date: 2012-04-15 05:04+0200\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
+"PO-Revision-Date: 2012-05-19 06:26+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,15 +49,15 @@ msgstr ""
 msgid "Distance"
 msgstr "فاصلہ"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "ماحول"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
@@ -65,113 +65,101 @@ msgstr ""
 "دو ليپ ٹاپ کے درميان فاصلے کو ناپنے کے ليے آپ کو پہلے اس سرگرمی کو شئير کرنا "
 "پڑے گا۔"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "کسی اور لیپ ٹاپ تک فاصلہ ناپنے کے ليے بٹن دبائيں"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "فاصلہ ناپنے کے ليے تيار ہو رہا ہے"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "ناپ لینے کے لیے تیار-   ساتھی کے تيار ہونے کا انتظار کر رہا ہے۔"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "ہر ليپ ٹاپ سے آواز ريکارڑ کر رہا ہے"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "ريکارڑ کیا گیا آڈیو پروسس کر رہا ہے۔"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 "اس سرگرمی ميں پہلے سے ہی دو لوگ حصہ لے رہے ہيں، اس لیے آپ شريک نہيں ہو سکتے۔"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "فاصلہ ناپنا شروع کریں"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "فاصلہ ناپنا روک دیں"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format, fuzzy
 msgid "Measured distance in %s"
 msgstr "ناپا ہوا فاصلہ، ميٹر ميں"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "حرارت (C): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "نسبتی نمی (%): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "آواز کی رفتار (میٹر فی سیکنڈ): "
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 #, fuzzy
 msgid "centimeters"
 msgstr "سینٹی میٹر"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 #, fuzzy
 msgid "inches"
 msgstr "انچ"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
 
-#~ msgid "Measured Distance in Meters"
-#~ msgstr "ناپا ہوا فاصلہ، ميٹر ميں"
-
 #~ msgid "Acoustic Tape Measure"
 #~ msgstr "اکائوسٹک ٹیپ پیمائش"
diff --git a/po/wa.po b/po/wa.po
index 971054c..91ffda9 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -49,117 +49,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/yo.po b/po/yo.po
index f995f46..f9e67e5 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -53,117 +53,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d8debfb..12cd9a6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\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"
@@ -29,117 +29,108 @@ msgstr ""
 msgid "Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 msgid "Measured distance in %s"
 msgstr ""
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr ""
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr ""
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
 #, python-format
-msgid "%(20.2)f %(1)s per meter"
+msgid "%(unit)20.2f %(name)s per meter"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7fd9a86..cd764a9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Acoustic-measure-activity\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-26 20:33+0000\n"
-"PO-Revision-Date: 2011-11-08 19:25+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2012-04-27 00:33-0400\n"
+"PO-Revision-Date: 2012-05-19 16:26+0200\n"
+"Last-Translator: Yuan <yuanchao@gmail.com>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,122 +49,117 @@ msgstr ""
 msgid "Distance"
 msgstr "距離"
 
-#: /home/rafael/Activities/distance/activity.py:154
+#: activity.py:162
 msgid "Atmosphere"
 msgstr "大氣壓力"
 
-#: /home/rafael/Activities/distance/activity.py:157
+#: activity.py:165
 msgid "Custom metric"
 msgstr "自訂公制"
 
-#: /home/rafael/Activities/distance/activity.py:179
+#: activity.py:187
 msgid ""
 "To measure the distance between two laptops, you must first share this "
 "Activity."
 msgstr "請先分享本活動來測量兩台XO之間的距離"
 
-#: /home/rafael/Activities/distance/activity.py:181
+#: activity.py:189
 msgid "Press the button to measure the distance to another laptop"
 msgstr "按下螢幕上的按鈕來測量到另一台XO的距離"
 
-#: /home/rafael/Activities/distance/activity.py:183
+#: activity.py:191
 msgid "Preparing to measure distance"
 msgstr "預備開始測量距離中"
 
-#: /home/rafael/Activities/distance/activity.py:184
+#: activity.py:192
 msgid "Ready to make a measurement.  Waiting for partner to be ready."
 msgstr "準備好開始量測了。 等待好友準備中。"
 
-#: /home/rafael/Activities/distance/activity.py:186
+#: activity.py:194
 msgid "Recording sound from each laptop."
 msgstr "收錄來自其他XO的聲音中。"
 
-#: /home/rafael/Activities/distance/activity.py:187
+#: activity.py:195
 msgid "Processing recorded audio."
 msgstr "分析錄製的聲音中。"
 
-#: /home/rafael/Activities/distance/activity.py:189
+#: activity.py:197
 msgid "This activity already has two participants, so you cannot join."
 msgstr "這個活動已經有兩個人了，無法加入。"
 
-#: /home/rafael/Activities/distance/activity.py:192
+#: activity.py:200
 msgid "Begin Measuring Distance"
 msgstr "開始量測距離"
 
-#: /home/rafael/Activities/distance/activity.py:193
+#: activity.py:201
 msgid "Stop Measuring Distance"
 msgstr "停止量測距離"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:100
+#: activity.py:235 smoot_toolbar.py:99
 #, python-format
 #, python-format,
 msgid "Measured distance in %s"
 msgstr "量測的距離單位為 %s"
 
-#: /home/rafael/Activities/distance/activity.py:227
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:34
-#: /home/rafael/Activities/distance/smoot_toolbar.py:79
-#: /home/rafael/Activities/distance/smoot_toolbar.py:101
+#: activity.py:235 smoot_toolbar.py:30 smoot_toolbar.py:34 smoot_toolbar.py:77
+#: smoot_toolbar.py:100
 msgid "meters"
 msgstr "公尺"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:65
+#: atm_toolbars.py:65
 msgid "Temperature (C): "
 msgstr "溫度 (℃): "
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:70
+#: atm_toolbars.py:70
 msgid "Relative Humidity (%): "
 msgstr "相對溼度 (％):"
 
-#: /home/rafael/Activities/distance/atm_toolbars.py:75
+#: atm_toolbars.py:75
 msgid "Speed of Sound (m/s): "
 msgstr "音速 (公尺/秒):"
 
-#: /home/rafael/Activities/distance/calibration_toolbar.py:28
+#: calibration_toolbar.py:28
 msgid "Calibration Offset (meters): "
 msgstr "偏移修正 (公尺):"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:30
-#: /home/rafael/Activities/distance/smoot_toolbar.py:35
+#: smoot_toolbar.py:30 smoot_toolbar.py:35
 msgid "centimeters"
 msgstr "公分"
 
 #. TRANS: English units of measure
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:36
+#: smoot_toolbar.py:32 smoot_toolbar.py:36
 msgid "inches"
 msgstr "英吋"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:37
+#: smoot_toolbar.py:32 smoot_toolbar.py:37
 msgid "feet"
 msgstr "英呎"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:32
-#: /home/rafael/Activities/distance/smoot_toolbar.py:38
+#: smoot_toolbar.py:32 smoot_toolbar.py:38
 msgid "yards"
 msgstr "英碼"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:33
-#: /home/rafael/Activities/distance/smoot_toolbar.py:39
+#: smoot_toolbar.py:33 smoot_toolbar.py:39
 msgid "custom units"
 msgstr "自訂單位"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:83
+#: smoot_toolbar.py:81
 msgid "Choose a unit of measure:"
 msgstr "選擇量測單位"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:86
+#: smoot_toolbar.py:84
 msgid "select units"
 msgstr "選擇單位"
 
-#: /home/rafael/Activities/distance/smoot_toolbar.py:104
+#: smoot_toolbar.py:103
+#, python-format
+msgid "%(unit)20.2f %(name)s per meter"
+msgstr "每公尺 %(unit)20.2f %(name)s"
+
 #, python-format
 #, python-format,
-msgid "%(20.2)f %(1)s per meter"
-msgstr "每公尺 %(20.2)f %(1)s"
+#~ msgid "%(20.2)f %(1)s per meter"
+#~ msgstr "每公尺 %(20.2)f %(1)s"
 
 #~ msgid "Measured Distance in Meters"
 #~ msgstr "量測的距離以公尺為單位"