Merge branch 'master' of git.sugarlabs.org:measure/mainline

6 files changed, 1047 insertions, 361 deletions

diff --git a/po/es.po b/po/es.po
index 0e3f190..2cc0468 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-04 00:32-0400\n"
-"PO-Revision-Date: 2013-07-06 14:35+0200\n"
+"PO-Revision-Date: 2013-12-03 03:07+0200\n"
 "Last-Translator: AlanJAS <alanjas@hotmail.com>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -225,17 +225,14 @@ msgid "Voltage Sensor"
 msgstr "Sensor de voltaje"
 
 #: sensor_toolbar.py:131
-#, fuzzy
 msgid "Select logging interval"
 msgstr "Seleccionar intervalo de registro"
 
 #: sensor_toolbar.py:139
-#, fuzzy
 msgid "Start logging"
 msgstr "Comenzar a registrar"
 
 #: sensor_toolbar.py:147
-#, fuzzy
 msgid "Trigger"
 msgstr "Disparador"
 
diff --git a/po/nah.po b/po/nah.po
index effcba2..8c1feea 100644
--- a/po/nah.po
+++ b/po/nah.po
@@ -2,92 +2,103 @@
 # 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-06-26 00:31-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-07-04 00:32-0400\n"
+"PO-Revision-Date: 2013-11-17 22:06+0200\n"
+"Last-Translator: usuarionahuatl02 <proyecto.olpc@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: nah\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "Measure"
 msgstr ""
 
-#: config.py:75
-msgid "Guitar"
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "oscilloscope program for visualizing microphone input"
 msgstr ""
 
-#: config.py:76
+#: config.py:76 sensor_toolbar.py:155 tuning_toolbar.py:225
+msgid "None"
+msgstr "Ionse"
+
+#: config.py:77
+msgid "Guitar"
+msgstr "Tlatsotsonketl"
+
+#: config.py:78
 msgid "Violin"
 msgstr ""
 
-#: config.py:77
+#: config.py:79
 msgid "Viola"
 msgstr ""
 
-#: config.py:78
+#: config.py:80
 msgid "Cello"
 msgstr ""
 
-#: config.py:79
+#: config.py:81
 msgid "Bass"
 msgstr ""
 
-#: config.py:80
+#. TRANS: a small Andean stringed instrument of the lute family
+#: config.py:83
 msgid "Charango"
 msgstr ""
 
-#: config.py:81
+#. TRANS: a small string instrument (also called machimbo)
+#: config.py:85
 msgid "Cavaquinho"
 msgstr ""
 
-#: config.py:82
+#: config.py:86
 msgid "Ukulele"
 msgstr ""
 
-#: config.py:83
+#: config.py:87
 msgid "Sitar"
 msgstr ""
 
-#: config.py:85
+#: config.py:89
 msgid "Mandolin"
 msgstr ""
 
-#: config.py:86
+#: config.py:90
 msgid "Recorder"
 msgstr ""
 
-#: journal.py:42 sensor_toolbar.py:52 sensor_toolbar.py:90
+#: journal.py:42 sensor_toolbar.py:57 sensor_toolbar.py:95
 msgid "Sound"
-msgstr ""
+msgstr "Kakistli"
 
-#: journal.py:43 sensor_toolbar.py:53
+#: journal.py:43 sensor_toolbar.py:58
 msgid "Ohms"
-msgstr ""
+msgstr "Ohms"
 
-#: journal.py:44 sensor_toolbar.py:54
+#: journal.py:44 sensor_toolbar.py:59
 msgid "Volts"
-msgstr ""
+msgstr "Voltios"
 
-#: journal.py:45 sensor_toolbar.py:62
+#: journal.py:45 sensor_toolbar.py:67
 msgid "Hz"
-msgstr ""
+msgstr "Hz"
 
-#: journal.py:59 measure.py:406
+#: journal.py:59 measure.py:393
 msgid "Session"
 msgstr ""
 
 #: journal.py:61
 msgid "User"
-msgstr ""
+msgstr "Tlatekiujketl"
 
 #: journal.py:62
 msgid "Mode"
@@ -95,7 +106,7 @@ msgstr ""
 
 #: journal.py:64
 msgid "Date"
-msgstr ""
+msgstr "Tonalpouali"
 
 #: journal.py:66
 msgid "Interval"
@@ -109,141 +120,137 @@ msgstr ""
 msgid "Waveform"
 msgstr ""
 
-#: measure.py:216 measure.py:235
+#: measure.py:190
 msgid "Sensors"
 msgstr ""
 
 #. TRANS: Tuning insruments
-#: measure.py:223 measure.py:237
+#: measure.py:197
 msgid "Tuning"
-msgstr ""
+msgstr "Tlakuajchiuali"
 
-#: measure.py:229 measure.py:238
+#: measure.py:203
 msgid "Add instrument"
 msgstr ""
 
-#: measure.py:240
-msgid "Controls"
-msgstr ""
-
-#: measure.py:248 measure.py:281 measure.py:446 sensor_toolbar.py:55
+#: measure.py:221 measure.py:433 sensor_toolbar.py:60
 msgid "Time Base"
-msgstr ""
+msgstr "Uasankayotl tlen tonalpoualli"
 
-#: measure.py:255 measure.py:293 measure.py:430
+#: measure.py:235 measure.py:417
 msgid "Freeze the display"
 msgstr ""
 
-#: measure.py:260 measure.py:298
+#: measure.py:241
 msgid "Capture sample now"
 msgstr ""
 
-#: measure.py:270
+#: measure.py:253
 msgid "<Ctrl>Q"
-msgstr ""
+msgstr "<Ctrl>Q"
 
-#: measure.py:393
+#: measure.py:380
 msgid "Measure Log"
 msgstr ""
 
-#: measure.py:425
+#: measure.py:412
 msgid "Unfreeze the display"
 msgstr ""
 
-#: measure.py:450 sensor_toolbar.py:56
+#: measure.py:437 sensor_toolbar.py:61
 msgid "Frequency Base"
 msgstr ""
 
-#: sensor_toolbar.py:47
-msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
+#: sensor_toolbar.py:35
+msgid "1/10 second"
 msgstr ""
 
-#: sensor_toolbar.py:50
-msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
+#: sensor_toolbar.py:35 sensor_toolbar.py:209
+msgid "1 second"
 msgstr ""
 
-#: sensor_toolbar.py:53
-msgid "Resistance"
+#: sensor_toolbar.py:36
+msgid "30 seconds"
 msgstr ""
 
-#: sensor_toolbar.py:54
-msgid "Voltage"
+#: sensor_toolbar.py:36
+msgid "5 minutes"
 msgstr ""
 
-#: sensor_toolbar.py:57 toolbar_side.py:51
-msgid "Invert"
+#: sensor_toolbar.py:37
+msgid "30 minutes"
 msgstr ""
 
-#: sensor_toolbar.py:58
-#, python-format
-msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
+#: sensor_toolbar.py:52
+msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
 msgstr ""
 
-#: sensor_toolbar.py:60
-msgid "ms"
+#: sensor_toolbar.py:55
+msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
 msgstr ""
 
-#: sensor_toolbar.py:100
-msgid "Resistance Sensor"
+#: sensor_toolbar.py:58
+msgid "Resistance"
 msgstr ""
 
-#: sensor_toolbar.py:110
-msgid "Voltage Sensor"
+#: sensor_toolbar.py:59
+msgid "Voltage"
 msgstr ""
 
-#: sensor_toolbar.py:120
-msgid "1/10 second"
+#: sensor_toolbar.py:62 toolbar_side.py:51
+msgid "Invert"
 msgstr ""
 
-#: sensor_toolbar.py:120 sensor_toolbar.py:131
-msgid "1 second"
+#: sensor_toolbar.py:63
+#, python-format
+msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
 msgstr ""
 
-#: sensor_toolbar.py:120
-msgid "30 seconds"
+#: sensor_toolbar.py:65
+msgid "ms"
 msgstr ""
 
-#: sensor_toolbar.py:121
-msgid "5 minutes"
+#: sensor_toolbar.py:105
+msgid "Resistance Sensor"
 msgstr ""
 
-#: sensor_toolbar.py:121
-msgid "30 minutes"
+#: sensor_toolbar.py:115
+msgid "Voltage Sensor"
 msgstr ""
 
-#: sensor_toolbar.py:124
-msgid "Sampling interval"
+#: sensor_toolbar.py:131
+msgid "Select logging interval"
 msgstr ""
 
-#: sensor_toolbar.py:141 sensor_toolbar.py:362
-msgid "Start Recording"
+#: sensor_toolbar.py:139
+msgid "Start logging"
 msgstr ""
 
-#: sensor_toolbar.py:151 tuning_toolbar.py:58 tuning_toolbar.py:217
-msgid "None"
+#: sensor_toolbar.py:147
+msgid "Trigger"
 msgstr ""
 
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:163
 msgid "Rising Edge"
 msgstr ""
 
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:171
 msgid "Falling Edge"
 msgstr ""
 
-#: sensor_toolbar.py:161
-msgid "Create a trigger"
-msgstr ""
-
-#: sensor_toolbar.py:170
+#: sensor_toolbar.py:228
 msgid "Zoom out"
 msgstr ""
 
-#: sensor_toolbar.py:182
+#: sensor_toolbar.py:244
 msgid "Zoom in"
 msgstr ""
 
-#: sensor_toolbar.py:380
+#: sensor_toolbar.py:428
+msgid "Start Recording"
+msgstr ""
+
+#: sensor_toolbar.py:448
 msgid "Stop Recording"
 msgstr ""
 
@@ -263,50 +270,54 @@ msgstr ""
 msgid "Decrease bias"
 msgstr ""
 
-#: tuning_toolbar.py:67
+#: tuning_toolbar.py:56
 msgid "Tune an instrument."
 msgstr ""
 
-#: tuning_toolbar.py:89 tuning_toolbar.py:352
+#: tuning_toolbar.py:68 tuning_toolbar.py:394
 msgid "Notes"
 msgstr ""
 
-#: tuning_toolbar.py:100
+#: tuning_toolbar.py:76 tuning_toolbar.py:403
+msgid "Octaves"
+msgstr ""
+
+#: tuning_toolbar.py:89
 msgid "Enter a frequency to display."
 msgstr ""
 
-#: tuning_toolbar.py:111 tuning_toolbar.py:180 tuning_toolbar.py:263
+#: tuning_toolbar.py:100 tuning_toolbar.py:288 tuning_toolbar.py:318
 msgid "Show tuning line."
 msgstr ""
 
-#: tuning_toolbar.py:122 tuning_toolbar.py:256
+#: tuning_toolbar.py:110 tuning_toolbar.py:311
 msgid "Show harmonics."
 msgstr ""
 
-#: tuning_toolbar.py:133
+#: tuning_toolbar.py:120
 msgid "Play a note."
 msgstr ""
 
-#: tuning_toolbar.py:174 tuning_toolbar.py:229
+#: tuning_toolbar.py:258 tuning_toolbar.py:259
 msgid "All notes"
 msgstr ""
 
-#: tuning_toolbar.py:191 tuning_toolbar.py:276
+#: tuning_toolbar.py:295 tuning_toolbar.py:331
 msgid "Hide tuning line."
 msgstr ""
 
-#: tuning_toolbar.py:250
+#: tuning_toolbar.py:305
 msgid "Hide harmonics."
 msgstr ""
 
-#: tuning_toolbar.py:328
+#: tuning_toolbar.py:379
 msgid "my instrument"
 msgstr ""
 
-#: tuning_toolbar.py:333
+#: tuning_toolbar.py:384
 msgid "Enter instrument name."
 msgstr ""
 
-#: tuning_toolbar.py:360
+#: tuning_toolbar.py:413
 msgid "Add a new note."
 msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 343c841..dd7222e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -6,83 +6,93 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-26 00:31-0400\n"
-"PO-Revision-Date: 2011-10-04 20:32+0200\n"
-"Last-Translator: Chris <cjl@laptop.org>\n"
+"POT-Creation-Date: 2013-07-04 00:32-0400\n"
+"PO-Revision-Date: 2013-11-27 08:47+0200\n"
+"Last-Translator: Ganesh <ganesh.ghimire@olenepal.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: ne\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"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "Measure"
 msgstr "नाप"
 
-#: config.py:75
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "oscilloscope program for visualizing microphone input"
+msgstr "oscilloscope program for visualizing microphone input"
+
+#: config.py:76 sensor_toolbar.py:155 tuning_toolbar.py:225
+msgid "None"
+msgstr "None"
+
+#: config.py:77
 msgid "Guitar"
-msgstr ""
+msgstr "गितार"
 
-#: config.py:76
+#: config.py:78
 msgid "Violin"
-msgstr ""
+msgstr "भायोलिन"
 
-#: config.py:77
+#: config.py:79
 msgid "Viola"
-msgstr ""
+msgstr "Viola"
 
-#: config.py:78
+#: config.py:80
 msgid "Cello"
-msgstr ""
+msgstr "Cello"
 
-#: config.py:79
+#: config.py:81
 msgid "Bass"
-msgstr ""
+msgstr "Bass"
 
-#: config.py:80
+#. TRANS: a small Andean stringed instrument of the lute family
+#: config.py:83
 msgid "Charango"
-msgstr ""
+msgstr "Charango"
 
-#: config.py:81
+#. TRANS: a small string instrument (also called machimbo)
+#: config.py:85
 msgid "Cavaquinho"
-msgstr ""
+msgstr "Cavaquinho"
 
-#: config.py:82
+#: config.py:86
 msgid "Ukulele"
-msgstr ""
+msgstr "Ukulele"
 
-#: config.py:83
+#: config.py:87
 msgid "Sitar"
-msgstr ""
+msgstr "सितार"
 
-#: config.py:85
+#: config.py:89
 msgid "Mandolin"
-msgstr ""
+msgstr "म्यान्डोलिन"
 
-#: config.py:86
+#: config.py:90
 msgid "Recorder"
-msgstr ""
+msgstr "रेकर्डर"
 
-#: journal.py:42 sensor_toolbar.py:52 sensor_toolbar.py:90
+#: journal.py:42 sensor_toolbar.py:57 sensor_toolbar.py:95
 msgid "Sound"
 msgstr "ध्वनि"
 
-#: journal.py:43 sensor_toolbar.py:53
-#, fuzzy
+#: journal.py:43 sensor_toolbar.py:58
 msgid "Ohms"
 msgstr "Ohms"
 
-#: journal.py:44 sensor_toolbar.py:54
+#: journal.py:44 sensor_toolbar.py:59
 msgid "Volts"
 msgstr "भोल्ट"
 
-#: journal.py:45 sensor_toolbar.py:62
+#: journal.py:45 sensor_toolbar.py:67
 msgid "Hz"
 msgstr "Hz"
 
-#: journal.py:59 measure.py:406
+#: journal.py:59 measure.py:393
 msgid "Session"
 msgstr "सत्र"
 
@@ -92,11 +102,11 @@ msgstr "प्रयोगकर्ता"
 
 #: journal.py:62
 msgid "Mode"
-msgstr ""
+msgstr "मोड"
 
 #: journal.py:64
 msgid "Date"
-msgstr ""
+msgstr "मिति"
 
 #: journal.py:66
 msgid "Interval"
@@ -104,149 +114,143 @@ msgstr "अन्तराल"
 
 #: journal.py:69
 msgid "Channels"
-msgstr ""
+msgstr "च्यानलहरू"
 
 #: journal.py:109
 msgid "Waveform"
-msgstr "लहर / तरङ्ग"
+msgstr "Waveform"
 
-#: measure.py:216 measure.py:235
+#: measure.py:190
 msgid "Sensors"
 msgstr "सेन्सर"
 
 #. TRANS: Tuning insruments
-#: measure.py:223 measure.py:237
+#: measure.py:197
 msgid "Tuning"
-msgstr ""
+msgstr "Tuning"
 
-#: measure.py:229 measure.py:238
+#: measure.py:203
 msgid "Add instrument"
-msgstr ""
-
-#: measure.py:240
-msgid "Controls"
-msgstr ""
+msgstr "बाजा थप"
 
-#: measure.py:248 measure.py:281 measure.py:446 sensor_toolbar.py:55
+#: measure.py:221 measure.py:433 sensor_toolbar.py:60
 msgid "Time Base"
-msgstr "समय आधार"
+msgstr "Time Base"
 
-#: measure.py:255 measure.py:293 measure.py:430
+#: measure.py:235 measure.py:417
 msgid "Freeze the display"
 msgstr "प्रदर्शन अचल गर"
 
-#: measure.py:260 measure.py:298
+#: measure.py:241
 msgid "Capture sample now"
 msgstr "नमूना अहिल्यै क्यापचर गर"
 
-#: measure.py:270
+#: measure.py:253
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: measure.py:393
+#: measure.py:380
 msgid "Measure Log"
 msgstr "लग मेजर गर"
 
-#: measure.py:425
+#: measure.py:412
 msgid "Unfreeze the display"
 msgstr "प्रदर्शनलाई स्थिर नगर"
 
-#: measure.py:450 sensor_toolbar.py:56
+#: measure.py:437 sensor_toolbar.py:61
 msgid "Frequency Base"
 msgstr "आवृतीको आधार"
 
-#: sensor_toolbar.py:47
-#, fuzzy
+#: sensor_toolbar.py:35
+msgid "1/10 second"
+msgstr "१/१० सेकेन्ड"
+
+#: sensor_toolbar.py:35 sensor_toolbar.py:209
+msgid "1 second"
+msgstr "१ सेकेन्ड"
+
+#: sensor_toolbar.py:36
+msgid "30 seconds"
+msgstr "३० सेकेन्ड"
+
+#: sensor_toolbar.py:36
+msgid "5 minutes"
+msgstr "५ मिनेट"
+
+#: sensor_toolbar.py:37
+msgid "30 minutes"
+msgstr "३० मिनेट"
+
+#: sensor_toolbar.py:52
 msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
-msgstr "सेन्सरहरु, DC( XO को बायाँपट्टि पिंक 'Mic In\"मा सेन्सर जोड )"
+msgstr "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
 
-#: sensor_toolbar.py:50
-#, fuzzy
+#: sensor_toolbar.py:55
 msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
-msgstr "सेन्सरहरु, DC( XO को बायाँपट्टि पिंक 'Mic In\"मा सेन्सर जोड )"
+msgstr "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
 
-#: sensor_toolbar.py:53
+#: sensor_toolbar.py:58
 msgid "Resistance"
-msgstr ""
+msgstr "प्रतिरोधक"
 
-#: sensor_toolbar.py:54
+#: sensor_toolbar.py:59
 msgid "Voltage"
-msgstr ""
+msgstr "भोल्टेज"
 
-#: sensor_toolbar.py:57 toolbar_side.py:51
+#: sensor_toolbar.py:62 toolbar_side.py:51
 msgid "Invert"
 msgstr "उल्टाउ"
 
-#: sensor_toolbar.py:58
+#: sensor_toolbar.py:63
 #, python-format
 msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
 msgstr "X कक्ष मापन: १ भाग =%(division)s %(unit)s"
 
-#: sensor_toolbar.py:60
+#: sensor_toolbar.py:65
 msgid "ms"
 msgstr "ms"
 
-#: sensor_toolbar.py:100
+#: sensor_toolbar.py:105
 msgid "Resistance Sensor"
 msgstr "अवरोध सचेतक"
 
-#: sensor_toolbar.py:110
+#: sensor_toolbar.py:115
 msgid "Voltage Sensor"
 msgstr "भोल्टेज सचेतक"
 
-#: sensor_toolbar.py:120
-msgid "1/10 second"
-msgstr "१/१० सेकेन्ड"
-
-#: sensor_toolbar.py:120 sensor_toolbar.py:131
-msgid "1 second"
-msgstr "१ सेकेन्ड"
-
-#: sensor_toolbar.py:120
-msgid "30 seconds"
-msgstr "३० सेकेन्ड"
-
-#: sensor_toolbar.py:121
-msgid "5 minutes"
-msgstr "५ मिनेट"
-
-#: sensor_toolbar.py:121
-msgid "30 minutes"
-msgstr "३० मिनेट"
-
-#: sensor_toolbar.py:124
-msgid "Sampling interval"
-msgstr "नमूना लिने अन्तराल"
+#: sensor_toolbar.py:131
+msgid "Select logging interval"
+msgstr "Select logging interval"
 
-#: sensor_toolbar.py:141 sensor_toolbar.py:362
-msgid "Start Recording"
-msgstr "रेकर्डिंग सुरु गर"
+#: sensor_toolbar.py:139
+msgid "Start logging"
+msgstr "Start logging"
 
-#: sensor_toolbar.py:151 tuning_toolbar.py:58 tuning_toolbar.py:217
-msgid "None"
-msgstr "शुन्य"
+#: sensor_toolbar.py:147
+msgid "Trigger"
+msgstr "Trigger"
 
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:163
 msgid "Rising Edge"
 msgstr "उदय हुदैँ गरेको किनारा"
 
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:171
 msgid "Falling Edge"
 msgstr "खस्दै गरेको किनारा"
 
-#: sensor_toolbar.py:161
-msgid "Create a trigger"
-msgstr "त्रिगर बनाऊ"
-
-#: sensor_toolbar.py:170
+#: sensor_toolbar.py:228
 msgid "Zoom out"
 msgstr "सानो बनाऊ"
 
-#: sensor_toolbar.py:182
+#: sensor_toolbar.py:244
 msgid "Zoom in"
 msgstr "ठूलो बनाऊ"
 
-#: sensor_toolbar.py:380
+#: sensor_toolbar.py:428
+msgid "Start Recording"
+msgstr "रेकर्डिंग सुरु गर"
+
+#: sensor_toolbar.py:448
 msgid "Stop Recording"
 msgstr "रेकर्डिंग बन्द गर"
 
@@ -266,53 +270,63 @@ msgstr "bias बढाउनुहोस्"
 msgid "Decrease bias"
 msgstr "bias घटाउनुहोस्"
 
-#: tuning_toolbar.py:67
+#: tuning_toolbar.py:56
 msgid "Tune an instrument."
-msgstr ""
+msgstr "Tune an instrument."
 
-#: tuning_toolbar.py:89 tuning_toolbar.py:352
+#: tuning_toolbar.py:68 tuning_toolbar.py:394
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
+
+#: tuning_toolbar.py:76 tuning_toolbar.py:403
+msgid "Octaves"
+msgstr "Octaves"
 
-#: tuning_toolbar.py:100
+#: tuning_toolbar.py:89
 msgid "Enter a frequency to display."
-msgstr ""
+msgstr "Enter a frequency to display."
 
-#: tuning_toolbar.py:111 tuning_toolbar.py:180 tuning_toolbar.py:263
+#: tuning_toolbar.py:100 tuning_toolbar.py:288 tuning_toolbar.py:318
 msgid "Show tuning line."
-msgstr ""
+msgstr "Show tuning line."
 
-#: tuning_toolbar.py:122 tuning_toolbar.py:256
+#: tuning_toolbar.py:110 tuning_toolbar.py:311
 msgid "Show harmonics."
-msgstr ""
+msgstr "Show harmonics."
 
-#: tuning_toolbar.py:133
+#: tuning_toolbar.py:120
 msgid "Play a note."
-msgstr ""
+msgstr "एउटा नोट बजाऊ"
 
-#: tuning_toolbar.py:174 tuning_toolbar.py:229
+#: tuning_toolbar.py:258 tuning_toolbar.py:259
 msgid "All notes"
-msgstr ""
+msgstr "सबै नोटहरू"
 
-#: tuning_toolbar.py:191 tuning_toolbar.py:276
+#: tuning_toolbar.py:295 tuning_toolbar.py:331
 msgid "Hide tuning line."
-msgstr ""
+msgstr "Hide tuning line."
 
-#: tuning_toolbar.py:250
+#: tuning_toolbar.py:305
 msgid "Hide harmonics."
-msgstr ""
+msgstr "Hide harmonics."
 
-#: tuning_toolbar.py:328
+#: tuning_toolbar.py:379
 msgid "my instrument"
-msgstr ""
+msgstr "मेरो बाजा"
 
-#: tuning_toolbar.py:333
+#: tuning_toolbar.py:384
 msgid "Enter instrument name."
-msgstr ""
+msgstr "बाजाको नाम प्रविष्टि गर"
 
-#: tuning_toolbar.py:360
+#: tuning_toolbar.py:413
 msgid "Add a new note."
-msgstr ""
+msgstr "नयाँ नोट थप"
+
+#~ msgid "Sampling interval"
+#~ msgstr "नमूना लिने अन्तराल"
+
+#~ msgid "Create a trigger"
+#~ msgstr "त्रिगर बनाऊ"
 
 #, fuzzy
 #~ msgid "Capture mode"
@@ -399,9 +413,6 @@ msgstr ""
 #~ msgid "1 hour"
 #~ msgstr "१ घन्टा"
 
-#~ msgid "Start Logging"
-#~ msgstr "बचत सुरु गर"
-
 #~ msgid "Show Log"
 #~ msgstr "वहीखाता देखाऊ"
 
diff --git a/po/pap.po b/po/pap.po
new file mode 100644
index 0000000..83fd5f8
--- /dev/null
+++ b/po/pap.po
@@ -0,0 +1,323 @@
+# 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: 2013-07-04 00:32-0400\n"
+"PO-Revision-Date: 2013-07-22 03:39+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pap\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"
+
+#. TRANS: "name" option from activity.info file
+msgid "Measure"
+msgstr ""
+
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "oscilloscope program for visualizing microphone input"
+msgstr ""
+
+#: config.py:76 sensor_toolbar.py:155 tuning_toolbar.py:225
+msgid "None"
+msgstr "Ningun"
+
+#: config.py:77
+msgid "Guitar"
+msgstr ""
+
+#: config.py:78
+msgid "Violin"
+msgstr ""
+
+#: config.py:79
+msgid "Viola"
+msgstr ""
+
+#: config.py:80
+msgid "Cello"
+msgstr ""
+
+#: config.py:81
+msgid "Bass"
+msgstr ""
+
+#. TRANS: a small Andean stringed instrument of the lute family
+#: config.py:83
+msgid "Charango"
+msgstr ""
+
+#. TRANS: a small string instrument (also called machimbo)
+#: config.py:85
+msgid "Cavaquinho"
+msgstr ""
+
+#: config.py:86
+msgid "Ukulele"
+msgstr ""
+
+#: config.py:87
+msgid "Sitar"
+msgstr ""
+
+#: config.py:89
+msgid "Mandolin"
+msgstr ""
+
+#: config.py:90
+msgid "Recorder"
+msgstr ""
+
+#: journal.py:42 sensor_toolbar.py:57 sensor_toolbar.py:95
+msgid "Sound"
+msgstr ""
+
+#: journal.py:43 sensor_toolbar.py:58
+msgid "Ohms"
+msgstr ""
+
+#: journal.py:44 sensor_toolbar.py:59
+msgid "Volts"
+msgstr ""
+
+#: journal.py:45 sensor_toolbar.py:67
+msgid "Hz"
+msgstr ""
+
+#: journal.py:59 measure.py:393
+msgid "Session"
+msgstr ""
+
+#: journal.py:61
+msgid "User"
+msgstr ""
+
+#: journal.py:62
+msgid "Mode"
+msgstr ""
+
+#: journal.py:64
+msgid "Date"
+msgstr "Fecha"
+
+#: journal.py:66
+msgid "Interval"
+msgstr ""
+
+#: journal.py:69
+msgid "Channels"
+msgstr ""
+
+#: journal.py:109
+msgid "Waveform"
+msgstr ""
+
+#: measure.py:190
+msgid "Sensors"
+msgstr ""
+
+#. TRANS: Tuning insruments
+#: measure.py:197
+msgid "Tuning"
+msgstr ""
+
+#: measure.py:203
+msgid "Add instrument"
+msgstr ""
+
+#: measure.py:221 measure.py:433 sensor_toolbar.py:60
+msgid "Time Base"
+msgstr ""
+
+#: measure.py:235 measure.py:417
+msgid "Freeze the display"
+msgstr ""
+
+#: measure.py:241
+msgid "Capture sample now"
+msgstr ""
+
+#: measure.py:253
+msgid "<Ctrl>Q"
+msgstr ""
+
+#: measure.py:380
+msgid "Measure Log"
+msgstr ""
+
+#: measure.py:412
+msgid "Unfreeze the display"
+msgstr ""
+
+#: measure.py:437 sensor_toolbar.py:61
+msgid "Frequency Base"
+msgstr ""
+
+#: sensor_toolbar.py:35
+msgid "1/10 second"
+msgstr ""
+
+#: sensor_toolbar.py:35 sensor_toolbar.py:209
+msgid "1 second"
+msgstr ""
+
+#: sensor_toolbar.py:36
+msgid "30 seconds"
+msgstr ""
+
+#: sensor_toolbar.py:36
+msgid "5 minutes"
+msgstr ""
+
+#: sensor_toolbar.py:37
+msgid "30 minutes"
+msgstr ""
+
+#: sensor_toolbar.py:52
+msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
+msgstr ""
+
+#: sensor_toolbar.py:55
+msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
+msgstr ""
+
+#: sensor_toolbar.py:58
+msgid "Resistance"
+msgstr ""
+
+#: sensor_toolbar.py:59
+msgid "Voltage"
+msgstr ""
+
+#: sensor_toolbar.py:62 toolbar_side.py:51
+msgid "Invert"
+msgstr ""
+
+#: sensor_toolbar.py:63
+#, python-format
+msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
+msgstr ""
+
+#: sensor_toolbar.py:65
+msgid "ms"
+msgstr ""
+
+#: sensor_toolbar.py:105
+msgid "Resistance Sensor"
+msgstr ""
+
+#: sensor_toolbar.py:115
+msgid "Voltage Sensor"
+msgstr ""
+
+#: sensor_toolbar.py:131
+msgid "Select logging interval"
+msgstr ""
+
+#: sensor_toolbar.py:139
+msgid "Start logging"
+msgstr ""
+
+#: sensor_toolbar.py:147
+msgid "Trigger"
+msgstr ""
+
+#: sensor_toolbar.py:163
+msgid "Rising Edge"
+msgstr ""
+
+#: sensor_toolbar.py:171
+msgid "Falling Edge"
+msgstr ""
+
+#: sensor_toolbar.py:228
+msgid "Zoom out"
+msgstr ""
+
+#: sensor_toolbar.py:244
+msgid "Zoom in"
+msgstr ""
+
+#: sensor_toolbar.py:428
+msgid "Start Recording"
+msgstr ""
+
+#: sensor_toolbar.py:448
+msgid "Stop Recording"
+msgstr ""
+
+#: toolbar_side.py:57 toolbar_side.py:138
+msgid "Increase amplitude"
+msgstr ""
+
+#: toolbar_side.py:72 toolbar_side.py:140
+msgid "Decrease amplitude"
+msgstr ""
+
+#: toolbar_side.py:143
+msgid "Increase bias"
+msgstr ""
+
+#: toolbar_side.py:145
+msgid "Decrease bias"
+msgstr ""
+
+#: tuning_toolbar.py:56
+msgid "Tune an instrument."
+msgstr ""
+
+#: tuning_toolbar.py:68 tuning_toolbar.py:394
+msgid "Notes"
+msgstr ""
+
+#: tuning_toolbar.py:76 tuning_toolbar.py:403
+msgid "Octaves"
+msgstr ""
+
+#: tuning_toolbar.py:89
+msgid "Enter a frequency to display."
+msgstr ""
+
+#: tuning_toolbar.py:100 tuning_toolbar.py:288 tuning_toolbar.py:318
+msgid "Show tuning line."
+msgstr ""
+
+#: tuning_toolbar.py:110 tuning_toolbar.py:311
+msgid "Show harmonics."
+msgstr ""
+
+#: tuning_toolbar.py:120
+msgid "Play a note."
+msgstr ""
+
+#: tuning_toolbar.py:258 tuning_toolbar.py:259
+msgid "All notes"
+msgstr ""
+
+#: tuning_toolbar.py:295 tuning_toolbar.py:331
+msgid "Hide tuning line."
+msgstr ""
+
+#: tuning_toolbar.py:305
+msgid "Hide harmonics."
+msgstr ""
+
+#: tuning_toolbar.py:379
+msgid "my instrument"
+msgstr ""
+
+#: tuning_toolbar.py:384
+msgid "Enter instrument name."
+msgstr ""
+
+#: tuning_toolbar.py:413
+msgid "Add a new note."
+msgstr ""
diff --git a/po/pbs.po b/po/pbs.po
new file mode 100644
index 0000000..f65391b
--- /dev/null
+++ b/po/pbs.po
@@ -0,0 +1,327 @@
+# 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: 2013-07-04 00:32-0400\n"
+"PO-Revision-Date: 2013-10-23 22:10+0200\n"
+"Last-Translator: xavier <proyecto.olpc@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pbs\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"
+
+#. TRANS: "name" option from activity.info file
+msgid "Measure"
+msgstr "masau'"
+
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "oscilloscope program for visualizing microphone input"
+msgstr "mad-eung osciloscopio napajau ndejeì ne ndape'et leet"
+
+#: config.py:76 sensor_toolbar.py:155 tuning_toolbar.py:225
+msgid "None"
+msgstr "nip nda"
+
+#: config.py:77
+msgid "Guitar"
+msgstr "ngube'ei"
+
+#: config.py:78
+msgid "Violin"
+msgstr "ngube'ei nimpjie'e"
+
+#: config.py:79
+msgid "Viola"
+msgstr "Viola"
+
+#: config.py:80
+msgid "Cello"
+msgstr "Chelo"
+
+#: config.py:81
+msgid "Bass"
+msgstr "Bajo"
+
+#. TRANS: a small Andean stringed instrument of the lute family
+#: config.py:83
+msgid "Charango"
+msgstr "Charango"
+
+#. TRANS: a small string instrument (also called machimbo)
+#: config.py:85
+msgid "Cavaquinho"
+msgstr "Cavaquinho"
+
+#: config.py:86
+msgid "Ukulele"
+msgstr "Ukelele"
+
+#: config.py:87
+msgid "Sitar"
+msgstr "Cítara"
+
+#: config.py:89
+msgid "Mandolin"
+msgstr "ngube'ei"
+
+#: config.py:90
+msgid "Recorder"
+msgstr "nipji'i"
+
+#: journal.py:42 sensor_toolbar.py:57 sensor_toolbar.py:95
+msgid "Sound"
+msgstr "vate'i"
+
+#: journal.py:43 sensor_toolbar.py:58
+msgid "Ohms"
+msgstr "Ohms"
+
+#: journal.py:44 sensor_toolbar.py:59
+msgid "Volts"
+msgstr "Voltios"
+
+#: journal.py:45 sensor_toolbar.py:67
+msgid "Hz"
+msgstr "Hercio(Hz)"
+
+#: journal.py:59 measure.py:393
+msgid "Session"
+msgstr "kichjau'"
+
+#: journal.py:61
+msgid "User"
+msgstr "kague'"
+
+#: journal.py:62
+msgid "Mode"
+msgstr "vakja"
+
+#: journal.py:64
+msgid "Date"
+msgstr "kilejeiñ ngum'au'"
+
+#: journal.py:66
+msgid "Interval"
+msgstr "manajiap"
+
+#: journal.py:69
+msgid "Channels"
+msgstr "Canales"
+
+#: journal.py:109
+msgid "Waveform"
+msgstr "vakja ne vankajam"
+
+#: measure.py:190
+msgid "Sensors"
+msgstr "rikji"
+
+#. TRANS: Tuning insruments
+#: measure.py:197
+msgid "Tuning"
+msgstr "matseiñ'"
+
+#: measure.py:203
+msgid "Add instrument"
+msgstr "meje'eun ne mangue'"
+
+#: measure.py:221 measure.py:433 sensor_toolbar.py:60
+msgid "Time Base"
+msgstr "niñ'eje manague' nanù kunju'"
+
+#: measure.py:235 measure.py:417
+msgid "Freeze the display"
+msgstr "kun'ieje mama'ai ne kutau nak'ujuly'"
+
+#: measure.py:241
+msgid "Capture sample now"
+msgstr "matsjau peuk kulejeiñ kumju'"
+
+#: measure.py:253
+msgid "<Ctrl>Q"
+msgstr "<Ctrl>Q"
+
+#: measure.py:380
+msgid "Measure Log"
+msgstr "matsjau vakja masau"
+
+#: measure.py:412
+msgid "Unfreeze the display"
+msgstr "kue'e mamejep kutau nak'ujuly'"
+
+#: measure.py:437 sensor_toolbar.py:61
+msgid "Frequency Base"
+msgstr "niñ'eje' ndaku'uts vaka'am"
+
+#: sensor_toolbar.py:35
+msgid "1/10 second"
+msgstr "1/10 kanuima masau'"
+
+#: sensor_toolbar.py:35 sensor_toolbar.py:209
+msgid "1 second"
+msgstr "nda kanuima"
+
+#: sensor_toolbar.py:36
+msgid "30 seconds"
+msgstr "nda lyen seska'ai vatsejè"
+
+#: sensor_toolbar.py:36
+msgid "5 minutes"
+msgstr "kik'iaì rabe'en chich'i kusap"
+
+#: sensor_toolbar.py:37
+msgid "30 minutes"
+msgstr "nda lyen seska'ai ngul'ei kusap"
+
+#: sensor_toolbar.py:52
+msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
+msgstr ""
+"rikji lun'ejem (mamejep ne nikji pu ndejei ndape'et leet u niñjats ma "
+"meje'ep ne XO)"
+
+#: sensor_toolbar.py:55
+msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
+msgstr ""
+"Rikji limei xikich' (mamejep ne nikji pu ndejei ne nape'et leet ne se "
+"niñjats ma meje'ep ne XO"
+
+#: sensor_toolbar.py:58
+msgid "Resistance"
+msgstr "nda'ujuñ xikich'"
+
+#: sensor_toolbar.py:59
+msgid "Voltage"
+msgstr "mxikich'"
+
+#: sensor_toolbar.py:62 toolbar_side.py:51
+msgid "Invert"
+msgstr "me'eng"
+
+#: sensor_toolbar.py:63
+#, python-format
+msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
+msgstr "Eje X Escala: 1 división = %(division)s %(unit)s"
+
+#: sensor_toolbar.py:65
+msgid "ms"
+msgstr "ms"
+
+#: sensor_toolbar.py:105
+msgid "Resistance Sensor"
+msgstr "nikji lumei xikixh'"
+
+#: sensor_toolbar.py:115
+msgid "Voltage Sensor"
+msgstr "nikji lumei manajap xikich'"
+
+#: sensor_toolbar.py:131
+msgid "Select logging interval"
+msgstr "Select logging interval"
+
+#: sensor_toolbar.py:139
+msgid "Start logging"
+msgstr "Start logging"
+
+#: sensor_toolbar.py:147
+msgid "Trigger"
+msgstr "Trigger"
+
+#: sensor_toolbar.py:163
+msgid "Rising Edge"
+msgstr "mandaì ngutue'p re vakejè"
+
+#: sensor_toolbar.py:171
+msgid "Falling Edge"
+msgstr "mapup ngutue'p re vakejè"
+
+#: sensor_toolbar.py:228
+msgid "Zoom out"
+msgstr "matsei' (majaì) enfoque"
+
+#: sensor_toolbar.py:244
+msgid "Zoom in"
+msgstr "mandaì (manù) enfoque"
+
+#: sensor_toolbar.py:428
+msgid "Start Recording"
+msgstr "mapup maka'an"
+
+#: sensor_toolbar.py:448
+msgid "Stop Recording"
+msgstr "mama'ai ndaka'an"
+
+#: toolbar_side.py:57 toolbar_side.py:138
+msgid "Increase amplitude"
+msgstr "mandaì ngutue'p"
+
+#: toolbar_side.py:72 toolbar_side.py:140
+msgid "Decrease amplitude"
+msgstr "matseì ngutue'p"
+
+#: toolbar_side.py:143
+msgid "Increase bias"
+msgstr "mandap sesgo/desviacion"
+
+#: toolbar_side.py:145
+msgid "Decrease bias"
+msgstr "mats'eì' sesgo/desviacion"
+
+#: tuning_toolbar.py:56
+msgid "Tune an instrument."
+msgstr "mad-eung nda ngube'ei"
+
+#: tuning_toolbar.py:68 tuning_toolbar.py:394
+msgid "Notes"
+msgstr "ma'ets"
+
+#: tuning_toolbar.py:76 tuning_toolbar.py:403
+msgid "Octaves"
+msgstr "Octavas"
+
+#: tuning_toolbar.py:89
+msgid "Enter a frequency to display."
+msgstr "mamejep nda vaka'ang se vu'u'up"
+
+#: tuning_toolbar.py:100 tuning_toolbar.py:288 tuning_toolbar.py:318
+msgid "Show tuning line."
+msgstr "ma'u'up riñ'eje' ne matseiñ'"
+
+#: tuning_toolbar.py:110 tuning_toolbar.py:311
+msgid "Show harmonics."
+msgstr "ma'u'up armonicos"
+
+#: tuning_toolbar.py:120
+msgid "Play a note."
+msgstr "maleiñ nda ma'ets"
+
+#: tuning_toolbar.py:258 tuning_toolbar.py:259
+msgid "All notes"
+msgstr "mi'ia re ma'ets"
+
+#: tuning_toolbar.py:295 tuning_toolbar.py:331
+msgid "Hide tuning line."
+msgstr "ma'aung riñ'eje' ne matseiñ'"
+
+#: tuning_toolbar.py:305
+msgid "Hide harmonics."
+msgstr "ma'aung armonicos"
+
+#: tuning_toolbar.py:379
+msgid "my instrument"
+msgstr "ne make'"
+
+#: tuning_toolbar.py:384
+msgid "Enter instrument name."
+msgstr "mamejep pu ngunjiu' ne make'"
+
+#: tuning_toolbar.py:413
+msgid "Add a new note."
+msgstr "mamejep nda viñkjiu ma'ets"
diff --git a/po/pt.po b/po/pt.po
index 69e67c2..cd92f43 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-26 00:31-0400\n"
-"PO-Revision-Date: 2012-04-13 00:22+0200\n"
+"POT-Creation-Date: 2013-07-04 00:32-0400\n"
+"PO-Revision-Date: 2013-12-14 21:02+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: pt\n"
@@ -17,71 +17,82 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
-#: activity/activity.info:2
+#. TRANS: "name" option from activity.info file
 msgid "Measure"
 msgstr "Medir"
 
-#: config.py:75
+#. TRANS: "summary" option from activity.info file
+#. TRANS: "description" option from activity.info file
+msgid "oscilloscope program for visualizing microphone input"
+msgstr "Programa osciloscópio para visualizar a entrada de microfone"
+
+#: config.py:76 sensor_toolbar.py:155 tuning_toolbar.py:225
+msgid "None"
+msgstr "Nenhum"
+
+#: config.py:77
 msgid "Guitar"
-msgstr ""
+msgstr "Guitarra"
 
-#: config.py:76
+#: config.py:78
 msgid "Violin"
-msgstr ""
+msgstr "Violino"
 
-#: config.py:77
+#: config.py:79
 msgid "Viola"
-msgstr ""
+msgstr "Viola"
 
-#: config.py:78
+#: config.py:80
 msgid "Cello"
-msgstr ""
+msgstr "Violoncelo"
 
-#: config.py:79
+#: config.py:81
 msgid "Bass"
-msgstr ""
+msgstr "Baixo"
 
-#: config.py:80
+#. TRANS: a small Andean stringed instrument of the lute family
+#: config.py:83
 msgid "Charango"
-msgstr ""
+msgstr "Charango"
 
-#: config.py:81
+#. TRANS: a small string instrument (also called machimbo)
+#: config.py:85
 msgid "Cavaquinho"
-msgstr ""
+msgstr "Cavaquinho"
 
-#: config.py:82
+#: config.py:86
 msgid "Ukulele"
-msgstr ""
+msgstr "Ukulele"
 
-#: config.py:83
+#: config.py:87
 msgid "Sitar"
-msgstr ""
+msgstr "Cítara"
 
-#: config.py:85
+#: config.py:89
 msgid "Mandolin"
-msgstr ""
+msgstr "Bandolim"
 
-#: config.py:86
+#: config.py:90
 msgid "Recorder"
-msgstr ""
+msgstr "Flauta"
 
-#: journal.py:42 sensor_toolbar.py:52 sensor_toolbar.py:90
+#: journal.py:42 sensor_toolbar.py:57 sensor_toolbar.py:95
 msgid "Sound"
 msgstr "Som"
 
-#: journal.py:43 sensor_toolbar.py:53
+#: journal.py:43 sensor_toolbar.py:58
 msgid "Ohms"
 msgstr "Ohms"
 
-#: journal.py:44 sensor_toolbar.py:54
+#: journal.py:44 sensor_toolbar.py:59
 msgid "Volts"
 msgstr "Volts"
 
-#: journal.py:45 sensor_toolbar.py:62
+#: journal.py:45 sensor_toolbar.py:67
 msgid "Hz"
 msgstr "Hz"
 
-#: journal.py:59 measure.py:406
+#: journal.py:59 measure.py:393
 msgid "Session"
 msgstr "Sessão"
 
@@ -109,145 +120,141 @@ msgstr "Canais"
 msgid "Waveform"
 msgstr "Forma de onda"
 
-#: measure.py:216 measure.py:235
+#: measure.py:190
 msgid "Sensors"
 msgstr "Sensores"
 
 #. TRANS: Tuning insruments
-#: measure.py:223 measure.py:237
+#: measure.py:197
 msgid "Tuning"
-msgstr ""
+msgstr "Afinação"
 
-#: measure.py:229 measure.py:238
+#: measure.py:203
 msgid "Add instrument"
-msgstr ""
-
-#: measure.py:240
-msgid "Controls"
-msgstr "Controlos"
+msgstr "Adicionar instrumento"
 
-#: measure.py:248 measure.py:281 measure.py:446 sensor_toolbar.py:55
+#: measure.py:221 measure.py:433 sensor_toolbar.py:60
 msgid "Time Base"
 msgstr "Base de Tempo"
 
-#: measure.py:255 measure.py:293 measure.py:430
+#: measure.py:235 measure.py:417
 msgid "Freeze the display"
 msgstr "Congelar a visualização"
 
-#: measure.py:260 measure.py:298
+#: measure.py:241
 msgid "Capture sample now"
 msgstr "Capturar amostra agora"
 
-#: measure.py:270
+#: measure.py:253
 msgid "<Ctrl>Q"
 msgstr "<Ctrl>Q"
 
-#: measure.py:393
+#: measure.py:380
 msgid "Measure Log"
 msgstr "Registo Medir"
 
-#: measure.py:425
+#: measure.py:412
 msgid "Unfreeze the display"
 msgstr "Descongelar a visualização"
 
-#: measure.py:450 sensor_toolbar.py:56
+#: measure.py:437 sensor_toolbar.py:61
 msgid "Frequency Base"
 msgstr "Base de Frequência"
 
-#: sensor_toolbar.py:47
+#: sensor_toolbar.py:35
+msgid "1/10 second"
+msgstr "1/10 de segundo"
+
+#: sensor_toolbar.py:35 sensor_toolbar.py:209
+msgid "1 second"
+msgstr "1 segundo"
+
+#: sensor_toolbar.py:36
+msgid "30 seconds"
+msgstr "30 segundos"
+
+#: sensor_toolbar.py:36
+msgid "5 minutes"
+msgstr "5 minutos"
+
+#: sensor_toolbar.py:37
+msgid "30 minutes"
+msgstr "30 minutos"
+
+#: sensor_toolbar.py:52
 msgid "Resistive sensor (connect sensor to pink 'Mic In' on left side of XO)"
 msgstr ""
 "Sensor resistivo (liga o sensor à entrada rosa 'Mic in' no lado esquerdo do "
 "XO)"
 
-#: sensor_toolbar.py:50
+#: sensor_toolbar.py:55
 msgid "Voltage sensor (connect sensor to pink 'Mic In' on left side of XO)"
 msgstr ""
 "Sensor de voltagem (liga o sensor à entrada rosa 'Mic in' no lado esquerdo "
 "do XO)"
 
-#: sensor_toolbar.py:53
+#: sensor_toolbar.py:58
 msgid "Resistance"
 msgstr "Resistência"
 
-#: sensor_toolbar.py:54
+#: sensor_toolbar.py:59
 msgid "Voltage"
 msgstr "Voltagem"
 
-#: sensor_toolbar.py:57 toolbar_side.py:51
+#: sensor_toolbar.py:62 toolbar_side.py:51
 msgid "Invert"
 msgstr "Inverter"
 
-#: sensor_toolbar.py:58
+#: sensor_toolbar.py:63
 #, python-format
 msgid "X Axis Scale: 1 division = %(division)s %(unit)s"
 msgstr "Escala Eixo X: 1 divisão = %(division)s %(unit)s"
 
-#: sensor_toolbar.py:60
+#: sensor_toolbar.py:65
 msgid "ms"
 msgstr "ms"
 
-#: sensor_toolbar.py:100
+#: sensor_toolbar.py:105
 msgid "Resistance Sensor"
 msgstr "Sensor de Resistência"
 
-#: sensor_toolbar.py:110
+#: sensor_toolbar.py:115
 msgid "Voltage Sensor"
 msgstr "Sensor de Voltagem"
 
-#: sensor_toolbar.py:120
-msgid "1/10 second"
-msgstr "1/10 de segundo"
+#: sensor_toolbar.py:131
+msgid "Select logging interval"
+msgstr "Selecionar intervalo de registo"
 
-#: sensor_toolbar.py:120 sensor_toolbar.py:131
-msgid "1 second"
-msgstr "1 segundo"
+#: sensor_toolbar.py:139
+msgid "Start logging"
+msgstr "Começar a Registar"
 
-#: sensor_toolbar.py:120
-msgid "30 seconds"
-msgstr "30 segundos"
+#: sensor_toolbar.py:147
+msgid "Trigger"
+msgstr "Disparador"
 
-#: sensor_toolbar.py:121
-msgid "5 minutes"
-msgstr "5 minutos"
-
-#: sensor_toolbar.py:121
-msgid "30 minutes"
-msgstr "30 minutos"
-
-#: sensor_toolbar.py:124
-msgid "Sampling interval"
-msgstr "Intervalo de amostragem"
-
-#: sensor_toolbar.py:141 sensor_toolbar.py:362
-msgid "Start Recording"
-msgstr "Começar a Gravação"
-
-#: sensor_toolbar.py:151 tuning_toolbar.py:58 tuning_toolbar.py:217
-msgid "None"
-msgstr "Nenhum"
-
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:163
 msgid "Rising Edge"
 msgstr "Flanco Ascendente"
 
-#: sensor_toolbar.py:151
+#: sensor_toolbar.py:171
 msgid "Falling Edge"
 msgstr "Flanco Descendente"
 
-#: sensor_toolbar.py:161
-msgid "Create a trigger"
-msgstr "Criar um disparador"
-
-#: sensor_toolbar.py:170
+#: sensor_toolbar.py:228
 msgid "Zoom out"
 msgstr "Afastar zoom"
 
-#: sensor_toolbar.py:182
+#: sensor_toolbar.py:244
 msgid "Zoom in"
 msgstr "Aproximar zoom"
 
-#: sensor_toolbar.py:380
+#: sensor_toolbar.py:428
+msgid "Start Recording"
+msgstr "Começar a Gravação"
+
+#: sensor_toolbar.py:448
 msgid "Stop Recording"
 msgstr "Parar a Gravação"
 
@@ -267,53 +274,66 @@ msgstr "Aumentar bias"
 msgid "Decrease bias"
 msgstr "Diminuir bias"
 
-#: tuning_toolbar.py:67
+#: tuning_toolbar.py:56
 msgid "Tune an instrument."
-msgstr ""
+msgstr "Afinar um instrumento"
 
-#: tuning_toolbar.py:89 tuning_toolbar.py:352
+#: tuning_toolbar.py:68 tuning_toolbar.py:394
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
+
+#: tuning_toolbar.py:76 tuning_toolbar.py:403
+msgid "Octaves"
+msgstr "Octavas"
 
-#: tuning_toolbar.py:100
+#: tuning_toolbar.py:89
 msgid "Enter a frequency to display."
-msgstr ""
+msgstr "Introduz uma frequência para mostrar."
 
-#: tuning_toolbar.py:111 tuning_toolbar.py:180 tuning_toolbar.py:263
+#: tuning_toolbar.py:100 tuning_toolbar.py:288 tuning_toolbar.py:318
 msgid "Show tuning line."
-msgstr ""
+msgstr "Mostrar linha de afinação."
 
-#: tuning_toolbar.py:122 tuning_toolbar.py:256
+#: tuning_toolbar.py:110 tuning_toolbar.py:311
 msgid "Show harmonics."
-msgstr ""
+msgstr "Mostrar harmónicas."
 
-#: tuning_toolbar.py:133
+#: tuning_toolbar.py:120
 msgid "Play a note."
-msgstr ""
+msgstr "Tocar uma nota."
 
-#: tuning_toolbar.py:174 tuning_toolbar.py:229
+#: tuning_toolbar.py:258 tuning_toolbar.py:259
 msgid "All notes"
-msgstr ""
+msgstr "Todas as notas"
 
-#: tuning_toolbar.py:191 tuning_toolbar.py:276
+#: tuning_toolbar.py:295 tuning_toolbar.py:331
 msgid "Hide tuning line."
-msgstr ""
+msgstr "Esconder linha de afinação."
 
-#: tuning_toolbar.py:250
+#: tuning_toolbar.py:305
 msgid "Hide harmonics."
-msgstr ""
+msgstr "Esconder harmónicas."
 
-#: tuning_toolbar.py:328
+#: tuning_toolbar.py:379
 msgid "my instrument"
-msgstr ""
+msgstr "meu instrumento"
 
-#: tuning_toolbar.py:333
+#: tuning_toolbar.py:384
 msgid "Enter instrument name."
-msgstr ""
+msgstr "Introduz o nome do instrumento."
 
-#: tuning_toolbar.py:360
+#: tuning_toolbar.py:413
 msgid "Add a new note."
-msgstr ""
+msgstr "Adicionar uma nova nota."
+
+#~ msgid "Controls"
+#~ msgstr "Controlos"
+
+#~ msgid "Sampling interval"
+#~ msgstr "Intervalo de amostragem"
+
+#~ msgid "Create a trigger"
+#~ msgstr "Criar um disparador"
 
 #~ msgid "Capture mode"
 #~ msgstr "Modo de captura"
@@ -375,9 +395,6 @@ msgstr ""
 #~ msgid "1 hour"
 #~ msgstr "1 hora"
 
-#~ msgid "Start Logging"
-#~ msgstr "Começar a Registar"
-
 #~ msgid "Show Log"
 #~ msgstr "Mostrar Registo"