[Xfce4-commits] <xfce4-mixer:master> Update translations

Guido Berhoerster noreply at xfce.org
Sat Sep 29 16:14:01 CEST 2012


Updating branch refs/heads/master
         to 5ae4f15051d34b1f545d76f96b1fbad6b562c82c (commit)
       from 91598f7c345e4e66d5dcead7615e29b92affc584 (commit)

commit 5ae4f15051d34b1f545d76f96b1fbad6b562c82c
Author: Guido Berhoerster <guido+xfce at berhoerster.name>
Date:   Sat Sep 29 16:13:05 2012 +0200

    Update translations

 po/am.po           |  190 ++++++++++++++-------------
 po/ar.po           |  274 ++++++++++++++++++++++++---------------
 po/ast.po          |  277 ++++++++++++++++++++++++---------------
 po/bg.po           |  277 +++++++++++++++++++++++++--------------
 po/ca.po           |  277 ++++++++++++++++++++++++---------------
 po/cs.po           |  275 ++++++++++++++++++++++++---------------
 po/da.po           |  275 ++++++++++++++++++++++++---------------
 po/de.po           |  279 ++++++++++++++++++++++++---------------
 po/el.po           |  282 +++++++++++++++++++++++++--------------
 po/en_GB.po        |  273 ++++++++++++++++++++++++---------------
 po/es.po           |  295 +++++++++++++++++++++++++++---------------
 po/eu.po           |  278 ++++++++++++++++++++++++---------------
 po/fi.po           |  274 ++++++++++++++++++++++++---------------
 po/fr.po           |  273 ++++++++++++++++++++++++---------------
 po/gl.po           |  289 ++++++++++++++++++++++++++---------------
 po/he.po           |  280 +++++++++++++++++++++++++---------------
 po/hr.po           |  254 ++++++++++++++++++++++--------------
 po/hu.po           |  281 +++++++++++++++++++++++++---------------
 po/id.po           |  287 ++++++++++++++++++++++++++---------------
 po/is.po           |  258 ++++++++++++++++++++++--------------
 po/it.po           |  298 +++++++++++++++++++++++++++---------------
 po/ja.po           |  275 ++++++++++++++++++++++++---------------
 po/kk.po           |  282 +++++++++++++++++++++++++--------------
 po/ko.po           |  281 +++++++++++++++++++++++++---------------
 po/lt.po           |  276 ++++++++++++++++++++++++---------------
 po/lv.po           |  283 +++++++++++++++++++++++++---------------
 po/nb.po           |  273 ++++++++++++++++++++++++---------------
 po/nl.po           |  281 ++++++++++++++++++++++++----------------
 po/nn.po           |  280 +++++++++++++++++++++++++--------------
 po/pl.po           |  287 ++++++++++++++++++++++++++---------------
 po/pt.po           |  282 +++++++++++++++++++++++++--------------
 po/pt_BR.po        |  304 ++++++++++++++++++++++++++++---------------
 po/ro.po           |  273 +++++++++++++++++++++++---------------
 po/ru.po           |  276 ++++++++++++++++++++++++---------------
 po/si.po           |  282 +++++++++++++++++++++++++--------------
 po/sk.po           |  273 ++++++++++++++++++++++++---------------
 po/sr.po           |  274 ++++++++++++++++++++++++---------------
 po/sv.po           |  280 +++++++++++++++++++++++++--------------
 po/tr.po           |  285 ++++++++++++++++++++++++++---------------
 po/ug.po           |  278 +++++++++++++++++++++++++--------------
 po/uk.po           |  281 ++++++++++++++++++++++++---------------
 po/ur.po           |  369 +++++++++++++++++++++++++++++++++++++---------------
 po/ur_PK.po        |  369 +++++++++++++++++++++++++++++++++++++---------------
 po/vi.po           |  280 ++++++++++++++++++++++++---------------
 po/xfce4-mixer.pot |  178 +++++++++++++-------------
 po/zh_CN.po        |  276 +++++++++++++++++++++++----------------
 po/zh_TW.po        |  277 +++++++++++++++++++++++++--------------
 47 files changed, 8204 insertions(+), 4897 deletions(-)

diff --git a/po/am.po b/po/am.po
index 91234e6..e8049b3 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,37 +7,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer 4.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2007-07-07 10:23+0100\n"
 "Last-Translator: tegegne tefera <tefera at mekuria.com>\n"
 "Language-Team: Amharic <l10n-am at googlegroups.com>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+msgid "No command defined"
 msgstr ""
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -45,153 +44,162 @@ msgid ""
 "providing the full path to the command."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
+#: ../panel-plugin/xfce-plugin-dialog.c:150
 #, fuzzy
-msgid "Mixer Plugin"
+msgid "Audio Mixer Plugin"
 msgstr "ሚክሰር ስየማዎች"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+msgid "Configure the sound card and mixer track"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
 #, fuzzy
-msgid "Sound card"
+msgid "Sound _card:"
 msgstr "ድምጽ"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+msgid "Mixer _track:"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-#, fuzzy
-msgid "Select command"
-msgstr "የተጠቃሚ መቆጣጠሪያዎች"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
 msgstr ""
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
 #, fuzzy
-msgid "Mixer"
+msgid "Audio Mixer"
 msgstr "ሚክስ"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
 msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, fuzzy, c-format
 msgid "Unknown Volume Control %d"
 msgstr "የድምጽ መቆጣጠሪያ"
 
-#: ../xfce4-mixer/main.c:70
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
 #, c-format
-msgid "Failed to initialize xfconf: %s"
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "_Playback"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "C_apture"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
+#: ../xfce4-mixer/xfce-mixer-container.c:218
 #, fuzzy
-msgid "Switches"
+msgid "S_witches"
 msgstr "መቆጣጠሪያዎችን አሳይ"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
+#: ../xfce4-mixer/xfce-mixer-container.c:218
 #, fuzzy
-msgid "Options"
+msgid "_Options"
 msgstr "/ፋይል/ ምርጫዎች _O"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 #, fuzzy
 msgid "Select Controls"
 msgstr "የተጠቃሚ መቆጣጠሪያዎች"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 #, fuzzy
 msgid "_Select Controls..."
 msgstr "የተጠቃሚ መቆጣጠሪያዎች"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
 #, fuzzy
-msgid "Sound card:"
-msgstr "ድምጽ"
+#~ msgid "Sound card"
+#~ msgstr "ድምጽ"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr ""
+#, fuzzy
+#~ msgid "Select command"
+#~ msgstr "የተጠቃሚ መቆጣጠሪያዎች"
 
 #, fuzzy
 #~ msgid "Xfce Mixer"
diff --git a/po/ar.po b/po/ar.po
index fc638fb..108864d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-05-21 00:42+0300\n"
 "Last-Translator: mohammad <malham1 at gmail.com>\n"
 "Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
@@ -22,180 +22,240 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: Morocco\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "لم تعرف أوامر الزر الايسر"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
-msgstr "لم تهيئ أوامر الزر الايسر بعد. يمكنك تغيير خصائص هذه الإضافة."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer غير قادر على الكشف عن أية أجهزة الصوت. قد تكون بعض حزم صوت "
+"GStreamer مفقودة. أو قد يكون مشكلة في الأذونات."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "خصائص"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "لم تعرف أوامر الزر الايسر"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
 msgstr ""
-"لا يمكن تنفيذ الأمر\"%s\". تأكد من تضمينها في مسار القيادة لمتغير البيئة وأنك "
-"وفرت المسار الكامل إلى الأمر."
+"لا يمكن تنفيذ الأمر\"%s\". تأكد من تضمينها في مسار القيادة لمتغير البيئة "
+"وأنك وفرت المسار الكامل إلى الأمر."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer غير قادر على الكشف عن أية أجهزة الصوت. قد تكون بعض حزم صوت "
-"GStreamer مفقودة. أو قد يكون مشكلة في الأذونات."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "ملحق المازج"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "إعداد دمج المسار وأوامر الزر الايسر"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "تكوين بطاقة الصوت(s) والتحكم بحجم مسارات المحددة"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "كرت صوت"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "كرت صوت:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "مازج المقطع"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "أوامر الزر الايسر"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "حدد الأمر"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "جميع الملفات"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "الملفات القابلة للتنفيذ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "سكريبتات بيرل"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "سكريبتات بيتون"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "سكريبتات روبي"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "سكريبتات شيل"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "مازج"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "التحكم في مستوى الصوت لبطاقة الصوت"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "متحكم حجم مجهول %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "فشل التهيئة xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "تشغيل"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "لاقط"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "محولات"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "الخيارات"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "لا متحكمات مرئية"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"لم يتم وضع علامة لتفعيل الضوابط. الرجاء فتح المسار<span size='large'><b>حدد "
-"ضوابط</b></span> لتحديد بعضها."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "اختر المتحكمات"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "تحديد الضوابط المرئية"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_اخرج"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "الخروج من المازج"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_اختر المتحكمات..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "إختر أي متحكم سيتم عرضه"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "تكوين بطاقة الصوت(s) والتحكم بحجم مسارات المحددة"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "كرت صوت:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr "لم تهيئ أوامر الزر الايسر بعد. يمكنك تغيير خصائص هذه الإضافة."
+
+#~ msgid "Properties"
+#~ msgstr "خصائص"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "إعداد دمج المسار وأوامر الزر الايسر"
+
+#~ msgid "Sound card"
+#~ msgstr "كرت صوت"
+
+#~ msgid "Left-click command"
+#~ msgstr "أوامر الزر الايسر"
+
+#~ msgid "Select command"
+#~ msgstr "حدد الأمر"
+
+#~ msgid "All Files"
+#~ msgstr "جميع الملفات"
+
+#~ msgid "Executable Files"
+#~ msgstr "الملفات القابلة للتنفيذ"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "سكريبتات بيرل"
+
+#~ msgid "Python Scripts"
+#~ msgstr "سكريبتات بيتون"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "سكريبتات روبي"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "سكريبتات شيل"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "التحكم في مستوى الصوت لبطاقة الصوت"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "لم يتم وضع علامة لتفعيل الضوابط. الرجاء فتح المسار<span "
+#~ "size='large'><b>حدد ضوابط</b></span> لتحديد بعضها."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "مازج الصوت لسطح المكتب Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "مازج الصوت لسطح المكتب Xfce"
 
 #~ msgid "Xfce Mixer"
 #~ msgstr "مازج إكسفس"
diff --git a/po/ast.po b/po/ast.po
index 648438a..4fd62a7 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,39 +2,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-07-06 16:20+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s : %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Comandu pa clic esquierdu non definíu"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Entá nun se definió dengún comandu pal click esquierdu. Puede camudar esto "
-"nes propiedaes de complementos."
+"GStreamer nun pudo deteutar dengún preséu de soníu. Puede que falten "
+"dalgunos paquetes específicos del sistema de soníu GStreamer. Tamién puede "
+"tratase d'un problema de permisos."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propiedaes"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Comandu pa clic esquierdu non definíu"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -45,148 +46,210 @@ msgstr ""
 "comandu ta incluyía na variable d'entornu PATH o que ta dando la ruta "
 "absoluta del comandu."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer nun pudo deteutar dengún preséu de soníu. Puede que falten "
-"dalgunos paquetes específicos del sistema de soníu GStreamer. Tamién puede "
-"tratase d'un problema de permisos."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Complementu entemecedor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configurar la pista del entemecedor y el comandu de clic esquierdu"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configure la(es) tarxeta(es) de soníu y el control de volume de les pistes "
+"esbillaes"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Tarxeta de soníu"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Tarxeta de soníu:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Pista del entemecedor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comandu de clic esquierdu"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Seleicionar comandu"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tolos ficheros"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Ficheros executables"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Scripts de Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripts de Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripts de shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s : %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Entemecedor"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Control de volume pa la tarxeta de soníu"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Control de volume %d desconocíu"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Fallu al anicializar xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reproducción"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Capturar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Conmutadores"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opciones"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Dengún control visible"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Dengún control ta conseñáu como visible. Por favor, abra'l diálogu <span "
-"size='large'><b>Seleición de controles</b></span> pa esbillar dalgunos."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Seleición de controles"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Esbille qué controles sedrán visibles"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Colar"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Colar del entemecedor"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Seleicionar controles..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Esbille qué controles s'amosarán"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Configure la(es) tarxeta(es) de soníu y el control de volume de les pistes "
 "esbillaes"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Tarxeta de soníu:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Entá nun se definió dengún comandu pal click esquierdu. Puede camudar "
+#~ "esto nes propiedaes de complementos."
+
+#~ msgid "Properties"
+#~ msgstr "Propiedaes"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configurar la pista del entemecedor y el comandu de clic esquierdu"
+
+#~ msgid "Sound card"
+#~ msgstr "Tarxeta de soníu"
+
+#~ msgid "Left-click command"
+#~ msgstr "Comandu de clic esquierdu"
+
+#~ msgid "Select command"
+#~ msgstr "Seleicionar comandu"
+
+#~ msgid "All Files"
+#~ msgstr "Tolos ficheros"
+
+#~ msgid "Executable Files"
+#~ msgstr "Ficheros executables"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts de Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Scripts de Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripts de Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripts de shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Control de volume pa la tarxeta de soníu"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Dengún control ta conseñáu como visible. Por favor, abra'l diálogu <span "
+#~ "size='large'><b>Seleición de controles</b></span> pa esbillar dalgunos."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Entemecedor d'audio pal entornu d'escritoriu Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Entemecedor d'audio pal entornu d'escritoriu Xfce"
diff --git a/po/bg.po b/po/bg.po
index 438ede8..1dd1809 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-12-28 21:46+0200\n"
 "Last-Translator: Milen Milev <fanfolet at gmail.com>\n"
 "Language-Team: Bulgarian <>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,165 +20,237 @@ msgstr ""
 "X-Poedit-Country: BULGARIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Не е зададена команда за изпълнение при ляв клик."
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Все още не е зададена команда за изпълнение при ляв клик."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer не засича звукова карта. Може да липсват специфични GStreamer "
+"пакети. Възможно е да е и проблем с правата."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Настройки"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Не е зададена команда за изпълнение при ляв клик."
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Не може да се изпълни командата \"%s\". Уверете се, че командата и адресът ѝ са правилни."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer не засича звукова карта. Може да липсват специфични GStreamer пакети. Възможно е да е и проблем с правата."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Не може да се изпълни командата \"%s\". Уверете се, че командата и адресът ѝ "
+"са правилни."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Миксер плъгин"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Настройки на миксера и команда при ляв клик"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Настройване на звуковата карта и усилването на звука за избраните"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Звукова карта"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Звукова карта:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Миксер"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Команда при ляв клик"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Избери команда"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Всички файлове"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Изпълними файлове"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl скриптове"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python скриптове"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby скриптове"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell скриптове"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Миксер"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Усилване на звука за Вашата звукова карта"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Непознат контрол на звука %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Не може да се определи xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Изход"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Вход"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Превключватели"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Опции"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Няма видими контроли"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Не са избрани контроли. Моля, отворете <span size='large'><b>Select Controls</b></span> диалога за да изберете някакви."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Избери контроли"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Избери кои контроли да са видими"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Изход"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Изход от миксера"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Избери контроли"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Избери кои контроли да се показват"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Настройване на звуковата карта и усилването на звука за избраните"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Звукова карта:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr "Все още не е зададена команда за изпълнение при ляв клик."
+
+#~ msgid "Properties"
+#~ msgstr "Настройки"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Настройки на миксера и команда при ляв клик"
+
+#~ msgid "Sound card"
+#~ msgstr "Звукова карта"
+
+#~ msgid "Left-click command"
+#~ msgstr "Команда при ляв клик"
+
+#~ msgid "Select command"
+#~ msgstr "Избери команда"
+
+#~ msgid "All Files"
+#~ msgstr "Всички файлове"
+
+#~ msgid "Executable Files"
+#~ msgstr "Изпълними файлове"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl скриптове"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python скриптове"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby скриптове"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell скриптове"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Усилване на звука за Вашата звукова карта"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Звуков миксер за Xfce десктоп среда"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Не са избрани контроли. Моля, отворете <span size='large'><b>Select "
+#~ "Controls</b></span> диалога за да изберете някакви."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Звуков миксер за Xfce десктоп среда"
diff --git a/po/ca.po b/po/ca.po
index 2abc017..cca824a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,40 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-11 12:12+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
 "Language-Team: Catalan\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "No s'ha definit cap ordre pel clic esquerre"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Encara no s'ha definit una ordre pel clic esquerre. Podeu canviar-ho a les "
-"propietats del connector."
+"«GStreamer» no ha pogut detectar cap targeta de so. Pot ser que falti algun "
+"paquet específic del sistema de so de «GStreamer». També pot ser un problema "
+"de permisos."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propietats"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "No s'ha definit cap ordre pel clic esquerre"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -51,151 +52,213 @@ msgstr ""
 "està inclosa en la variable d'entorn «PATH» o que heu posat tot el camí per "
 "l'ordre."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"«GStreamer» no ha pogut detectar cap targeta de so. Pot ser que falti algun "
-"paquet específic del sistema de so de «GStreamer». També pot ser un problema "
-"de permisos."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Connector del mesclador"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configureu la sortida del mesclador i l'ordre del botó esquerra"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configureu la vostra targeta(es) de so i controleu el volum de les sortides "
+"seleccionades"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Targeta de so"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Targeta de so:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Sortida del mesclador"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Ordre pel botó esquerre del ratolí"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Seleccioneu ordre"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tots els fitxers"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Fitxers executables"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Seqüències de Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Seqüències de Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Seqüències de Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Seqüències de l’intèrpret d'ordres"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mesclador"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Control de volum per la vostra targeta de so"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Control de volum %d desconegut"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "No s'ha pogut inicialitzar «xfconf»: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reproducció"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captura"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Commutadors"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opcions"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Cap control visible"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"No s'ha marcar cap control com visible. Obriu la finestra de diàleg <span "
-"size='large'><b>Selecció de controls</b></span> per seleccionar-los."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selecció de controls"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Seleccioneu quins controls es mostraran"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "S_urt"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Surt del mesclador"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Selecció de controls…"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Seleccioneu quins controls es mostren"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Configureu la vostra targeta(es) de so i controleu el volum de les sortides "
 "seleccionades"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Targeta de so:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Encara no s'ha definit una ordre pel clic esquerre. Podeu canviar-ho a "
+#~ "les propietats del connector."
+
+#~ msgid "Properties"
+#~ msgstr "Propietats"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configureu la sortida del mesclador i l'ordre del botó esquerra"
+
+#~ msgid "Sound card"
+#~ msgstr "Targeta de so"
+
+#~ msgid "Left-click command"
+#~ msgstr "Ordre pel botó esquerre del ratolí"
+
+#~ msgid "Select command"
+#~ msgstr "Seleccioneu ordre"
+
+#~ msgid "All Files"
+#~ msgstr "Tots els fitxers"
+
+#~ msgid "Executable Files"
+#~ msgstr "Fitxers executables"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Seqüències de Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Seqüències de Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Seqüències de Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Seqüències de l’intèrpret d'ordres"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Control de volum per la vostra targeta de so"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "No s'ha marcar cap control com visible. Obriu la finestra de diàleg <span "
+#~ "size='large'><b>Selecció de controls</b></span> per seleccionar-los."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mesclador d'àudio per l'entorn d'escriptori Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mesclador d'àudio per l'entorn d'escriptori Xfce"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
diff --git a/po/cs.po b/po/cs.po
index ab763d0..64270fd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,40 +15,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-14 16:09+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Dosud nebyl definován příkaz pro kliknutí levým tlačítkem."
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Dosud nebyl definován příkaz pro kliknutí levým tlačítkem. Nastavíte jej ve "
-"vlastnostech tohoto zásuvného modulu."
+"GStreamer nenašel žádná zvuková zařízení. Pravděpodobně nejsou nainstalované "
+"některé balíčky GStreamer nebo nemáte příslušná oprávnění."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Vlastnosti"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Dosud nebyl definován příkaz pro kliknutí levým tlačítkem."
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -58,149 +58,210 @@ msgstr ""
 "Nelze spustit příkaz \"%s\". Ujistěte se, že je umístění příkazu obsaženo v "
 "proměnné prostředí PATH nebo poskytujete celou cestu k příkazu."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer nenašel žádná zvuková zařízení. Pravděpodobně nejsou nainstalované "
-"některé balíčky GStreamer nebo nemáte příslušná oprávnění."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Zásuvný modul Směšovač"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Nakonfigurujte stopu směšovače a příkazu levého tlačítka myši"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Konfiguruje zvukové karty a ovládá hlasitost vybraných stop"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Zvuková karta"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Zvuková karta:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Směšovač stop"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Příkaz při kliknutí levým tlačítkem"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Vybrat příkaz"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Všechny soubory"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Spustitelné soubory"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Skripty jazyka Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Skripty jazyka Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Skripty jazyka Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skripty shellu"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Směšovač"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Ovládání hlasitosti vaší zvukové karty"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Neznámý ovládací prvek %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Inicializace služby xfconf se nezdařila: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Přehrávání"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Záznam"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Přepínače"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Možnosti"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Žádné ovládací prvky nejsou viditelné"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Žádné ovládací prvky nejsou označeny jako viditelné. Pro výběr těchto prvků "
-"otevřete dialogové okno <span size='large'><b>Vybrat ovládací prvky</b></"
-"span>."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Vybrat ovládací prvky"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Vybere prvky, které mají být zobrazeny"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Ukončit"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Ukončí směšovač"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Vybrat ovládací prvky..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Vybere prvky, které mají být zobrazeny"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Konfiguruje zvukové karty a ovládá hlasitost vybraných stop"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Zvuková karta:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Dosud nebyl definován příkaz pro kliknutí levým tlačítkem. Nastavíte jej "
+#~ "ve vlastnostech tohoto zásuvného modulu."
+
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Nakonfigurujte stopu směšovače a příkazu levého tlačítka myši"
+
+#~ msgid "Sound card"
+#~ msgstr "Zvuková karta"
+
+#~ msgid "Left-click command"
+#~ msgstr "Příkaz při kliknutí levým tlačítkem"
+
+#~ msgid "Select command"
+#~ msgstr "Vybrat příkaz"
+
+#~ msgid "All Files"
+#~ msgstr "Všechny soubory"
+
+#~ msgid "Executable Files"
+#~ msgstr "Spustitelné soubory"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Skripty jazyka Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Skripty jazyka Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Skripty jazyka Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skripty shellu"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Ovládání hlasitosti vaší zvukové karty"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Žádné ovládací prvky nejsou označeny jako viditelné. Pro výběr těchto "
+#~ "prvků otevřete dialogové okno <span size='large'><b>Vybrat ovládací "
+#~ "prvky</b></span>."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Směšovač zvuku pro pracovní prostředí Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Směšovač zvuku pro pracovní prostředí Xfce"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
diff --git a/po/da.po b/po/da.po
index 8c371c0..8bef111 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-mixer 4.5.93\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-23 11:46+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,31 +20,31 @@ msgstr ""
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Ingen venstrekliks-kommando defineret"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Ingen venstrekliks-kommando defineret endnu. Du kan ændre dette i egenskaber "
-"for udvidelsesmodulet."
+"GStreamer kunne ikke finde nogle lydkort på dit system. Det kan være du "
+"mangler nogle specifikke GStreamer-pakker. Eller det kan være et problem med "
+"rettigheder til lydkortet."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Egenskaber"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Ingen venstrekliks-kommando defineret"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -54,146 +55,206 @@ msgstr ""
 "kommandoen er med i PATH's miljøvariabel, eller at du angiver den fulde sti "
 "til kommandoen."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer kunne ikke finde nogle lydkort på dit system. Det kan være du "
-"mangler nogle specifikke GStreamer-pakker. Eller det kan være et problem med "
-"rettigheder til lydkortet."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mikser-udvidelsesmodul"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Indstil miksersporet og venstreklik-kommandoen"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Indstil dit(ne) lydkort og kontrollér lydstyrken af valgte spor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Lydkort"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Lydkort:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Mikserspor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Venstrekliks-kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Vælg kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alle filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Kørbare filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl-skripter"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python-skripter"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby-skripter"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skalskripter"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mikser"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Lydstyrkekontrol til dit lydkort"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Ukendt lydstyrkekontrol %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Kunne ikke klargøre xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Afspil"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Indspil"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Kontakter"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Indstillinger"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ingen synlige kontroller"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Ingen kontroller er markeret som synlige. Åben <span size='large'><b>Vælg "
-"kontroller</b></span> dialogen for at vælge nogle."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Vælg kontroller"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Vælg hvilke kontroller der skal være synlige"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Afslut mikser"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Vælg kontroller..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Vælg hvilke kontroller der skal vises"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Indstil dit(ne) lydkort og kontrollér lydstyrken af valgte spor"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Lydkort:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Ingen venstrekliks-kommando defineret endnu. Du kan ændre dette i "
+#~ "egenskaber for udvidelsesmodulet."
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaber"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Indstil miksersporet og venstreklik-kommandoen"
+
+#~ msgid "Sound card"
+#~ msgstr "Lydkort"
+
+#~ msgid "Left-click command"
+#~ msgstr "Venstrekliks-kommando"
+
+#~ msgid "Select command"
+#~ msgstr "Vælg kommando"
+
+#~ msgid "All Files"
+#~ msgstr "Alle filer"
+
+#~ msgid "Executable Files"
+#~ msgstr "Kørbare filer"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-skripter"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python-skripter"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby-skripter"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skalskripter"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Lydstyrkekontrol til dit lydkort"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ingen kontroller er markeret som synlige. Åben <span size='large'><b>Vælg "
+#~ "kontroller</b></span> dialogen for at vælge nogle."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Lydmikser til Xfce-skrivebordsmiljøet"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Lydmikser til Xfce-skrivebordsmiljøet"
diff --git a/po/de.po b/po/de.po
index 47cd07a..b70ecce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,40 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer 4.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-26 01:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-31 16:03+0100\n"
 "Last-Translator: Enrico Tröger <enrico at xfce.org>\n"
 "Language-Team: German <xfce-i18n-de at xfce.org>\n"
+"Language: de\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Kein Befehl für den Linksklick definiert"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Es wurde noch kein Befehl für den Linksklick definiert. Dieser kann in den "
-"Eigenschaften des Plugins ausgewählt werden."
+"GStreamer konnte keine Soundkarten finden. Möglicherweise sind Pakete für "
+"das verwendete Soundsystem noch nicht installiert. Ebenso könnte es ein "
+"Problem mit den Benutzerrechten sein."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Eigenschaften"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Kein Befehl für den Linksklick definiert"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -53,152 +54,214 @@ msgstr ""
 "Konnte den Befehl »%s« nicht ausführen. Stellen Sie sicher, dass der Befehl "
 "existiert und der angegebene Pfad korrekt ist."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer konnte keine Soundkarten finden. Möglicherweise sind Pakete für "
-"das verwendete Soundsystem noch nicht installiert. Ebenso könnte es ein "
-"Problem mit den Benutzerrechten sein."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Lautstärkeregelung"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfiguration von Bedienelementen und dem Befehl für den Linksklick"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Konfigurieren Sie Ihre Soundkarte(n) und regeln Sie die Lautstärke "
+"ausgewählter Elemente"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Soundkarte"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Soundkarte:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Element"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Befehl bei Linksklick"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Befehl auswählen"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alle Dateien"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Ausführbare Dateien"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl-Skripte"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python-Skripte"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby-Skripte"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell-Skripte"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Lautstärkeregelung"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Lautstärkeregelung für Ihre Soundkarte"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Unbekannter Lautstärkeregler %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Konnte xfconf nicht initialisieren. Grund: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Wiedergabe"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Aufnahme"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Schalter"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Optionen"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Keine Bedienelemente sichtbar"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Es sind keine Bedienelemente als sichtbar vermerkt. Bitte benutzen Sie den "
-"Dialog <span size='large'><b>Elemente auswählen</b></span>, um Elemente "
-"auszuwählen."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Elemente auswählen"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Wählen Sie Bedienelemente aus, die angezeigt werden sollen"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "B_eenden"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Lautstärkeregelung verlassen"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Elemente au_swählen..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Auswählen, welche Bedienelemente angezeigt werden"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Konfigurieren Sie Ihre Soundkarte(n) und regeln Sie die Lautstärke "
 "ausgewählter Elemente"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Soundkarte:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Es wurde noch kein Befehl für den Linksklick definiert. Dieser kann in "
+#~ "den Eigenschaften des Plugins ausgewählt werden."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Lautstärkeregelung"
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfiguration von Bedienelementen und dem Befehl für den Linksklick"
+
+#~ msgid "Sound card"
+#~ msgstr "Soundkarte"
+
+#~ msgid "Left-click command"
+#~ msgstr "Befehl bei Linksklick"
+
+#~ msgid "Select command"
+#~ msgstr "Befehl auswählen"
+
+#~ msgid "All Files"
+#~ msgstr "Alle Dateien"
+
+#~ msgid "Executable Files"
+#~ msgstr "Ausführbare Dateien"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-Skripte"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python-Skripte"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby-Skripte"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell-Skripte"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Lautstärkeregelung für Ihre Soundkarte"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Es sind keine Bedienelemente als sichtbar vermerkt. Bitte benutzen Sie "
+#~ "den Dialog <span size='large'><b>Elemente auswählen</b></span>, um "
+#~ "Elemente auszuwählen."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Lautstärkeregelung"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
diff --git a/po/el.po b/po/el.po
index 95de901..49d7d10 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,174 +7,252 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2010-06-20 18:43+0200\n"
 "Last-Translator: Spiros Georgaras <sng at hellug.gr>\n"
 "Language-Team: el\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Bookmarks: 4,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Δεν έχει οριστεί εντολή αριστερού κλικ"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Δεν έχει οριστεί ακόμα κάποια εντολή αριστερού κλικ. Μπορείτε να την ορίσετε στις ιδιότητες του αρθρώματος."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"Το GStreamer δεν εντόπισε καμία συσκευή ήχου. Κάποια πακέτα του GStreamer "
+"μπορεί να μην είναι εγκατεστημένα. Μπορεί επίσης να υπάρχει πρόβλημα "
+"δικαιωμάτων πρόσβασης."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Ιδιότητες"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Δεν έχει οριστεί εντολή αριστερού κλικ"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Δεν είναι δυνατή η εκτέλεση της εντολής \"%s\". Σιγουρευτείτε ότι η διαδρομή όπου βρίσκεται η εντολή περιλαμβάνεται στη μεταβλητή περιβάλλοντος PATH, ή ότι έχετε δώσει την πλήρη διαδρομή της εντολής."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "Το GStreamer δεν εντόπισε καμία συσκευή ήχου. Κάποια πακέτα του GStreamer μπορεί να μην είναι εγκατεστημένα. Μπορεί επίσης να υπάρχει πρόβλημα δικαιωμάτων πρόσβασης."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Δεν είναι δυνατή η εκτέλεση της εντολής \"%s\". Σιγουρευτείτε ότι η διαδρομή "
+"όπου βρίσκεται η εντολή περιλαμβάνεται στη μεταβλητή περιβάλλοντος PATH, ή "
+"ότι έχετε δώσει την πλήρη διαδρομή της εντολής."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Άρθρωμα μίκτη"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Ρυθμίστε το κανάλι του μίκτη και την εντολή αριστερού κλικ"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Ρυθμίστε τις κάρτες ήχου σας και την ένταση επιλεγμένων καναλιών"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Κάρτα ήχου"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Κάρτα ήχου:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Κανάλι μίκτη"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Εντολή αριστερού κλικ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Επιλογή εντολής"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Όλα τα αρχεία"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Εκτελέσιμα αρχεία"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Δέσμες ενεργειών Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Δέσμες ενεργειών Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Δέσμες ενεργειών Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Δέσμες ενεργειών κέλυφους"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Μίκτης"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Ρύθμιση έντασης ήχου της κάρτας ήχου σας"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Άγνωστο ρυθμιστικό έντασης %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Αποτυχία της αρχικοποίησης του xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Αναπαραγωγή"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Ηχογράφηση"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Διακόπτες"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Επιλογές"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Κανένα ρυθμιστικό ορατό"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Κανένα ρυθμιστικό δεν έχει σημειωθεί ως ορατό. Παρακαλώ ανοίξτε το διάλογο <span size='large'><b>Επιλογή ρυθμιστικών</b></span> για να επιλέξετε κάποια από αυτά."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Επιλογή ρυθμιστικών"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Επιλέξτε τα ρυθμιστικά που θα είναι ορατά"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Έ_ξοδος"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Έξοδος από το μίκτη"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Επιλογή ρυθμι_στικών..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Επιλέξτε ποιά ρυθμιστικά θα είναι ορατά"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Ρυθμίστε τις κάρτες ήχου σας και την ένταση επιλεγμένων καναλιών"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Κάρτα ήχου:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Δεν έχει οριστεί ακόμα κάποια εντολή αριστερού κλικ. Μπορείτε να την "
+#~ "ορίσετε στις ιδιότητες του αρθρώματος."
+
+#~ msgid "Properties"
+#~ msgstr "Ιδιότητες"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Ρυθμίστε το κανάλι του μίκτη και την εντολή αριστερού κλικ"
+
+#~ msgid "Sound card"
+#~ msgstr "Κάρτα ήχου"
+
+#~ msgid "Left-click command"
+#~ msgstr "Εντολή αριστερού κλικ"
+
+#~ msgid "Select command"
+#~ msgstr "Επιλογή εντολής"
+
+#~ msgid "All Files"
+#~ msgstr "Όλα τα αρχεία"
+
+#~ msgid "Executable Files"
+#~ msgstr "Εκτελέσιμα αρχεία"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Δέσμες ενεργειών Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Δέσμες ενεργειών Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Δέσμες ενεργειών Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Δέσμες ενεργειών κέλυφους"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Ρύθμιση έντασης ήχου της κάρτας ήχου σας"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Μίκτης ήχου για το Περιβάλλον Εργασίας Xfce"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Κανένα ρυθμιστικό δεν έχει σημειωθεί ως ορατό. Παρακαλώ ανοίξτε το "
+#~ "διάλογο <span size='large'><b>Επιλογή ρυθμιστικών</b></span> για να "
+#~ "επιλέξετε κάποια από αυτά."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Μίκτης ήχου για το Περιβάλλον Εργασίας Xfce"
diff --git a/po/en_GB.po b/po/en_GB.po
index e41cf6e..8b9a98f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,39 +7,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-08-18 16:49+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: en_GB\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "No left-click command defined"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Properties"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "No left-click command defined"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -50,145 +50,206 @@ msgstr ""
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mixer Plugin"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configure the mixer track and left-click command"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Configure sound card(s) and control the volume of selected tracks"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Sound card"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Sound card:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Mixer track"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Left-click command"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Select command"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "All Files"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Executable Files"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl Scripts"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python Scripts"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby Scripts"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell Scripts"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Volume control for your sound card"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Unknown Volume Control %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Failed to initialise xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Playback"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Capture"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Switches"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Options"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "No controls visible"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialogue to select some."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Select Controls"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Select which controls should be visible"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Exit the mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Select Controls..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Select which controls are displayed"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Configure sound card(s) and control the volume of selected tracks"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Sound card:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+
+#~ msgid "Properties"
+#~ msgstr "Properties"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configure the mixer track and left-click command"
+
+#~ msgid "Sound card"
+#~ msgstr "Sound card"
+
+#~ msgid "Left-click command"
+#~ msgstr "Left-click command"
+
+#~ msgid "Select command"
+#~ msgstr "Select command"
+
+#~ msgid "All Files"
+#~ msgstr "All Files"
+
+#~ msgid "Executable Files"
+#~ msgstr "Executable Files"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl Scripts"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python Scripts"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby Scripts"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell Scripts"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Volume control for your sound card"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialogue to select some."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Audio mixer for the Xfce Desktop Environment"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Audio mixer for the Xfce Desktop Environment"
diff --git a/po/es.po b/po/es.po
index 604c5e2..742833f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,176 +7,259 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-03-19 16:51+0100\n"
 "Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
 "Language-Team: Spanish/ES <xfce-i18n at xfce.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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s : %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Comando para clic izquierdo no definido"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Todavía no se ha definido ningún comando para el clic izquierdo. Puede cambiar esto en la propiedades de complementos."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer no pudo detectar ningún dispositivo de sonido. Puede que falten "
+"algunos paquetes específicos del sistema de sonido GStreamer. También puede "
+"tratarse de un problema de permisos."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propiedades"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Comando para clic izquierdo no definido"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "No se pudo ejecutar el comando \"%s\". Compruebe que la localización del comando está incluida en la variable de entorno PATH o que está dando la ruta absoluta del comando."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer no pudo detectar ningún dispositivo de sonido. Puede que falten algunos paquetes específicos del sistema de sonido GStreamer. También puede tratarse de un problema de permisos."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"No se pudo ejecutar el comando \"%s\". Compruebe que la localización del "
+"comando está incluida en la variable de entorno PATH o que está dando la "
+"ruta absoluta del comando."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Complemento mezclador"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configurar la pista del mezclador y el comando de clic izquierdo"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configure la(s) tarjeta(s) de sonido y el control de volumen de las pistas "
+"seleccionadas"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Tarjeta de sonido"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Tarjeta de sonido:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Pista del mezclador"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comando de clic izquierdo"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Seleccionar comando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Todos los archivos"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Archivos ejecutables"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripts de Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Scripts de Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripts de Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripts de shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s : %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mezclador"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Control de volumen para la tarjeta de sonido"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Control de volumen %d desconocido"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Fallo al inicializar xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reproducción"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Capturar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Conmutadores"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opciones"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ningún control visible"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Ningún control está marcado como visible. Por favor, abra el diálogo <span size='large'><b>Selección de controles</b></span> para seleccionar algunos."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selección de controles"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Seleccione qué controles serán visibles"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Salir del mezclador"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Seleccionar controles..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Seleccione qué controles se mostrarán"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Configure la(s) tarjeta(s) de sonido y el control de volumen de las pistas seleccionadas"
+msgstr ""
+"Configure la(s) tarjeta(s) de sonido y el control de volumen de las pistas "
+"seleccionadas"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Tarjeta de sonido:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Todavía no se ha definido ningún comando para el clic izquierdo. Puede "
+#~ "cambiar esto en la propiedades de complementos."
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configurar la pista del mezclador y el comando de clic izquierdo"
+
+#~ msgid "Sound card"
+#~ msgstr "Tarjeta de sonido"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mezclador de audio para el entorno de escritorio Xfce"
+#~ msgid "Left-click command"
+#~ msgstr "Comando de clic izquierdo"
+
+#~ msgid "Select command"
+#~ msgstr "Seleccionar comando"
+
+#~ msgid "All Files"
+#~ msgstr "Todos los archivos"
+
+#~ msgid "Executable Files"
+#~ msgstr "Archivos ejecutables"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts de Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Scripts de Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripts de Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripts de shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Control de volumen para la tarjeta de sonido"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ningún control está marcado como visible. Por favor, abra el diálogo "
+#~ "<span size='large'><b>Selección de controles</b></span> para seleccionar "
+#~ "algunos."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mezclador de audio para el entorno de escritorio Xfce"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
@@ -184,16 +267,21 @@ msgstr "Mezclador de audio para el entorno de escritorio Xfce"
 #~ msgstr ""
 #~ "No se pudo ejecutar el comando %s. Quizás necesite ajustar la variable "
 #~ "PATH."
+
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr ""
 #~ "Por favor, seleccione qué pista del mezclador debería ser utilizado por "
 #~ "el complemento"
+
 #~ msgid "Please select which controls you want to be visible"
 #~ msgstr "Por favor, seleccione qué controles quiere que sean visibles"
+
 #~ msgid "A comfortable audio mixer for your sound card."
 #~ msgstr "Un confortable mixer audio pour votre carte son"
+
 #~ msgid "Xfce Mixer"
 #~ msgstr "Mixer Xfce"
+
 #~ msgid ""
 #~ "No sound cards could be found. You may have to install additional "
 #~ "gstreamer packages for ALSA or OSS support."
@@ -201,4 +289,3 @@ msgstr "Mezclador de audio para el entorno de escritorio Xfce"
 #~ "Aucune carte son n'a pu être trouvé. Vous avez peut-être besoin "
 #~ "d'installer des paquets gstreamer supplémentaires pour le support de ALSA "
 #~ "ou OSS."
-
diff --git a/po/eu.po b/po/eu.po
index e6ece8a..6699801 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,41 +9,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-11-27 00:30+0100\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque at lists.debian.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: KBabel 1.11.4\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %%%i"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Ez dago ezker-klik komando ezarririk"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Ez dago ezker-klik komando ezarririk oraindik. Hau plugin propietatean "
-"aldatu dezakezu."
+"GStramer ez da  soinu txartelik aurkitzeko gia. Zenait soinu sistemak  "
+"Gstreamer pakete zehatzen bat behar dute. Hau baimen arazo bat ere izan "
+"daiteke."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propietateak"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Ez dago ezker-klik komando ezarririk"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -54,151 +55,212 @@ msgstr ""
 "ingurune bidean konfiguraturik dagoela edo komandoaren bide osoa ezartzen "
 "duzula."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStramer ez da  soinu txartelik aurkitzeko gia. Zenait soinu sistemak  "
-"Gstreamer pakete zehatzen bat behar dute. Hau baimen arazo bat ere izan "
-"daiteke."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Nahastaile plugina"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfiguratu nahasle pista eta ezker-klik komandoa"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Konfiguratu soinu txartela(k) eta kontrolatu hautatutako pisten bolumena"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Soinu txartela"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Soinu txartela:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Nahastaile pista"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Ezker-klik komandoa"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Hautatu komandoa"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Fitxategi denak"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Fitxategi exekutagarriak"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl skript-ak"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python skript-ak"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby skript-ak"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell skript-ak"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %%%i"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Nahastailea"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Zure soinu txartelaren bolumen kontrola"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "%d bolumen-kontrol ezezaguna"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Huts egin du xfconf exekutatzean: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Erreproduzitu"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Kapturatu"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Kommutadoreak"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Aukerak"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ez kontrolik ikusgai"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Ez dago kontrolik ikusgarri bezala markaturik. Mesedez ireki <span "
-"size='large'><b>Hautatu kontrolak</b></span> elkarrizketa eta batenbat "
-"hautatu."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Hautatu kontrolak"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Hautatu zein kontrol bistaraziko diren"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Irte_n"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Nahasletik irten"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Hautatu kontrolak..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Hautatu zein kontrol bistaraziko diren"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Konfiguratu soinu txartela(k) eta kontrolatu hautatutako pisten bolumena"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Soinu txartela:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Ez dago ezker-klik komando ezarririk oraindik. Hau plugin propietatean "
+#~ "aldatu dezakezu."
+
+#~ msgid "Properties"
+#~ msgstr "Propietateak"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfiguratu nahasle pista eta ezker-klik komandoa"
+
+#~ msgid "Sound card"
+#~ msgstr "Soinu txartela"
+
+#~ msgid "Left-click command"
+#~ msgstr "Ezker-klik komandoa"
+
+#~ msgid "Select command"
+#~ msgstr "Hautatu komandoa"
+
+#~ msgid "All Files"
+#~ msgstr "Fitxategi denak"
+
+#~ msgid "Executable Files"
+#~ msgstr "Fitxategi exekutagarriak"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl skript-ak"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python skript-ak"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby skript-ak"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell skript-ak"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Zure soinu txartelaren bolumen kontrola"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ez dago kontrolik ikusgarri bezala markaturik. Mesedez ireki <span "
+#~ "size='large'><b>Hautatu kontrolak</b></span> elkarrizketa eta batenbat "
+#~ "hautatu."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce idazmahai ingurunearen audio nahasgailua"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce idazmahai ingurunearen audio nahasgailua"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
diff --git a/po/fi.po b/po/fi.po
index 48d91b6..9802969 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,39 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-12-13 16:48+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Vasemman napsautuksen komentoa ei määritetty"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Vasemmalle hiiren painikkeelle ei ole määritetty komentoa. Voit määrittää "
-"sen liitännäisen ominaisuuksista."
+"GStreamer ei löydä äänilaitteita. Voi olla, että sinulta puuttuu "
+"äänijärjestelmääsi liittyviä GStreamerin liitännäisiä. Tämä voi johtua myös "
+"käyttöoikeusongelmasta."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Ominaisuudet"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Vasemman napsautuksen komentoa ei määritetty"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -50,147 +51,208 @@ msgstr ""
 "Komennon \"%s\" suorittaminen epäonnistui. Varmista, että komennon sijainti "
 "löytyy PATH-ympäristömuuttujasta tai että syötit komennon polkuineen."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer ei löydä äänilaitteita. Voi olla, että sinulta puuttuu "
-"äänijärjestelmääsi liittyviä GStreamerin liitännäisiä. Tämä voi johtua myös "
-"käyttöoikeusongelmasta."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Äänenvoimakkuusliitännäinen"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Aseta säädettävä kanava ja napsauttaessa suoritettava komento"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Säädä äänilaitte(id)en asetuksia ja valitsemiesi kanavien äänenvoimakkuutta"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
 msgstr "Äänikortti"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Äänikanava"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Vasen napsautus"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Valitse komento"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Kaikki tiedostot"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Suoritettavat tiedostot"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl-komentosarjat"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python-komentosarjat"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby-komentosarjat"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Päätekomentosarjat"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Äänenvoimakkuus"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Äänikorttisi äänenvoimakkuuksien säätö"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Tuntematon äänen säädin %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconfin alustus epäonnistui: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Toisto"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Kaappaus"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Kytkimet"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Asetukset"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ei säätimiä näkyvillä"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Yhtään säädintä ei ole asetettu näkyväksi. Ole hyvä ja valitse näkyvät "
-"säätimet <span size='large'><b>Valitse säätimet</b></span> -dialogista."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Valitse säätimet"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Valitse näytettävät säätimet"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Poistu"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Lopeta äänen säätö"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Valitse säätimet..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Valitse näytettävät säätimet"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Säädä äänilaitte(id)en asetuksia ja valitsemiesi kanavien äänenvoimakkuutta"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Äänikortti"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Vasemmalle hiiren painikkeelle ei ole määritetty komentoa. Voit määrittää "
+#~ "sen liitännäisen ominaisuuksista."
+
+#~ msgid "Properties"
+#~ msgstr "Ominaisuudet"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Aseta säädettävä kanava ja napsauttaessa suoritettava komento"
+
+#~ msgid "Sound card"
+#~ msgstr "Äänikortti"
+
+#~ msgid "Left-click command"
+#~ msgstr "Vasen napsautus"
+
+#~ msgid "Select command"
+#~ msgstr "Valitse komento"
+
+#~ msgid "All Files"
+#~ msgstr "Kaikki tiedostot"
+
+#~ msgid "Executable Files"
+#~ msgstr "Suoritettavat tiedostot"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-komentosarjat"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python-komentosarjat"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby-komentosarjat"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Päätekomentosarjat"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Äänikorttisi äänenvoimakkuuksien säätö"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Yhtään säädintä ei ole asetettu näkyväksi. Ole hyvä ja valitse näkyvät "
+#~ "säätimet <span size='large'><b>Valitse säätimet</b></span> -dialogista."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Äänenvoimakkuuden säätöohjelma Xfce-työpöytäympäristöön"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Äänenvoimakkuuden säätöohjelma Xfce-työpöytäympäristöön"
diff --git a/po/fr.po b/po/fr.po
index 784c7cb..c203d8f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,40 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-10-07 22:18+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet at xfce.org>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
+"Language: fr\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s : %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Pas de commande définie pour clic-gauche"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Pas de commande définie pour clic-gauche. Vous pouvez le faire dans les "
-"propriétés du greffon."
+"GStreamer n'a pas détecté de cartes son. Certains paquets de GStreamer "
+"peuvent être manquants. Il peut aussi s'agir d'un problème de permissions."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propriétés"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Pas de commande définie pour clic-gauche"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -52,145 +52,206 @@ msgstr ""
 "commande est inclue dans la variable d'environnement PATH ou que vous "
 "fournisser le chemin complet vers la commande."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer n'a pas détecté de cartes son. Certains paquets de GStreamer "
-"peuvent être manquants. Il peut aussi s'agir d'un problème de permissions."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configurer le greffon"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Configurer la carte son et contrôler le volume"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Carte son"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Carte son :"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Piste mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Commande clic-gauche"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Sélectionnez une commande"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tous les fichiers"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Fichiers exécutables"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripts Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Scripts Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripts Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripts Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s : %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Contrôle du volume pour votre carte son"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Périphérique inconnu %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Échec à l'initialisation de xfconf : %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Contrôles"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captures"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Interrupteurs"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Options"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Aucun contrôle visible"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Aucun contrôle n'est marqué en tant que visible.  Cliquez sur le bouton "
-"<span size='large'><b>Contrôles</b></span> afin d'en ajouter."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Sélection des contrôles"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Sélectionner les contrôles à afficher"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Quitter le mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Contrôles"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Sélectionner les contrôles visibles"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Configurer la carte son et contrôler le volume"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Carte son :"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Pas de commande définie pour clic-gauche. Vous pouvez le faire dans les "
+#~ "propriétés du greffon."
+
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configurer le greffon"
+
+#~ msgid "Sound card"
+#~ msgstr "Carte son"
+
+#~ msgid "Left-click command"
+#~ msgstr "Commande clic-gauche"
+
+#~ msgid "Select command"
+#~ msgstr "Sélectionnez une commande"
+
+#~ msgid "All Files"
+#~ msgstr "Tous les fichiers"
+
+#~ msgid "Executable Files"
+#~ msgstr "Fichiers exécutables"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Scripts Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripts Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripts Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Contrôle du volume pour votre carte son"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Aucun contrôle n'est marqué en tant que visible.  Cliquez sur le bouton "
+#~ "<span size='large'><b>Contrôles</b></span> afin d'en ajouter."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mixer audio pour l'environnement Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mixer audio pour l'environnement Xfce"
diff --git a/po/gl.po b/po/gl.po
index d681a38..168ed01 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,176 +11,256 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer 4.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2010-11-02 18:12+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
+"Language: gl\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Non se definiu ningunha orde para o clic do botón esquerdo"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Aínda non se definiu ningunha orde para o clic do botón esquerdo. Pode cambiar isto nas propiedades do engadido."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer non foi capaz de detectar ningún dispositivo de son. Pode que "
+"falten algúns paquetes de GStreamer específicos para o sistema de son. Tamén "
+"podería ser un problema de permisos."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propiedades"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Non se definiu ningunha orde para o clic do botón esquerdo"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Non foi posible executar a orde \"%s\". Asegúrese de que a localización da orde está incluída na variable de contorno PATH ou de que está proporcionando a ruta completa á orde."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer non foi capaz de detectar ningún dispositivo de son. Pode que falten algúns paquetes de GStreamer específicos para o sistema de son. Tamén podería ser un problema de permisos."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Non foi posible executar a orde \"%s\". Asegúrese de que a localización da "
+"orde está incluída na variable de contorno PATH ou de que está "
+"proporcionando a ruta completa á orde."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Engadido de mesturador"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configurar a pista do mesturador e a orde do clic co botón esquerdo"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configura as tarxetas de son e controla o volume das pistas seleccionadas"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Tarxeta de son"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Tarxeta de son:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Mesturador de pistas"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Orde do clic do botón esquerdo"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Seleccione unha orde"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tódolos ficheiros"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Ficheiros executables"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripts en Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Scripts en Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripts en Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripts de Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mesturador"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Control de volume para a tarxeta de son"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Control de volume descoñecido %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Fallo ó iniciar xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reprodución"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captura"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Mandos"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opcións"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Non mostra ningún control"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Non hai ningún control marcado coma visible. Abra o diálogo <span size='large'><b>Seleccionar controis</b></span> para seleccionar algúns."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Seleccionar controis"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Seleccione que controis se mostran"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Saír do mesturador"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Seleccionar controis..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Seleccione que controis se mostran"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Configura as tarxetas de son e controla o volume das pistas seleccionadas"
+msgstr ""
+"Configura as tarxetas de son e controla o volume das pistas seleccionadas"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Tarxeta de son:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Aínda non se definiu ningunha orde para o clic do botón esquerdo. Pode "
+#~ "cambiar isto nas propiedades do engadido."
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mesturador de audio do ambiente de escritorio Xfce"
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configurar a pista do mesturador e a orde do clic co botón esquerdo"
+
+#~ msgid "Sound card"
+#~ msgstr "Tarxeta de son"
+
+#~ msgid "Left-click command"
+#~ msgstr "Orde do clic do botón esquerdo"
+
+#~ msgid "Select command"
+#~ msgstr "Seleccione unha orde"
+
+#~ msgid "All Files"
+#~ msgstr "Tódolos ficheiros"
+
+#~ msgid "Executable Files"
+#~ msgstr "Ficheiros executables"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts en Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Scripts en Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripts en Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripts de Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Control de volume para a tarxeta de son"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Non hai ningún control marcado coma visible. Abra o diálogo <span "
+#~ "size='large'><b>Seleccionar controis</b></span> para seleccionar algúns."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mesturador de audio do ambiente de escritorio Xfce"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
@@ -188,8 +268,9 @@ msgstr "Mesturador de audio do ambiente de escritorio Xfce"
 #~ msgstr ""
 #~ "Non se puido executar o comando %s. Quizais teña que axustar a variable "
 #~ "PATH."
+
 #~ msgid "Please select which controls you want to be visible"
 #~ msgstr "Seleccione que controis desexa que estean visibles"
+
 #~ msgid "Could not find xfce4-mixer in PATH."
 #~ msgstr "Non se puido atopar xfce4-mixer no PATH."
-
diff --git a/po/he.po b/po/he.po
index e5b7d2c..ea3857c 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-08-20 10:43+0200\n"
 "Last-Translator: Isratine Citizen <genghiskhan at gmx.ca>\n"
 "Language-Team:  <xfce-i18n at xfce.org>\n"
@@ -17,170 +17,242 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Hebrew\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "‫%s: ‫%i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-# I did not use "־" since the developer has used "-" already
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "לא הוגדרה פקודת קליק-שמאלי"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "לא הוגדרה פקודת קליק-שמאלי, עדיין. ביכולתך לשנות זאת במאפייני תוסף."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"‏GStreamer לא יכול היה לאתר תקן קול כלשהו. ייתכן שחבילות מערכת קול סגוליות של "
+"GStreamer חסרות. ייתכן ובעיה זו קשורה אל הרשאות."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "מאפיינים"
+# I did not use "־" since the developer has used "-" already
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "לא הוגדרה פקודת קליק-שמאלי"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "לא ניתן להריץ את הפקודה \"%s\". נא לוודא שהמיקום של הפקודה הינו כלול בתוך משתני סביבת PATH או שהינך מספק/ת את הנתיב המלא אל הפקודה."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "‏GStreamer לא יכול היה לאתר תקן קול כלשהו. ייתכן שחבילות מערכת קול סגוליות של GStreamer חסרות. ייתכן ובעיה זו קשורה אל הרשאות."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"לא ניתן להריץ את הפקודה \"%s\". נא לוודא שהמיקום של הפקודה הינו כלול בתוך "
+"משתני סביבת PATH או שהינך מספק/ת את הנתיב המלא אל הפקודה."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "תוסף Mixer"
 
-# Not רצועה
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "הגדרת ערוץ המערבל ופקודת קליק-שמאלי"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "הגדרת כרטיס(י) קול וניהול עוצמת השמע של ערוצים נבחרים"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "כרטיס קול"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "כרטיס קול:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "ערוץ מערבל"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "פקודת קליק-שמאלי"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "בחיררת פקודה"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "כל הקבצים"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "קבצים ברי־הרצה"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "תסריטי Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "תסריטי Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "תסריטי Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "תסריטי Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "‫%s: ‫%i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "מערבל"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "בקרת עוצמת שמע עבור כרטיס הקול שלך"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
 # מוכרת
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "בקרת עוצמת שמע לא ידועה %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "כשל באתחול xfconf: ‫%s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "השמעה"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "לכידה"
 
 # מפסקים
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "מתגים"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "אפשרויות"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "אין בקרים נראים"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "אין בקרים שמסומנים כנראים. נא לפתוח את דו־שיח <span size='large'><b>בחירת בקרים</b></span> כדי לבחור בקרים מסוימים."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "בחירת בקרים"
 
 # בחירת אילו בקרים צריכים להיראות
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "בחירה על אילו בקרים להיראות"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "י_ציאה"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "יציאה מן המערבל"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_בחירת בקרים..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "בחירת אילו בקרים נראים"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "הגדרת כרטיס(י) קול וניהול עוצמת השמע של ערוצים נבחרים"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "כרטיס קול:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr "לא הוגדרה פקודת קליק-שמאלי, עדיין. ביכולתך לשנות זאת במאפייני תוסף."
+
+#~ msgid "Properties"
+#~ msgstr "מאפיינים"
+
+# Not רצועה
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "הגדרת ערוץ המערבל ופקודת קליק-שמאלי"
+
+#~ msgid "Sound card"
+#~ msgstr "כרטיס קול"
+
+#~ msgid "Left-click command"
+#~ msgstr "פקודת קליק-שמאלי"
+
+#~ msgid "Select command"
+#~ msgstr "בחיררת פקודה"
+
+#~ msgid "All Files"
+#~ msgstr "כל הקבצים"
+
+#~ msgid "Executable Files"
+#~ msgstr "קבצים ברי־הרצה"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "תסריטי Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "תסריטי Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "תסריטי Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "תסריטי Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "בקרת עוצמת שמע עבור כרטיס הקול שלך"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "מערבל שמע עבור סביבת העבודה Xfce"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "אין בקרים שמסומנים כנראים. נא לפתוח את דו־שיח <span size='large'><b>בחירת "
+#~ "בקרים</b></span> כדי לבחור בקרים מסוימים."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "מערבל שמע עבור סביבת העבודה Xfce"
diff --git a/po/hr.po b/po/hr.po
index 9a8d1a8..121ec7d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-10-31 00:38+0100\n"
 "Last-Translator: Ivica Kolić <ikoli at yahoo.com>\n"
 "Language-Team: Croatian <ikoli at yahoo.com>\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,165 +21,220 @@ msgstr ""
 "X-Poedit-Country: CROATIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nijedna naredba lijevim klikom nije definirana"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Nijedna naredba lijevim klikom nije još definirana.To možete promijeniti u svojstvima priključka."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Svojstva"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nijedna naredba lijevim klikom nije definirana"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr ""
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+msgid "Audio Mixer Plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+msgid "Configure the sound card and mixer track"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Zvučna kartica"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Zvučna kartica:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+msgid "Mixer _track:"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Naredba lijevim klikom"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Odaberite naredbu"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Sve datoteke"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Izvršne datoteke"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl skripte"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python skripte"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby skripte"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
 msgstr ""
 
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
+
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+msgid "Audio Mixer"
 msgstr ""
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Kontrola jačine zvuka za vašu zvučnu karticu"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Nepoznata kontrola jačine zvuka %d"
 
-#: ../xfce4-mixer/main.c:70
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
 #, c-format
-msgid "Failed to initialize xfconf: %s"
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "_Playback"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "C_apture"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "S_witches"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opcije"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nema vidljivih kontrola"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Nijedna kontrola nije označena kao vidljiva.Molim otvorite <span size='large'><b>Odaberite kontrole</b></span> dijalog da biste odabrali neke."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Odaberite kontrole"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Odaberite koje kontrole trebaju biti vidljive"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Isključi"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Odaberite kontrole..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Odaberite koje će kontrole biti prikazane"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Zvučna kartica:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nijedna naredba lijevim klikom nije još definirana.To možete promijeniti "
+#~ "u svojstvima priključka."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr ""
+#~ msgid "Properties"
+#~ msgstr "Svojstva"
+
+#~ msgid "Sound card"
+#~ msgstr "Zvučna kartica"
+
+#~ msgid "Left-click command"
+#~ msgstr "Naredba lijevim klikom"
+
+#~ msgid "Select command"
+#~ msgstr "Odaberite naredbu"
+
+#~ msgid "All Files"
+#~ msgstr "Sve datoteke"
+
+#~ msgid "Executable Files"
+#~ msgstr "Izvršne datoteke"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl skripte"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python skripte"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby skripte"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Kontrola jačine zvuka za vašu zvučnu karticu"
 
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Nijedna kontrola nije označena kao vidljiva.Molim otvorite <span "
+#~ "size='large'><b>Odaberite kontrole</b></span> dijalog da biste odabrali "
+#~ "neke."
diff --git a/po/hu.po b/po/hu.po
index 268e32b..53265a0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,182 +7,255 @@ msgid ""
 msgstr ""
 "Project-Id-Version: untitled\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 20:20+0200\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-06-16 01:59+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:274
-#: ../panel-plugin/xfce-mixer-plugin.c:550
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nincs megadva parancs a bal kattintáshoz"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
-msgstr "Nincs megadva parancs a bal kattintáshoz. Ezt a bővítmény tulajdonságainál módosíthatja."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"A GStreamer nem észlelt hangeszközöket. Lehetséges, hogy egyes hangrendszer-"
+"specifikus GStreamer csomagok hiányoznak. Jogosultsági probléma is "
+"fennállhat."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Tulajdonságok"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nincs megadva parancs a bal kattintáshoz"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
-msgstr "A parancs (%s) nem hajtható végre. Győződjön meg, hogy a parancs helyét tartalmazza a PATH környezeti változó, vagy adja meg a teljes elérési utat a parancsban."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:90
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "A GStreamer nem észlelt hangeszközöket. Lehetséges, hogy egyes hangrendszer-specifikus GStreamer csomagok hiányoznak. Jogosultsági probléma is fennállhat."
+msgstr ""
+"A parancs (%s) nem hajtható végre. Győződjön meg, hogy a parancs helyét "
+"tartalmazza a PATH környezeti változó, vagy adja meg a teljes elérési utat a "
+"parancsban."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Keverőbővítmény"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "A keverősáv és a bal kattintáskor futtatandó parancs beállítása"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Hangkártyák beállítása és a kiválasztott sávok hangerejének szabályozása"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Hangkártya"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Hangkártya:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Keverősáv"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Bal kattintás parancsa"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Válasszon parancsot"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Minden fájl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Végrehajtható fájlok"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl-parancsfájlok"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python-parancsfájlok"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby-parancsfájlok"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell-parancsfájlok"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:61 ../xfce4-mixer/xfce-mixer-window.c:168
-#: ../xfce4-mixer/xfce-mixer-window.c:197
-#: ../xfce4-mixer/xfce-mixer-window.c:298
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Keverő"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Hangerőszabályzás a hangkártyához"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:252
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Ismeretlen hangerőszabályzó %d"
 
-#: ../xfce4-mixer/main.c:71
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Az xfconf előkészítése meghiúsult: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Lejátszás"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Felvétel"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Kapcsolók"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Beállítások"
 
-#: ../xfce4-mixer/xfce-mixer.c:306
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nincsenek látható vezérlők"
 
-#: ../xfce4-mixer/xfce-mixer.c:310
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Egyik vezérlő sincs láthatóként megjelölve. Nyissa meg a <span size='large'><b>Vezérlők kiválasztása</b></span> ablakot és válasszon ki néhányat."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Vezérlők kiválasztása"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Válassza ki a megjelenítendő vezérlőket"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Kilépés a keverőből"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Vezérlők kiválasztása…"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Válassza ki a megjelenítendő vezérlőket"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:198
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Hangkártyák beállítása és a kiválasztott sávok hangerejének szabályozása"
+msgstr ""
+"Hangkártyák beállítása és a kiválasztott sávok hangerejének szabályozása"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:213
-msgid "Sound card:"
-msgstr "Hangkártya:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nincs megadva parancs a bal kattintáshoz. Ezt a bővítmény "
+#~ "tulajdonságainál módosíthatja."
+
+#~ msgid "Properties"
+#~ msgstr "Tulajdonságok"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "A keverősáv és a bal kattintáskor futtatandó parancs beállítása"
+
+#~ msgid "Sound card"
+#~ msgstr "Hangkártya"
+
+#~ msgid "Left-click command"
+#~ msgstr "Bal kattintás parancsa"
+
+#~ msgid "Select command"
+#~ msgstr "Válasszon parancsot"
+
+#~ msgid "All Files"
+#~ msgstr "Minden fájl"
+
+#~ msgid "Executable Files"
+#~ msgstr "Végrehajtható fájlok"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-parancsfájlok"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python-parancsfájlok"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby-parancsfájlok"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell-parancsfájlok"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Hangerőszabályzás a hangkártyához"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Hangkeverő az Xfce asztali környezethez"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Egyik vezérlő sincs láthatóként megjelölve. Nyissa meg a <span "
+#~ "size='large'><b>Vezérlők kiválasztása</b></span> ablakot és válasszon ki "
+#~ "néhányat."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Hangkeverő az Xfce asztali környezethez"
diff --git a/po/id.po b/po/id.po
index 0677760..9259730 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,175 +7,252 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-27 22:24+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Tak ada perintah klik-kiri yang ditentukan"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Tak ada perintah klik-kiri yang ditentukan. Anda dapat mengubah ini di properti plugin."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer tak dapat mendeteksi kartu suara apapun. Beberapa sistem suara "
+"spesifik GStreamer mungkin hilang. Atau mungkin juga masalah hak akses."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Properti"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Tak ada perintah klik-kiri yang ditentukan"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Tak dapat mengeksekusi perintah \"%s\". Pastikan bahwa lokasi perintah ikut disertakan dalam variabel lingkungan ALAMAT atau anda menyediakan alamat penuh ke perintah."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer tak dapat mendeteksi kartu suara apapun. Beberapa sistem suara spesifik GStreamer mungkin hilang. Atau mungkin juga masalah hak akses."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Tak dapat mengeksekusi perintah \"%s\". Pastikan bahwa lokasi perintah ikut "
+"disertakan dalam variabel lingkungan ALAMAT atau anda menyediakan alamat "
+"penuh ke perintah."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Plugin Mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Atur jalur mixer dan perintah klik-kiri"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Atur kartu suara anda dan kendalikan volume jalur terpilih"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Kartu suara"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Kartu suara:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Jalur mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Perintah klik-kiri"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Pilih perintah"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Semua Berkas"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Berkas Dapat Dieksekusi"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Skrip Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Skrip Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Skrip Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skrip Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Kendali volume untuk kartu suara anda"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Kontrol Volume %d Tak Dikenal"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Gagal menginisialisasi xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Putar kembali"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Tangkap"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Tukar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opsi"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Tak ada kontrol tampak"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Tak ada kontrol yang ditandai sebagai terlihat. Silakan buka dialog <span size='large'><b>Pilih Kontrol</b></span> untuk memilih."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Pilih Kontrol"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Pilih kontrol mana yang harus tampak"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Sunting mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Pilih Kontrol..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Pilih kontrol mana yang ditampilkan"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Atur kartu suara anda dan kendalikan volume jalur terpilih"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Kartu suara:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Tak ada perintah klik-kiri yang ditentukan. Anda dapat mengubah ini di "
+#~ "properti plugin."
+
+#~ msgid "Properties"
+#~ msgstr "Properti"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Atur jalur mixer dan perintah klik-kiri"
+
+#~ msgid "Sound card"
+#~ msgstr "Kartu suara"
+
+#~ msgid "Left-click command"
+#~ msgstr "Perintah klik-kiri"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mixer audio untuk Lingkungan Destop Xfce"
+#~ msgid "Select command"
+#~ msgstr "Pilih perintah"
+
+#~ msgid "All Files"
+#~ msgstr "Semua Berkas"
+
+#~ msgid "Executable Files"
+#~ msgstr "Berkas Dapat Dieksekusi"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Skrip Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Skrip Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Skrip Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skrip Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Kendali volume untuk kartu suara anda"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Tak ada kontrol yang ditandai sebagai terlihat. Silakan buka dialog <span "
+#~ "size='large'><b>Pilih Kontrol</b></span> untuk memilih."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mixer audio untuk Lingkungan Destop Xfce"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
@@ -183,14 +260,18 @@ msgstr "Mixer audio untuk Lingkungan Destop Xfce"
 #~ msgstr ""
 #~ "Tak dapat mengeksekusi perintah %s. Mungkin anda perlu menyesuaikan "
 #~ "variabel PATH."
+
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr "Silakan pilih jalur mixer mana yang harus digunakan oleh plugin"
+
 #~ msgid "Please select which controls you want to be visible"
 #~ msgstr "Silakan pilih kontrol mana yang anda inginkan untuk terlihat"
+
 #~ msgid "A comfortable audio mixer for your sound card."
 #~ msgstr "Mixer audio yang nyaman untuk kartu suara anda."
+
 #~ msgid "Xfce Mixer"
 #~ msgstr "Mixer Xfce"
+
 #~ msgid "Could not find xfce4-mixer in PATH."
 #~ msgstr "Tak dapat menemukan xfce4-mixer dalam ALAMAT"
-
diff --git a/po/is.po b/po/is.po
index 6788d62..243a52f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,39 +7,39 @@ msgid ""
 msgstr ""
 "Project-Id-Version: is\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-12-08 21:52+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki at nett.is>\n"
 "Language-Team: Icelandic <translation-team-is at lists.sourceforge.net>\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Engin vinstri-smells-skipun skilgreind"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
-msgstr "Engin vinstri-smells-skipun er skilgreind eins og er. Þú getur breytt því í eiginleikum viðbótarinnar."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Eiginleikar"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Engin vinstri-smells-skipun skilgreind"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -47,142 +47,198 @@ msgid ""
 "providing the full path to the command."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Hljóðblöndunarviðbót"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Stilla hljóðblöndunarrás og vinstri-smells-skipun"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+msgid "Configure the sound card and mixer track"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Hljóðkort"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Hljóðkort:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Hljóðblöndunarrás"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Vinstri-smells-skipun"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Velja skipun"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Allar skrár"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Keyrsluskrár"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl skriftur"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python skriftur"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby skriftur"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skeljarskriftur"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Hljóðblandari"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Hljóðstyrksstýring fyrir hljóðkortið þitt"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Óþekkt hljóðstyrksstjórnun %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Mistókst að frumstilla xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Afspilun"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Upptaka"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Rofar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Valkostir"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Engin stjórntæki sýnieg"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Veldu stjórntæki"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Veldu hvaða stjórntæki ættu að vera sýnieg"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Hætta"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Hætta í hljóðblandaranum"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Veldu stjórntæki"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Veldu hvaða stjórntæki eru birt"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Hljóðkort:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Engin vinstri-smells-skipun er skilgreind eins og er. Þú getur breytt því "
+#~ "í eiginleikum viðbótarinnar."
+
+#~ msgid "Properties"
+#~ msgstr "Eiginleikar"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Stilla hljóðblöndunarrás og vinstri-smells-skipun"
+
+#~ msgid "Sound card"
+#~ msgstr "Hljóðkort"
+
+#~ msgid "Left-click command"
+#~ msgstr "Vinstri-smells-skipun"
+
+#~ msgid "Select command"
+#~ msgstr "Velja skipun"
+
+#~ msgid "All Files"
+#~ msgstr "Allar skrár"
+
+#~ msgid "Executable Files"
+#~ msgstr "Keyrsluskrár"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl skriftur"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python skriftur"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby skriftur"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skeljarskriftur"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Hljóðblandari fyrir Xfce skjáborðsumhverfið"
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Hljóðstyrksstýring fyrir hljóðkortið þitt"
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Hljóðblandari fyrir Xfce skjáborðsumhverfið"
diff --git a/po/it.po b/po/it.po
index 9ad05d6..b19eb19 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,177 +8,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-12-04 20:38+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
-"Language-Team: Italian Translation Team <xfce-it-translators at googlegroups.com>\n"
+"Language-Team: Italian Translation Team <xfce-it-translators at googlegroups."
+"com>\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"
 
-# GLOSSARIO
-# mixer = mixer
-# track = pista (del mixer) da non confondere con track (traccia musicale)
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Comando per il clic con il tasto sinistro non definito"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Non è ancora stato definito un comando per il clic con il tasto sinistro del mouse. È possibile associarne uno nelle proprietà del plugin."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer non è riuscito a individuare un dispositivo audio. Potrebbero "
+"mancare dei pacchetti di GStreamer specifici per il sistema audio. Potrebbe "
+"anche trattarsi di un problema con i permessi."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Proprietà"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Comando per il clic con il tasto sinistro non definito"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Impossibile eseguire il comando \"%s\". Assicurarsi che la posizione del comando sia compresa nella variabile di ambiente PATH o che si stia fornendo il percorso completo al comando."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer non è riuscito a individuare un dispositivo audio. Potrebbero mancare dei pacchetti di GStreamer specifici per il sistema audio. Potrebbe anche trattarsi di un problema con i permessi."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Impossibile eseguire il comando \"%s\". Assicurarsi che la posizione del "
+"comando sia compresa nella variabile di ambiente PATH o che si stia fornendo "
+"il percorso completo al comando."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Plugin del Mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Permette di configurare la pista del mixer e il comando per il clic con il tasto sinistro"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Permette di configurare la (o le) schede audio e di controllare il volume "
+"delle piste selezionate"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Scheda audio"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Scheda audio:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Pista del mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comando per clic con il tasto sinistro"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Selezionare comando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tutti i file"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "File eseguibili"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Script di Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Script di Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Script di Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Script per la shell"
+# GLOSSARIO
+# mixer = mixer
+# track = pista (del mixer) da non confondere con track (traccia musicale)
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Controllo del volume della scheda audio"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Controllo volume %d sconosciuto"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Impossibile inizializzare xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Riproduzione"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Cattura"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Interruttori"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opzioni"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nessun controllo visibile"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Non ci sono controlli marcati come visibili. Aprire la finestra <span size='large'><b>Selezione dei controlli</b></span> per sceglierne alcuni."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selezione dei controlli"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Selezionare i controlli da rendere visibili"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Esce dal mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Selezione dei controlli..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Selezione dei controlli da visualizzare"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Permette di configurare la (o le) schede audio e di controllare il volume delle piste selezionate"
+msgstr ""
+"Permette di configurare la (o le) schede audio e di controllare il volume "
+"delle piste selezionate"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Scheda audio:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Non è ancora stato definito un comando per il clic con il tasto sinistro "
+#~ "del mouse. È possibile associarne uno nelle proprietà del plugin."
+
+#~ msgid "Properties"
+#~ msgstr "Proprietà"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr ""
+#~ "Permette di configurare la pista del mixer e il comando per il clic con "
+#~ "il tasto sinistro"
+
+#~ msgid "Sound card"
+#~ msgstr "Scheda audio"
+
+#~ msgid "Left-click command"
+#~ msgstr "Comando per clic con il tasto sinistro"
+
+#~ msgid "Select command"
+#~ msgstr "Selezionare comando"
+
+#~ msgid "All Files"
+#~ msgstr "Tutti i file"
+
+#~ msgid "Executable Files"
+#~ msgstr "File eseguibili"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Script di Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Script di Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Script di Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Script per la shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Controllo del volume della scheda audio"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mixer audio per l'ambiente grafico Xfce"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Non ci sono controlli marcati come visibili. Aprire la finestra <span "
+#~ "size='large'><b>Selezione dei controlli</b></span> per sceglierne alcuni."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mixer audio per l'ambiente grafico Xfce"
diff --git a/po/ja.po b/po/ja.po
index 7521edb..47f49fa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,41 +6,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-12-11 16:54+0900\n"
 "Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
 "Language-Team: xfce-i18n at xfce.org <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "左クリック時のコマンドが設定されていません"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"まだ左クリック時のコマンドが設定されていません。プラグインの設定で変更するこ"
-"とができます。"
+"GStreamer はシステム上に一つもサウンドカードを検出できませんでした。サウンド"
+"システム用の GStreamer パッケージがないかもしれません。また、パーミッション問"
+"題の可能性もあります。"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "設定"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "左クリック時のコマンドが設定されていません"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -51,149 +52,209 @@ msgstr ""
 "パス内に存在しているか確認してください。またはフルパスでコマンドを設定してく"
 "ださい。"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer はシステム上に一つもサウンドカードを検出できませんでした。サウンド"
-"システム用の GStreamer パッケージがないかもしれません。また、パーミッション問"
-"題の可能性もあります。"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "ミキサープラグイン"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "ミキサートラックおよび左クリック時のコマンドを設定します"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "サウンドカードを設定し、選択されたトラックのボリュームを調整します"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "サウンドカード"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "サウンドカード:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "ミキサートラック"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "左クリック時のコマンド"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "コマンドの選択"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "すべてのファイル"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "実行可能ファイル"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl スクリプト"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python スクリプト"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby スクリプト"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "シェルスクリプト"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "ミキサー"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "サウンドカードのボリュームを調整します"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "不明なボリュームコントロール %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf の初期化に失敗しました: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "再生"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "録音"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "スイッチ"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "オプション"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "表示できるコントロールがありません"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"表示としてマークされたコントロールがありません。<span size='large'><b>コント"
-"ロールの選択</b></span> ダイアログを開いていくつか選択してください。"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "コントロールの選択"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "表示するコントロールを選択してください"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "ミキサーを終了します"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "コントロールの選択(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "表示するコントロールを選択します"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "サウンドカードを設定し、選択されたトラックのボリュームを調整します"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "サウンドカード:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "まだ左クリック時のコマンドが設定されていません。プラグインの設定で変更する"
+#~ "ことができます。"
+
+#~ msgid "Properties"
+#~ msgstr "設定"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "ミキサートラックおよび左クリック時のコマンドを設定します"
+
+#~ msgid "Sound card"
+#~ msgstr "サウンドカード"
+
+#~ msgid "Left-click command"
+#~ msgstr "左クリック時のコマンド"
+
+#~ msgid "Select command"
+#~ msgstr "コマンドの選択"
+
+#~ msgid "All Files"
+#~ msgstr "すべてのファイル"
+
+#~ msgid "Executable Files"
+#~ msgstr "実行可能ファイル"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl スクリプト"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python スクリプト"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby スクリプト"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "シェルスクリプト"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "サウンドカードのボリュームを調整します"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "表示としてマークされたコントロールがありません。<span size='large'><b>コン"
+#~ "トロールの選択</b></span> ダイアログを開いていくつか選択してください。"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce デスクトップ環境向けオーディオミキサー"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce デスクトップ環境向けオーディオミキサー"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
diff --git a/po/kk.po b/po/kk.po
index eddb77e..d91413d 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,174 +7,252 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-08-16 13:04+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst at gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ at googlegroups.com>\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Сол жақ шерту командасы орнатылмаған"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Сол жақ шерту командасы әді орнатылмаған. Сіз оны осы плагиннің қасиеттерінде өзгерте аласыз."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer бірде-бір дыбыстық картаны таба алмаған. Дыбыстық жүйеге тән "
+"кейбір GStreamer дестелері жоқ болып тұрған мүмкін. Сонымен қатар, бұл "
+"рұқсат мәселесі болуы мүмкін."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Қасиеттері"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Сол жақ шерту командасы орнатылмаған"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "\"%s\" командасын орындау мүмкін емес. Осы команданың орналақан орны қоршамыңыздың PATH айнымалысында бар екеніне не осы командаға толық жолды көрсеткеніңізге көз жеткізіңіз."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer бірде-бір дыбыстық картаны таба алмаған. Дыбыстық жүйеге тән кейбір GStreamer дестелері жоқ болып тұрған мүмкін. Сонымен қатар, бұл рұқсат мәселесі болуы мүмкін."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"\"%s\" командасын орындау мүмкін емес. Осы команданың орналақан орны "
+"қоршамыңыздың PATH айнымалысында бар екеніне не осы командаға толық жолды "
+"көрсеткеніңізге көз жеткізіңіз."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Миксер плагині"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Миксер каналын мен сол жақ шерту командасын  баптау"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Дыбыстық карта(лар)ды баптау мен дауыс деңгейін орнату"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Дыбыстық карта"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Дыбыстық карта:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Миксер каналы"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Сол жақ шерту командасы"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Команда таңдаңыз"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Барлық файлдар"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Орындалатын файлдар"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl скриптері"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python скриптері"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby скриптері"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell скриптері"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Миксер"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Дыбыстық картаңыз үшін дыбыс деңгейін орнату"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Белгісіз дыбыс каналы %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Xfconf іске қосу қатесі: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Ойнату"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Ұстау"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Ауыстырғыштар"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Опциялар"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Көрінетін каналдар жоқ"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Бірде-бір канал көрінетін деп белгіленбеген. <span size='large'><b>Каналдарды таңдау</b></span> сұхбат терезесін ашып, керек каналдарды таңдаңыз."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Каналдарды таңдау"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Көрінетін каналдарды таңдаңыз"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Миксерден шығу"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Каналдарды таңдау..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Көрсетілетін каналдарды таңдаңыз"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Дыбыстық карта(лар)ды баптау мен дауыс деңгейін орнату"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Дыбыстық карта:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Сол жақ шерту командасы әді орнатылмаған. Сіз оны осы плагиннің "
+#~ "қасиеттерінде өзгерте аласыз."
+
+#~ msgid "Properties"
+#~ msgstr "Қасиеттері"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Миксер каналын мен сол жақ шерту командасын  баптау"
+
+#~ msgid "Sound card"
+#~ msgstr "Дыбыстық карта"
+
+#~ msgid "Left-click command"
+#~ msgstr "Сол жақ шерту командасы"
+
+#~ msgid "Select command"
+#~ msgstr "Команда таңдаңыз"
+
+#~ msgid "All Files"
+#~ msgstr "Барлық файлдар"
+
+#~ msgid "Executable Files"
+#~ msgstr "Орындалатын файлдар"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl скриптері"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python скриптері"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby скриптері"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell скриптері"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Дыбыстық картаңыз үшін дыбыс деңгейін орнату"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce жұмыс үстел ортасы үшін аудио миксер"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Бірде-бір канал көрінетін деп белгіленбеген. <span "
+#~ "size='large'><b>Каналдарды таңдау</b></span> сұхбат терезесін ашып, керек "
+#~ "каналдарды таңдаңыз."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce жұмыс үстел ортасы үшін аудио миксер"
diff --git a/po/ko.po b/po/ko.po
index 1444b0f..09e09a8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer.master\n"
-"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-02-29 04:17+0900\n"
 "Last-Translator: Seong-ho, Cho <darkcircle.0426 at gmail.com>\n"
 "Language-Team: xfce-i18n <xfce-i18n at xfce.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,165 +20,239 @@ msgstr ""
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "왼쪽 누름 명령을 정의하지 않았습니다"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "아직 왼쪽 누름 명령을 정의하지 않았습니다. 플러그인 속성에서 바꿀 수 있습니다."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer가 사운드 장치를 감지할 수 없습니다. 사운드 시스템 지향 GStreamer가 "
+"빠졌을 수 있습니다. 권한 문제일 수도 있습니다."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "속성"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "왼쪽 누름 명령을 정의하지 않았습니다"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "\"%s\" 명령을 실행할 수 없습니다. PATH 환경 변수가 명령의 위치를 포함하였는지 또는 명령에 완전한 경로를 주었는지 확인해보시기 바랍니다."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer가 사운드 장치를 감지할 수 없습니다. 사운드 시스템 지향 GStreamer가 빠졌을 수 있습니다. 권한 문제일 수도 있습니다."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"\"%s\" 명령을 실행할 수 없습니다. PATH 환경 변수가 명령의 위치를 포함하였는"
+"지 또는 명령에 완전한 경로를 주었는지 확인해보시기 바랍니다."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "믹서 플러그인"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "믹서 트랙과 왼쪽 누름 명령을 설정합니다"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "사운드 카드를 설정하고 선택한 트랙에 대한 음량을 조절합니다"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "사운드 카드"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "사운드 카드:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "믹서 트랙"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "왼쪽 누름 명령"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "명령 선택"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "모든 파일"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "실행 파일"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "펄 스크립트"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "파이선 스크립트"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "루비 스크립트"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "쉘 스크립트"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "믹서"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "사운드 카드 음량 조절기"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "알 수 없는 음량 조절기 %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf를 초기화 하는데 실패했습니다: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "재생"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "캡처"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "스위치"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "옵션"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "보일 조절기 없음"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "보이도록 표시한 조절기가 없습니다. 선택하려면 <span size='large'><b>조절기 선택</b></span> 대화상자를 열어주시기 바랍니다."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "조절기 선택"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "보일 조절기를 선택합니다"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "나가기(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "믹서 끝내기"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "조절기 선택(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "표시할 조절기를 선택합니다"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "사운드 카드를 설정하고 선택한 트랙에 대한 음량을 조절합니다"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "사운드 카드:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "아직 왼쪽 누름 명령을 정의하지 않았습니다. 플러그인 속성에서 바꿀 수 있습"
+#~ "니다."
+
+#~ msgid "Properties"
+#~ msgstr "속성"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "믹서 트랙과 왼쪽 누름 명령을 설정합니다"
+
+#~ msgid "Sound card"
+#~ msgstr "사운드 카드"
+
+#~ msgid "Left-click command"
+#~ msgstr "왼쪽 누름 명령"
+
+#~ msgid "Select command"
+#~ msgstr "명령 선택"
+
+#~ msgid "All Files"
+#~ msgstr "모든 파일"
+
+#~ msgid "Executable Files"
+#~ msgstr "실행 파일"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "펄 스크립트"
+
+#~ msgid "Python Scripts"
+#~ msgstr "파이선 스크립트"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "루비 스크립트"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "쉘 스크립트"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "사운드 카드 음량 조절기"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce 데스크톱 환경의 오디오 믹서"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "보이도록 표시한 조절기가 없습니다. 선택하려면 <span size='large'><b>조절"
+#~ "기 선택</b></span> 대화상자를 열어주시기 바랍니다."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce 데스크톱 환경의 오디오 믹서"
diff --git a/po/lt.po b/po/lt.po
index c448748..b6091bd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,41 +8,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-01-31 15:51+0200\n"
 "Last-Translator: Algimantas Margevičius <margevicius.algimantas at gmail.com>\n"
 "Language-Team: Lietuvių <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nenurodyta kairio spragtelėjimo komanda"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Kol kas nenurodyta kairio spragtelėjimo komanda. Galite nurodyti įskiepio "
-"savybėse."
+"GStreamer neaptiko jokių garso plokščių. Gali būti jog trūksta kažkokių "
+"GStreamer paketų. Taipogi tai gali būti leidimų problemų."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Savybės"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nenurodyta kairio spragtelėjimo komanda"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -52,147 +52,209 @@ msgstr ""
 "Nepavyko įvykdyt komandos „%s“. Įsitikinkite jog komandos kelias yra "
 "įtrauktas į PATH kintamojo reikšmę ir jūs nurodėte pilną kelią iki komandos."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer neaptiko jokių garso plokščių. Gali būti jog trūksta kažkokių "
-"GStreamer paketų. Taipogi tai gali būti leidimų problemų."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Maišiklio įskiepis"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfigūruokite maišiklio takelį ir kairiojo spragtelėjimo komandą"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Konfigūruokite garso plokštę(-es) ir valdykite pasirinktų takelių garsą"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Garso plokštė"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Garso plokštė:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Maišiklio takelis"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Spragtelėjimas kairiu pelės mygtuku"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Pasirinkite komandą"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Visi failai"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Vykdomieji failai"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl scenarijai"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python scenarijai"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby scenarijai"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell scenarijai"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Maišiklis"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Jūsų garso plokštės garso valdymas"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Nežinomas garsumo valdiklis %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Nepavyko inicijuoti xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Atkūrimas"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Įrašymas"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Jungikliai"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Parinktys"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nėra matomų valdiklių"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Joks valdiklis nepažymėtas kaip matomas. Atverkite <span "
-"size='large'><b>Pasirinkti valdiklius</b></span> dialogą ir pasirinkite kurį "
-"nors."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Pasirinkti valdiklius"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Pasirinkite kurie valdikliai bus matomi"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "I_šeiti"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Išeiti iš maišiklio"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Pasirinkti valdiklius..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Pasirinkite kurie valdikliai bus matomi"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Konfigūruokite garso plokštę(-es) ir valdykite pasirinktų takelių garsą"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Garso plokštė:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Kol kas nenurodyta kairio spragtelėjimo komanda. Galite nurodyti įskiepio "
+#~ "savybėse."
+
+#~ msgid "Properties"
+#~ msgstr "Savybės"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfigūruokite maišiklio takelį ir kairiojo spragtelėjimo komandą"
+
+#~ msgid "Sound card"
+#~ msgstr "Garso plokštė"
+
+#~ msgid "Left-click command"
+#~ msgstr "Spragtelėjimas kairiu pelės mygtuku"
+
+#~ msgid "Select command"
+#~ msgstr "Pasirinkite komandą"
+
+#~ msgid "All Files"
+#~ msgstr "Visi failai"
+
+#~ msgid "Executable Files"
+#~ msgstr "Vykdomieji failai"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl scenarijai"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python scenarijai"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby scenarijai"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell scenarijai"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Jūsų garso plokštės garso valdymas"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Joks valdiklis nepažymėtas kaip matomas. Atverkite <span "
+#~ "size='large'><b>Pasirinkti valdiklius</b></span> dialogą ir pasirinkite "
+#~ "kurį nors."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Garso maišiklis skirtas Xfce darbastalio aplinkai"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Garso maišiklis skirtas Xfce darbastalio aplinkai"
diff --git a/po/lv.po b/po/lv.po
index 411e011..16e767e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,175 +7,252 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-05-01 22:29+0300\n"
 "Last-Translator: Rihards Priedītis <rprieditis at gmail.com>\n"
 "Language-Team: Latvian <rprieditis at gmail.com>\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Latvian\n"
 "X-Poedit-Country: Latvia\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nav kreisā komanda definēta"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Nav kreisā komanda vēl definēta. Jūs varat izmainīt spraudņa rekvizītos."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer nevarēja noteikt skaņas kartes. Dažas skaņas sistēmas GStreamer "
+"paciņas trūkst. Tā var būt arī atļauju problēma."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Rekvizīti"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nav kreisā komanda definēta"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Nevarēja izpildīt komandu \"%s\". Pārliecinieties, ka komandas atrašanās vieta ir iekļauta PATH vides mainīgajā, vai arī, ka norādāt pilnu komandas ceļu."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer nevarēja noteikt skaņas kartes. Dažas skaņas sistēmas GStreamer paciņas trūkst. Tā var būt arī atļauju problēma."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Nevarēja izpildīt komandu \"%s\". Pārliecinieties, ka komandas atrašanās "
+"vieta ir iekļauta PATH vides mainīgajā, vai arī, ka norādāt pilnu komandas "
+"ceļu."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Miksera spraudnis"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfigurēt miksera celiņu un kreisā klikšķa komandu"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Konfigurēt skaņas karti(-es) un kontrolēt skaļumu atlasītajiem celiņiem"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Skaņas karte"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Skaņas kartes:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Miksera celiņš"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Kreisa klikšķa komanda"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Atlasiet komandu"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Visi faili"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Izpildāmie faili"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl skirpti"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python skripti"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby skirpti"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Čaulas skripti"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mikseris"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Skaļuma kontrole jūsu skaņas kartei"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Nezināma skaņas kontrolē %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Neizdevās inicializēt xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Atpakaļ atskaņošana"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Tveršana"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Slēdži"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opcijas"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Neviens vadīklis nav redzams"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Neviens vadīklis nav redzams. Lūdzu atveriet <span size='large'><b>Atlasit vadīkļus</b></span>, lai atlasītu dažus."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Atlasiet vadīkļus"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Atlasiet, kuri vadīkļi būs redzami"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "I_ziet"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Iziet no miksera"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Atlasīt vadīkļus..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Atlasiet, kuri vadīkļi ir redzami"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Konfigurēt skaņas karti(-es) un kontrolēt skaļumu atlasītajiem celiņiem"
+msgstr ""
+"Konfigurēt skaņas karti(-es) un kontrolēt skaļumu atlasītajiem celiņiem"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Skaņas kartes:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nav kreisā komanda vēl definēta. Jūs varat izmainīt spraudņa rekvizītos."
+
+#~ msgid "Properties"
+#~ msgstr "Rekvizīti"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfigurēt miksera celiņu un kreisā klikšķa komandu"
+
+#~ msgid "Sound card"
+#~ msgstr "Skaņas karte"
+
+#~ msgid "Left-click command"
+#~ msgstr "Kreisa klikšķa komanda"
+
+#~ msgid "Select command"
+#~ msgstr "Atlasiet komandu"
+
+#~ msgid "All Files"
+#~ msgstr "Visi faili"
+
+#~ msgid "Executable Files"
+#~ msgstr "Izpildāmie faili"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl skirpti"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python skripti"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby skirpti"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Čaulas skripti"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Skaļuma kontrole jūsu skaņas kartei"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Audio mikseris Xfce darbavirsmas videi"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Neviens vadīklis nav redzams. Lūdzu atveriet <span "
+#~ "size='large'><b>Atlasit vadīkļus</b></span>, lai atlasītu dažus."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Audio mikseris Xfce darbavirsmas videi"
diff --git a/po/nb.po b/po/nb.po
index 6ab4dfe..4de3527 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,39 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-10-15 23:20+0200\n"
 "Last-Translator: Terje Uriansrud <terje at uriansrud.net>\n"
 "Language-Team: Norwegian Bokmal\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-# #: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Ingen venstreklikk kommando definert"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Ingen venstreklikk kommandoer er definert. Du kan endre dette i egenskapene."
+"GStreamer fant ingen lydenheter på systemet ditt. Du mangler muligens "
+"lydsystem-spesifikke GStreamer pakker. Det kan også være feil i rettigheter."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Egenskaper"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Ingen venstreklikk kommando definert"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -50,145 +51,207 @@ msgstr ""
 "Kunne ikke kjøre kommandoen «%s». Sørg for at stien til kommandoen er "
 "inkludert i PATH stien etter at full sti er oppgitt for kommandoen."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer fant ingen lydenheter på systemet ditt. Du mangler muligens "
-"lydsystem-spesifikke GStreamer pakker. Det kan også være feil i rettigheter."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mikser"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Sett opp mikserspor og venstreklikk kommando"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Konfigurer lydkort og sett volumet for valgte spor."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Lydkort"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Lydkort:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Lydspor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Venstreklikk kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Velg kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alle filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Kjørbare filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perlskript"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Pythonskript"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Rubyskript"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skallskript"
+# #: ../panel-plugin/xfce-mixer-plugin.c:271
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mikser"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Volumkontroll for lydkortet ditt"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Ukjent volumkontroll %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Klarte ikke initialisere xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Avspilling"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Opptak"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Innstillinger"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Innstillinger"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ingen kontroller synlige"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Ingen kontroller er markert som synlige. Åpne <span size='large'><b>Velg "
-"kontroller</b></span> dialogen for å velge noen."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Velg kontroller"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Velg hvilke kontroller som skal vises"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Avslutt mikseren"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Velg kontroller..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Velg hvilke kontroller som skal vises"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Konfigurer lydkort og sett volumet for valgte spor."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Lydkort:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Ingen venstreklikk kommandoer er definert. Du kan endre dette i "
+#~ "egenskapene."
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Sett opp mikserspor og venstreklikk kommando"
+
+#~ msgid "Sound card"
+#~ msgstr "Lydkort"
+
+#~ msgid "Left-click command"
+#~ msgstr "Venstreklikk kommando"
+
+#~ msgid "Select command"
+#~ msgstr "Velg kommando"
+
+#~ msgid "All Files"
+#~ msgstr "Alle filer"
+
+#~ msgid "Executable Files"
+#~ msgstr "Kjørbare filer"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlskript"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Pythonskript"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Rubyskript"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skallskript"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Volumkontroll for lydkortet ditt"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ingen kontroller er markert som synlige. Åpne <span size='large'><b>Velg "
+#~ "kontroller</b></span> dialogen for å velge noen."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Lydmikser for Xfce Skrivebordsmiljøet"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Lydmikser for Xfce Skrivebordsmiljøet"
diff --git a/po/nl.po b/po/nl.po
index 854f7c5..3d3894a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,46 +3,46 @@
 # This file is distributed under the same license as the xfce4-mixer package.
 # Stephan Arts, 2008.
 # Pjotr, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-09-08 11:45+0200\n"
 "Last-Translator: Pjotr\n"
 "Language-Team: Dutch (Flemish)\n"
+"Language: nl (Dutch)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl (Dutch)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Er is geen linksklikopdracht gedefinieerd"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Nog geen linksklik-opdracht gedefinieerd. U kunt dit in de plugin-"
-"eigenschappen veranderen."
+"GStreamer was niet in staat om geluidapparaten te detecteren. Sommige "
+"GStreamer-pakketten die specifiek zijn voor het geluidssysteem kunnen "
+"ontbreken. Het kan ook een rechtenprobleem zijn."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Eigenschappen"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Er is geen linksklikopdracht gedefinieerd"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -53,151 +53,212 @@ msgstr ""
 "de opdracht is opgenomen in de PATH-omgevingsvariabele of dat u het "
 "volledige pad naar de opdracht verstrekt."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer was niet in staat om geluidapparaten te detecteren. Sommige "
-"GStreamer-pakketten die specifiek zijn voor het geluidssysteem kunnen "
-"ontbreken. Het kan ook een rechtenprobleem zijn."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Volumeregelaarplugin"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Het volumeregelaarspoor en de linksklikopdracht configureren"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configureer geluidkaart(en) en beheers het volume van geselecteerde sporen"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Geluidkaart"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Geluidkaart:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Volumeregelaarspoor"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Linksklikopdracht"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Opdracht kiezen"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alle bestanden"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Uitvoerbare bestanden"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perlscripts"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Pythonscripts"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Rubyscripts"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shellscripts"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Volumeregelaar"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Volumeregeling voor uw geluidkaart"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Onbekende volumeregeling %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Kon xfconf niet initialiseren: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Afspelen"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Opnemen"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Schakelaars"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opties"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Geen zichtbare bedieningsknoppen"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Er zijn geen bedieningsknoppen gemarkeerd als zichtbaar. Open het <b><span "
-"size='large'>Kies Bedieningsknoppen</span></b>-dialoogvenster om er te "
-"kiezen."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Bedieningsknoppen kiezen"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Kiezen welke bedieningsknoppen er zichtbaar moeten zijn "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Af_sluiten"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Volumeregelaar afsluiten"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Bedieningsknoppen kiezen..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Kiezen welke bedieningsknoppen er worden weergegeven"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Configureer geluidkaart(en) en beheers het volume van geselecteerde sporen"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Geluidkaart:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nog geen linksklik-opdracht gedefinieerd. U kunt dit in de plugin-"
+#~ "eigenschappen veranderen."
+
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Het volumeregelaarspoor en de linksklikopdracht configureren"
+
+#~ msgid "Sound card"
+#~ msgstr "Geluidkaart"
+
+#~ msgid "Left-click command"
+#~ msgstr "Linksklikopdracht"
+
+#~ msgid "Select command"
+#~ msgstr "Opdracht kiezen"
+
+#~ msgid "All Files"
+#~ msgstr "Alle bestanden"
+
+#~ msgid "Executable Files"
+#~ msgstr "Uitvoerbare bestanden"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlscripts"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Pythonscripts"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Rubyscripts"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shellscripts"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Volumeregeling voor uw geluidkaart"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Er zijn geen bedieningsknoppen gemarkeerd als zichtbaar. Open het "
+#~ "<b><span size='large'>Kies Bedieningsknoppen</span></b>-dialoogvenster om "
+#~ "er te kiezen."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Volumeregelaar voor de Xfce-werkomgeving"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Volumeregelaar voor de Xfce-werkomgeving"
 
 #~ msgid "A comfortable audio mixer for your sound card."
 #~ msgstr "Een makkelijke volumeregelaar voor uw geluidkaart."
diff --git a/po/nn.po b/po/nn.po
index 4e96722..1f5cfbf 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce-mixer 4.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-04-10 13:13+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-forums at yahoo.no>\n"
 "Language-Team: nn_NO <i18n-nn at lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,165 +19,240 @@ msgstr ""
 "X-Poedit-Country: NORWAY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Du har ikkje sett opp nokon venstreklikk-kommando"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Du har ikkje sett opp nokon venstreklikk-kommando enno. Du kan endra dette i eigenskapane for innstikket."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer klarte ikkje finna nokor lydeining. Det kan henda det manglar "
+"nokre GStreamer-pakker. Det kan òg vera eit problem med tilgangsløyve."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Eigenskapar"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Du har ikkje sett opp nokon venstreklikk-kommando"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Klarte ikkje køyra kommandoen «%s». Pass på at du anten har med plasseringa for kommandoen i  PATH-miljøvariabelen, eller at du har med heile stigen til programmet."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer klarte ikkje finna nokor lydeining. Det kan henda det manglar nokre GStreamer-pakker. Det kan òg vera eit problem med tilgangsløyve."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Klarte ikkje køyra kommandoen «%s». Pass på at du anten har med "
+"plasseringa for kommandoen i  PATH-miljøvariabelen, eller at du har med "
+"heile stigen til programmet."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Miksarprogram"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Set opp miksarstripa og venstreklikk-kommandoen"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Set opp lydkort og kontroller volumet på kvar kanal"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Lydkort"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Lydkort:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Miksarstripe"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Venstreklikk-kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Vel kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alle filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Køyrbare filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perlskript"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Pythonskript"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Rubyskript"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skalskript"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Miksar"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Volumkontroll for lydkortet ditt"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Ukjend volumkontroll %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Klarte ikkje starta xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Avspeling"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Opptak"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Brytarar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Val"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Ingen kontrollar er synlege"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Ingen kontrollar er synlege. Opna <span size='large'><b>Vel kontrollar</b></span>-ruta for å velja nokre."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Vel kontrollar"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Vel kva kontrollar du vil syna"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Avslutt miksaren"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Vel kontrollar..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Vel kva kontrollar du vil syna"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Set opp lydkort og kontroller volumet på kvar kanal"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Lydkort:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Du har ikkje sett opp nokon venstreklikk-kommando enno. Du kan endra "
+#~ "dette i eigenskapane for innstikket."
+
+#~ msgid "Properties"
+#~ msgstr "Eigenskapar"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Set opp miksarstripa og venstreklikk-kommandoen"
+
+#~ msgid "Sound card"
+#~ msgstr "Lydkort"
+
+#~ msgid "Left-click command"
+#~ msgstr "Venstreklikk-kommando"
+
+#~ msgid "Select command"
+#~ msgstr "Vel kommando"
+
+#~ msgid "All Files"
+#~ msgstr "Alle filer"
+
+#~ msgid "Executable Files"
+#~ msgstr "Køyrbare filer"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perlskript"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Pythonskript"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Rubyskript"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skalskript"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Volumkontroll for lydkortet ditt"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Lydmiksar for Xfce-skrivebordsmiljøet"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ingen kontrollar er synlege. Opna <span size='large'><b>Vel kontrollar</"
+#~ "b></span>-ruta for å velja nokre."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Lydmiksar for Xfce-skrivebordsmiljøet"
diff --git a/po/pl.po b/po/pl.po
index f088f97..ef486ee 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,184 +7,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-04-09 18:48+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish <xfce-i18n at xfce.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nie zdefiniowano polecenia lewego klawisza myszy"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Nie zdefiniowano jeszcze polecenia lewego klawisza myszy. Można to zrobić w oknie preferencji elementu."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"Program GStreamer nie odnalazł żadnego urządzenia muzycznego. "
+"Przypuszczalnie brakuje niektórych pakietów systemu dźwiękowego GStreamer "
+"lub istnieje problem z prawami dostępu."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Właściwości"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nie zdefiniowano polecenia lewego klawisza myszy"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Nie można wykonać polecenia „%s”. Proszę upewnić się czy wprowadzono pełną ścieżkę do programu lub czy położenie programu uwzględniono w zmiennej systemowej PATH."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "Program GStreamer nie odnalazł żadnego urządzenia muzycznego. Przypuszczalnie brakuje niektórych pakietów systemu dźwiękowego GStreamer lub istnieje problem z prawami dostępu."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Nie można wykonać polecenia „%s”. Proszę upewnić się czy wprowadzono pełną "
+"ścieżkę do programu lub czy położenie programu uwzględniono w zmiennej "
+"systemowej PATH."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mikser dźwięku"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfiguruje ustawienia apletu"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Konfiguruje karty dźwiękowe i ich głośność"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Karta dźwiękowa"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Karta dźwiękowa:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Kanał"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Polecenie lewego klawisza myszy"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Wybór pliku"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Wszystkie pliki"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Pliki wykonywalne"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Skrypty Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Skrypty Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Skrypty Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skrypty powłoki"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mikser dźwięku"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Konfiguruje głośność kart dźwiękowych"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Nieznana kontrola głośności %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Nie udało się zainicjować xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Odtwarzanie"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Przechwytywanie"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Przełączniki"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opcje"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Brak widocznych elementów sterujących"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Brak widocznych elementów sterujących. Proszę otworzyć okno konfiguracyjne klikając przycisk „<b>Wybierz elementy sterujące...</b>”."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Elementy sterujące"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Wybiera widoczne elementy sterujące"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Kończy działanie programu"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Wybierz elementy sterujące..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Proszę wybrać kontrolki, które mają być widoczne"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Konfiguruje karty dźwiękowe i ich głośność"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Karta dźwiękowa:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nie zdefiniowano jeszcze polecenia lewego klawisza myszy. Można to zrobić "
+#~ "w oknie preferencji elementu."
+
+#~ msgid "Properties"
+#~ msgstr "Właściwości"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfiguruje ustawienia apletu"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mikser dźwięku dla środowiska Xfce"
+#~ msgid "Sound card"
+#~ msgstr "Karta dźwiękowa"
+
+#~ msgid "Left-click command"
+#~ msgstr "Polecenie lewego klawisza myszy"
+
+#~ msgid "Select command"
+#~ msgstr "Wybór pliku"
+
+#~ msgid "All Files"
+#~ msgstr "Wszystkie pliki"
+
+#~ msgid "Executable Files"
+#~ msgstr "Pliki wykonywalne"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Skrypty Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Skrypty Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Skrypty Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skrypty powłoki"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Konfiguruje głośność kart dźwiękowych"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Brak widocznych elementów sterujących. Proszę otworzyć okno "
+#~ "konfiguracyjne klikając przycisk „<b>Wybierz elementy sterujące...</b>”."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mikser dźwięku dla środowiska Xfce"
 
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr "Wybierz ścieżkę miksera, z której korzystać ma ta wtyczka"
+
 #~ msgid "Please select which controls you want to be visible"
 #~ msgstr "Wybierz kontrolki, które mają być widoczne"
+
 #~ msgid "A comfortable audio mixer for your sound card."
 #~ msgstr "Mikser audio dla twojej karty dźwiękowej"
+
 #~ msgid "Xfce Mixer"
 #~ msgstr "Mikser Xfce"
+
 #~ msgid "Could not find xfce4-mixer in PATH."
 #~ msgstr "Nie można znaleźć xfce4-mixera w ścieżce."
-
diff --git a/po/pt.po b/po/pt.po
index c4d774b..1f39b27 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,177 +2,257 @@
 # Copyright (C) 2008 THE xfce4-mixer'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-mixer package.
 # Nuno Miguel <nunomgue at gmail.com>, 2007-2012.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-04-10 15:22+0100\n"
 "Last-Translator: Nuno Miguel <nunomgue at gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: PORTUGAL\n"
 "X-Poedit-Language: Portuguese\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Comando de clique no botão esquerdo do rato não definido"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Comando de clique no botão esquerdo do rato não definido. Pode alterar a configuração nas propriedades do \"plugin\"."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"O GStreamer não foi capaz de detetar quaisquer dispositivos de som. Pode ser "
+"necessário instalar alguns pacotes GStreamer. Pode também ser um problema de "
+"permissões."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propriedades"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Comando de clique no botão esquerdo do rato não definido"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Incapaz de executar o comando \"%s\". Certifique-se que a localização do comando está incluída na variável de ambiente PATH ou de que forneceu o caminho completo para o comando"
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "O GStreamer não foi capaz de detetar quaisquer dispositivos de som. Pode ser necessário instalar alguns pacotes GStreamer. Pode também ser um problema de permissões."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Incapaz de executar o comando \"%s\". Certifique-se que a localização do "
+"comando está incluída na variável de ambiente PATH ou de que forneceu o "
+"caminho completo para o comando"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "\"Plugin\" gestor de som"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configurar o gestor de som e o comando de clique esquerdo do rato"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Configurar a(s) placa(s) de som e o volume do sistema"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Placa de som"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Placa de som:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Gestor de som"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comando de clique esquerdo do rato"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Selecione o comando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Todos os ficheiros"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Ficheiros executáveis"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "\"Scripts\" Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "\"Scripts\" Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "\"Scripts\" Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell \"Scripts\""
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Gestor de som"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Controlador de volume para a placa de som"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Controlador de volume desconhecido %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Falha ao iniciar o xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reprodução"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captura"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Interruptores"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opções"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nenhum controlo visível"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Nenhum controlo marcado como visível. Por favor, abra o diálogo <span size='large'><b>Selecione os controlos</b></span> para os selecionar."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selecione os controlos"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Selecione os controlos a visualizar"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Sair do gestor de som"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Sele_cione os controlos..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Selecione os controlos a exibir"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Configurar a(s) placa(s) de som e o volume do sistema"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Placa de som:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Comando de clique no botão esquerdo do rato não definido. Pode alterar a "
+#~ "configuração nas propriedades do \"plugin\"."
+
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configurar o gestor de som e o comando de clique esquerdo do rato"
+
+#~ msgid "Sound card"
+#~ msgstr "Placa de som"
+
+#~ msgid "Left-click command"
+#~ msgstr "Comando de clique esquerdo do rato"
+
+#~ msgid "Select command"
+#~ msgstr "Selecione o comando"
+
+#~ msgid "All Files"
+#~ msgstr "Todos os ficheiros"
+
+#~ msgid "Executable Files"
+#~ msgstr "Ficheiros executáveis"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "\"Scripts\" Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "\"Scripts\" Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "\"Scripts\" Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell \"Scripts\""
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Controlador de volume para a placa de som"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Nenhum controlo marcado como visível. Por favor, abra o diálogo <span "
+#~ "size='large'><b>Selecione os controlos</b></span> para os selecionar."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Gestor de som para o ambiente de trabalho Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Gestor de som para o ambiente de trabalho Xfce"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 00cddf8..450771c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,179 +9,265 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-04-20 20:35-0300\n"
 "Last-Translator: Sérgio Cipolla <secipolla at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nenhum comando definido para o clique-esquerdo"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Ainda não foi definido nenhum comando para o clique-esquerdo. Você pode alterar isso nas propriedades do plug-in."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"O Gstreamer não detectou nenhum dispositivo de áudio. Pode ser que esteja "
+"faltando algum pacote do Gstreamer específico do sistema de som. Isso pode "
+"ser também algum problema de permissão."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Propriedades"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nenhum comando definido para o clique-esquerdo"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Não foi possível executar o comando \"%s\". Certifique-se que a localização do comando está incluída na variavel de ambiente PATH ou que você está usando o caminho completo do comando."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "O Gstreamer não detectou nenhum dispositivo de áudio. Pode ser que esteja faltando algum pacote do Gstreamer específico do sistema de som. Isso pode ser também algum problema de permissão."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Não foi possível executar o comando \"%s\". Certifique-se que a localização "
+"do comando está incluída na variavel de ambiente PATH ou que você está "
+"usando o caminho completo do comando."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Plug-in Mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Configura a faixa do mixer e o comando do clique-esquerdo"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Configura sua(s) placa(s) de áudio e controla o volume das faixas "
+"selecionadas"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Placa de áudio"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Placa de áudio:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Faixa do mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comando para o clique-esquerdo"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Selecionar comando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Todos os arquivos"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Arquivos executáveis"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripts em Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Script em Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripts em Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripts em Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Um controle de volume para a sua placa de áudio"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Controle de volume desconhecido %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Falha ao inicializar o xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Reprodução"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captura"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Alternadores"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opções"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Nenhum controle visível"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Nenhum controle está marcado como visível. Por favor abra o diálogo <span size=\"large\"><b>Selecionar controles</b></span> para selecionar alguns."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selecionar controles"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Seleciona quais controles são mostrados"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Sair do mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Selecionar controles..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Seleciona quais controles são mostrados"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
-msgstr "Configura sua(s) placa(s) de áudio e controla o volume das faixas selecionadas"
+msgstr ""
+"Configura sua(s) placa(s) de áudio e controla o volume das faixas "
+"selecionadas"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Placa de áudio:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Ainda não foi definido nenhum comando para o clique-esquerdo. Você pode "
+#~ "alterar isso nas propriedades do plug-in."
+
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Configura a faixa do mixer e o comando do clique-esquerdo"
+
+#~ msgid "Sound card"
+#~ msgstr "Placa de áudio"
+
+#~ msgid "Left-click command"
+#~ msgstr "Comando para o clique-esquerdo"
+
+#~ msgid "Select command"
+#~ msgstr "Selecionar comando"
+
+#~ msgid "All Files"
+#~ msgstr "Todos os arquivos"
+
+#~ msgid "Executable Files"
+#~ msgstr "Arquivos executáveis"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripts em Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Script em Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripts em Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripts em Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Um controle de volume para a sua placa de áudio"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Nenhum controle está marcado como visível. Por favor abra o diálogo <span "
+#~ "size=\"large\"><b>Selecionar controles</b></span> para selecionar alguns."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mixer de áudio para o ambiente de trabalho Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mixer de áudio para o ambiente de trabalho Xfce"
 
-#~ msgid "Could not execute the command %s. Perhaps you need to adjust the PATH variable."
-#~ msgstr "Não foi possível executar o comando %s. Talvez você precise ajustar a variável PATH."
+#~ msgid ""
+#~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
+#~ "variable."
+#~ msgstr ""
+#~ "Não foi possível executar o comando %s. Talvez você precise ajustar a "
+#~ "variável PATH."
 
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr "Por favor escolha qual faixa do mixer deve ser usada pelo plug-in"
@@ -198,5 +284,9 @@ msgstr "Mixer de áudio para o ambiente de trabalho Xfce"
 #~ msgid "Could not find xfce4-mixer in PATH."
 #~ msgstr "Não foi possível encontrar o xfce4-mixer no CAMINHO."
 
-#~ msgid "No sound cards could be found. You may have to install additional gstreamer packages for ALSA or OSS support."
-#~ msgstr "Nenhuma placa de áudio foi encontrada. Talvez você tenha de instalar pacotes do gstreamer adicionais para suporte de ALSA ou OSS."
+#~ msgid ""
+#~ "No sound cards could be found. You may have to install additional "
+#~ "gstreamer packages for ALSA or OSS support."
+#~ msgstr ""
+#~ "Nenhuma placa de áudio foi encontrada. Talvez você tenha de instalar "
+#~ "pacotes do gstreamer adicionais para suporte de ALSA ou OSS."
diff --git a/po/ro.po b/po/ro.po
index 7eff80a..35484c9 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2008-2011 Jannis Pohlmann <jannis at xfce.org>.
 # This file is distributed under the same license as the xfce package.
 # Mișu Moldovan <dumol at xfce.org>, 2009-2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2011-01-16 19:04+0200\n"
 "Last-Translator: Mișu Moldovan <dumol at xfce.org>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -19,31 +19,30 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nu s-a definit o comandă asociată clicului stânga"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Nu s-a definit o comandă asociată clicului stânga. Puteți schimba asta în "
-"proprietăți."
+"Folosind GStreamer, nu s-a detectat niciun dispozitiv de sunet. S-ar putea "
+"să lipsească unele pachete din sistem sau să aveți drepturi insuficiente."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Proprietăți"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nu s-a definit o comandă asociată clicului stânga"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -54,146 +53,206 @@ msgstr ""
 "este inclus în variabila de mediu PATH sau indicați calea completă către "
 "acesta."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"Folosind GStreamer, nu s-a detectat niciun dispozitiv de sunet. S-ar putea "
-"să lipsească unele pachete din sistem sau să aveți drepturi insuficiente."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Modul de mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Schimbați pista mixerului și comanda asociată clicului stânga"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Schimbați opțiunile plăcii de sunet și volumul pistelor selectate"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Placa de sunet"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Placă de sunet:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Pista mixerului"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Comanda asociată clicului stânga"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Selectați o comandă"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Toate fișierele"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Fișiere executabile"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Scripturi Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Scripturi Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Scripturi Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Scripturi Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Controale de volum ale plăcii de sunet"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Control de volum necunoscut %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Nu s-a putut inițializa xfconf : %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Redare"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Captură"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Comutatoare"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Opțiuni"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Fără controale vizibile"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Niciun control al plăcii de sunet nu e vizibil. Încercați opțiunea <span "
-"size='large'><b>Selectați controale</b></span> pentru a activa câteva."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Selectare de controale"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Alegeți ce controale doriți să fie vizibile"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Ieșire"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Ieșire din mixer"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Selectați controale..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Selectați controalele vizibile"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Schimbați opțiunile plăcii de sunet și volumul pistelor selectate"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Placă de sunet:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nu s-a definit o comandă asociată clicului stânga. Puteți schimba asta în "
+#~ "proprietăți."
+
+#~ msgid "Properties"
+#~ msgstr "Proprietăți"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Schimbați pista mixerului și comanda asociată clicului stânga"
+
+#~ msgid "Sound card"
+#~ msgstr "Placa de sunet"
+
+#~ msgid "Left-click command"
+#~ msgstr "Comanda asociată clicului stânga"
+
+#~ msgid "Select command"
+#~ msgstr "Selectați o comandă"
+
+#~ msgid "All Files"
+#~ msgstr "Toate fișierele"
+
+#~ msgid "Executable Files"
+#~ msgstr "Fișiere executabile"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Scripturi Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Scripturi Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Scripturi Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Scripturi Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Controale de volum ale plăcii de sunet"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Mixer audio pentru mediul desktop Xfce"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Niciun control al plăcii de sunet nu e vizibil. Încercați opțiunea <span "
+#~ "size='large'><b>Selectați controale</b></span> pentru a activa câteva."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Mixer audio pentru mediul desktop Xfce"
diff --git a/po/ru.po b/po/ru.po
index 031faed..10462ac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,40 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-02 12:44+0400\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-05-09 15:54+0400\n"
 "Last-Translator: Denis Koryavov <dkoryavov at yandex.ru>\n"
 "Language-Team: Russian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:274
-#: ../panel-plugin/xfce-mixer-plugin.c:550
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Нет предопределенной команды для левой кнопки мыши "
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Команда для левой кнопки мыши еще не указана. Вы можете указать ее в "
-"свойствах микшера."
+"Не найдено ни одного звукового устройства поддерживаемого звуковой "
+"подсистемой GStreamer. Возможно, у вас отсутствуют необходимые для GStreamer "
+"пакеты или неверно настроены права на доступ к звуковому устройству. "
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Параметры "
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Нет предопределенной команды для левой кнопки мыши "
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -54,147 +55,208 @@ msgstr ""
 "системную переменную PATH для вашего пользователя или, что вы указали полный "
 "путь к команде. "
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:90
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"Не найдено ни одного звукового устройства поддерживаемого звуковой "
-"подсистемой GStreamer. Возможно, у вас отсутствуют необходимые для GStreamer "
-"пакеты или неверно настроены права на доступ к звуковому устройству. "
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Регулятор громкости "
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Укажите канал микшера и команду для левой кнопки мыши "
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Настройте ваши звуковые карты и управляйте громкостью выбранного канала "
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Звуковая карта "
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Звуковая карта:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Канал микшера "
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Команда для левой кнопки мыши "
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Управляемые каналы"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Все файлы "
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Запускаемые файлы "
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Скрипты на языке Perl "
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Скрипты на языке Python "
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Скрипты на языке Ruby "
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Скрипты командной оболочки "
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:61 ../xfce4-mixer/xfce-mixer-window.c:168
-#: ../xfce4-mixer/xfce-mixer-window.c:197
-#: ../xfce4-mixer/xfce-mixer-window.c:298
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Регулятор громкости "
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Удобный регулятор громкости для вашей звуковой карты "
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:252
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Неизвестный канал %d"
 
-#: ../xfce4-mixer/main.c:71
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Невозможно соединиться с менеджером настроек xfconf: %s "
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Воспроизведение "
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Запись "
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Переключатели "
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Параметры "
 
-#: ../xfce4-mixer/xfce-mixer.c:306
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Не выбраны управляемые каналы "
 
-#: ../xfce4-mixer/xfce-mixer.c:310
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Не выбрано ни одного управляемого канала. Вы можете выбрать каналы с помощью "
-"диалога <span size='large'><b>Выбора каналов</b></span>."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Управляемые каналы "
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Выберите отображаемые каналы "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Закрыть регулятор громкости "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Выбрать каналы..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Выберите отображаемые каналы "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:198
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Настройте ваши звуковые карты и управляйте громкостью выбранного канала "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:213
-msgid "Sound card:"
-msgstr "Звуковая карта:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Команда для левой кнопки мыши еще не указана. Вы можете указать ее в "
+#~ "свойствах микшера."
+
+#~ msgid "Properties"
+#~ msgstr "Параметры "
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Укажите канал микшера и команду для левой кнопки мыши "
+
+#~ msgid "Sound card"
+#~ msgstr "Звуковая карта "
+
+#~ msgid "Left-click command"
+#~ msgstr "Команда для левой кнопки мыши "
+
+#~ msgid "Select command"
+#~ msgstr "Управляемые каналы"
+
+#~ msgid "All Files"
+#~ msgstr "Все файлы "
+
+#~ msgid "Executable Files"
+#~ msgstr "Запускаемые файлы "
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Скрипты на языке Perl "
+
+#~ msgid "Python Scripts"
+#~ msgstr "Скрипты на языке Python "
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Скрипты на языке Ruby "
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Скрипты командной оболочки "
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Удобный регулятор громкости для вашей звуковой карты "
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Не выбрано ни одного управляемого канала. Вы можете выбрать каналы с "
+#~ "помощью диалога <span size='large'><b>Выбора каналов</b></span>."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Регулятор громкости для рабочего окружения Xfce "
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Регулятор громкости для рабочего окружения Xfce "
diff --git a/po/si.po b/po/si.po
index 287b97f..8aa48e6 100644
--- a/po/si.po
+++ b/po/si.po
@@ -1,183 +1,261 @@
 # translation of si.po to Sinhalese
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Rashan Anushka <rashan.uoc at gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-10-06 17:44+0530\n"
 "Last-Translator: Rashan Anushka <rashan.uoc at gmail.com>\n"
 "Language-Team: Sinhalese <en at 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: KBabel 1.11.4\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "වමත් ක්ලික් විධානය අර්ථදක්වා නැත"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "තවම වමත් ක්ලික් විධානය අර්ථදක්වා නැත. ඔබට මෙය පේනු මෘදුකාංග වත්කම්හිල වෙනස් කළ හැක."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer හට ඔබගේ පද්ධතියේ කිසිදු ශබ්ද කාඩ් පතක් හදුනා ගත නොහැකි විය. ඔබගේ ශබ්දය හා "
+"සම්බන්ධ GStreamer ඇසුරුම් අස්ථානගතවී තිබිය හැක. තවද මෙය අවසර හා සම්බන්ධ ගැටළුවක් විය හැක."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "වත්කම්"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "වමත් ක්ලික් විධානය අර්ථදක්වා නැත"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer හට ඔබගේ පද්ධතියේ කිසිදු ශබ්ද කාඩ් පතක් හදුනා ගත නොහැකි විය. ඔබගේ ශබ්දය හා සම්බන්ධ GStreamer ඇසුරුම් අස්ථානගතවී තිබිය හැක. තවද මෙය අවසර හා සම්බන්ධ ගැටළුවක් විය හැක."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "මිශ්‍රක පේනු මෘදුකාංගය"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "මිශ්‍රණ පථය සහ වම්-ක්ලික් විධානය සැකසීම"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "තෝරන ලද පථයන්හි ශබ්දය පාලනය කිරීම සහ ශබ්ද කාඩ්පත් සුසර කිරීම"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "ශබ්ද කාඩ්පත"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "ශබ්ද කාඩ්පත්:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "මිශ්‍රක පථය"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "වමත් ක්ලික් විධානය"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "තේරීමේක විධානය"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "සියළුම ගොනු"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "ක්‍රියාත්මක කළ හැකි ගොනු"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "පර්ල් විධානාවලි"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "පයිතන් විධානාවලි"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "රූබි විධානාවලි"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "කවච විධානාවලි"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "මිශ්‍රකය"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "ඔබගේ ශබ්ද කාඩ් පතේ හඬ පාලකය"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "නොදන්නා ශබ්ද පාලකයකි %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf ආරම්භ කිරීම අසමත් විය: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "ප්‍රතිවාදනය"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "ග්‍රහනය"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "ස්වීචයන්"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "ු/විකල්ප"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "කිසිදු පාලකයක් නොපෙනේ"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "කිසිදු පාලකයක් දෘශ්‍ය ලෙස ලකුනු කර නැත. කරුණාකර <span size='large'> <b>පාලකයන් තෝරන්න</b></span> කවුළුව විවෘත කර කිහිපයක් තෝරන්න."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "පාවත් පාලකයන් තෝරන්න"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr " දිස්විය යුතු පාලකය තෝරන්න"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "පිටවන්න(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "මිශ්‍රකයෙන් පිටවන්න"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "පාලකයන් තෝරන්න(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "කිනම් පාලකයක් දිස්විය යුතුදැයි තෝරන්න"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "තෝරන ලද පථයන්හි ශබ්දය පාලනය කිරීම සහ ශබ්ද කාඩ්පත් සුසර කිරීම"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "ශබ්ද කාඩ්පත්:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "තවම වමත් ක්ලික් විධානය අර්ථදක්වා නැත. ඔබට මෙය පේනු මෘදුකාංග වත්කම්හිල වෙනස් කළ හැක."
+
+#~ msgid "Properties"
+#~ msgstr "වත්කම්"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "මිශ්‍රණ පථය සහ වම්-ක්ලික් විධානය සැකසීම"
+
+#~ msgid "Sound card"
+#~ msgstr "ශබ්ද කාඩ්පත"
+
+#~ msgid "Left-click command"
+#~ msgstr "වමත් ක්ලික් විධානය"
+
+#~ msgid "Select command"
+#~ msgstr "තේරීමේක විධානය"
+
+#~ msgid "All Files"
+#~ msgstr "සියළුම ගොනු"
+
+#~ msgid "Executable Files"
+#~ msgstr "ක්‍රියාත්මක කළ හැකි ගොනු"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "පර්ල් විධානාවලි"
+
+#~ msgid "Python Scripts"
+#~ msgstr "පයිතන් විධානාවලි"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "රූබි විධානාවලි"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "කවච විධානාවලි"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "ඔබගේ ශබ්ද කාඩ් පතේ හඬ පාලකය"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "කිසිදු පාලකයක් දෘශ්‍ය ලෙස ලකුනු කර නැත. කරුණාකර <span size='large'> <b>පාලකයන් "
+#~ "තෝරන්න</b></span> කවුළුව විවෘත කර කිහිපයක් තෝරන්න."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce වැඩතල පරිපරය සඳහා ශබ්ද මිශ්‍රකයක්"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce වැඩතල පරිපරය සඳහා ශබ්ද මිශ්‍රකයක්"
 
-#~ msgid "Could not execute the command %s. Perhaps you need to adjust the PATH variable."
-#~ msgstr "%s විධානය ක්‍රියාත්මක කළ නොහැක. ඇතැම් විට ඔබට PATH විචල්‍යය සීරුමාරු කිරීමට අවශ්‍ය විය හැක."
+#~ msgid ""
+#~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
+#~ "variable."
+#~ msgstr ""
+#~ "%s විධානය ක්‍රියාත්මක කළ නොහැක. ඇතැම් විට ඔබට PATH විචල්‍යය සීරුමාරු කිරීමට අවශ්‍ය විය හැක."
 
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr "කරුණාකර පේනු මෘදුකාංගය මඟින් භාවිතා කළ යුතු මිශ්‍රක පථය තෝරන්න"
diff --git a/po/sk.po b/po/sk.po
index 16eb19d..08a6084 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,40 +8,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i 18n.xfce.org\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-05-28 17:41+0100\n"
 "Last-Translator: Robert Hartl <hartl.robert at gmail.com>\n"
 "Language-Team: slovak <sk-i18n at lists.linux.sk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Nebol definovaný príkaz pre kliknutie ľavým tlačidlom myši"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Nebol definovaný príkaz pre kliknutie ľavým tlačidlom myši. Nastavíte ho vo "
-"vlastnostiach tohto zásuvného modulu."
+"GStreamer nenašiel žiadne zvukové zariadenia. Pravdepodobne nie sú "
+"nainštalované niektoré balíčky GStreamer alebo nemáte príslušné oprávnenie."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Vlastnosti"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Nebol definovaný príkaz pre kliknutie ľavým tlačidlom myši"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -51,146 +51,207 @@ msgstr ""
 "Nie je možné spustiť príkaz \"%s\". Presvečte sa, či je umiestnenie príkazu "
 "obsiahnuté v premennom prostredí PATH alebo poskytujete celú cestu k príkazu"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer nenašiel žiadne zvukové zariadenia. Pravdepodobne nie sú "
-"nainštalované niektoré balíčky GStreamer alebo nemáte príslušné oprávnenie."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Zásuvný modul Zmiešavač"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfigurovať stopu zmiešavača a príkazu ľavého tlačidla myši"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Nastavenie zvukové karty a ovládanie hlasitostí vybraných stôp"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
 msgstr "Zvuková karta"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Zmiešavač stôp"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Príkazy pri kliknutí ľavým tlačidlom myši"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Vybrať príkaz"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Všetky súbory"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Spustitelné súbory"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Skripty jazyka Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Skripty jazyka Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Skripty jazyka Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shellové skripty"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Zmiešavač"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Ovládanie hlasitosti vašej zvukovej karty"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Neznámy ovládací prvok %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Zlyhala inicializácia xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Prehrávanie"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Záznam"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Prepínače"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Voľby"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Žiadne ovládacie prvky nie sú viditeľné"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Žiadne ovládacie prvky nie sú označené ako viditeľné. Pre výber týchto "
-"prvkov otvorte dialógové okno <span size='large'><b>Vybrať ovládacie prvky</"
-"b></span>."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Vybrať ovládacie prvky\t"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Vyberte prvky, ktoré majú byť zobrazené"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Ukončiť zmiešavač"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Vybrať ovládacie prvky\t"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Vyberte prvky, ktoré majú byť zobrazené"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Nastavenie zvukové karty a ovládanie hlasitostí vybraných stôp"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Zvuková karta"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Nebol definovaný príkaz pre kliknutie ľavým tlačidlom myši. Nastavíte ho "
+#~ "vo vlastnostiach tohto zásuvného modulu."
+
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfigurovať stopu zmiešavača a príkazu ľavého tlačidla myši"
+
+#~ msgid "Sound card"
+#~ msgstr "Zvuková karta"
+
+#~ msgid "Left-click command"
+#~ msgstr "Príkazy pri kliknutí ľavým tlačidlom myši"
+
+#~ msgid "Select command"
+#~ msgstr "Vybrať príkaz"
+
+#~ msgid "All Files"
+#~ msgstr "Všetky súbory"
+
+#~ msgid "Executable Files"
+#~ msgstr "Spustitelné súbory"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Skripty jazyka Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Skripty jazyka Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Skripty jazyka Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shellové skripty"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Ovládanie hlasitosti vašej zvukovej karty"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Žiadne ovládacie prvky nie sú označené ako viditeľné. Pre výber týchto "
+#~ "prvkov otvorte dialógové okno <span size='large'><b>Vybrať ovládacie "
+#~ "prvky</b></span>."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Zmiešavač zvuku pre pracovné prostredie Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Zmiešavač zvuku pre pracovné prostredie Xfce"
diff --git a/po/sr.po b/po/sr.po
index 6457879..a73415a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-09-24 19:46+0200\n"
 "Last-Translator: Саша Петровић <salepetronije at gmail.com>\n"
 "Language-Team: српски <xfce-i18n at xfce.org>\n"
@@ -19,31 +19,31 @@ msgstr ""
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Није одређена наредба левог клика"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Још увек није одређена наредба левог клика. То можете променити у својствима "
-"прикључка."
+"Гстример није могао познати ни један звучни уређај. Могуће је да неки "
+"посебни пакети звучног система Гстримера недостају. Такође, могуће је да је "
+"проблем у дозволама."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Особине"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Није одређена наредба левог клика"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -53,146 +53,206 @@ msgstr ""
 "Нисам могао да извршим нарадбу „%s“. Осигурајте или да је место наредбе "
 "укључено у PATH промениву окружења и да одредите потпуну путању до наредбе"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"Гстример није могао познати ни један звучни уређај. Могуће је да неки "
-"посебни пакети звучног система Гстримера недостају. Такође, могуће је да је "
-"проблем у дозволама."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Мешач прикључак"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Подеси канале мешача и команду левог клика"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Подесите звучну картицу(е) и управљајте јачином одабраног канала"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Звучна картица"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Звучна картица:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Канали мешача"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Наредба левог клика"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Одаберите наредбу"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Све датотеке"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Извршне датотеке"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Перл скрипте"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Пајтон скрипте"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Руби скрипте"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Шел скрипте"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Мешач звука"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Управљање јачином звука за вашу звучну картицу"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Непозната контрола управљања звуком %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Нисам успео да покренем xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Извођење"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Снимање"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Прекидачи"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Могућности"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Нема видљивих контрола"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Нема обележених контрола које би биле видљиве. Молим, отворите <span "
-"size='large'><b>Одаберите контроле</b></span> дијалог да би одабрали неку."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Изаберите контроле"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Изаберите које контроле требају бити видљиве "
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Напусти"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Напусти мешач"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Изаберите контроле..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Изаберите које контроле ће бити приказане"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Подесите звучну картицу(е) и управљајте јачином одабраног канала"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Звучна картица:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Још увек није одређена наредба левог клика. То можете променити у "
+#~ "својствима прикључка."
+
+#~ msgid "Properties"
+#~ msgstr "Особине"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Подеси канале мешача и команду левог клика"
+
+#~ msgid "Sound card"
+#~ msgstr "Звучна картица"
+
+#~ msgid "Left-click command"
+#~ msgstr "Наредба левог клика"
+
+#~ msgid "Select command"
+#~ msgstr "Одаберите наредбу"
+
+#~ msgid "All Files"
+#~ msgstr "Све датотеке"
+
+#~ msgid "Executable Files"
+#~ msgstr "Извршне датотеке"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Перл скрипте"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Пајтон скрипте"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Руби скрипте"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Шел скрипте"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Управљање јачином звука за вашу звучну картицу"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Нема обележених контрола које би биле видљиве. Молим, отворите <span "
+#~ "size='large'><b>Одаберите контроле</b></span> дијалог да би одабрали неку."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Звучни мешач за ИксФЦЕ радно окружење"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Звучни мешач за ИксФЦЕ радно окружење"
diff --git a/po/sv.po b/po/sv.po
index 5040a91..37d1e40 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,174 +7,250 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-09 00:04+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-02-09 00:10+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+"Language: sv\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"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:274
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Inget vänsterklickskommando definierat"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Inget vänsterklickskommando har definierats än. Du kan ändra detta i egenskaperna för insticksmodulen."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer kunde inte hitta några ljudenheter. Vissa ljudsystemsspecifika "
+"GStreamer-paket kanske saknas. Det kan också vara ett behörighetsproblem."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Egenskaper"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Inget vänsterklickskommando definierat"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "Kunde inte köra kommandot \"%s\". Försäkra dig om att antingen platsen för kommandot finns inkluderad i miljövariabeln PATH eller att den fullständiga sökvägen till kommandot används."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer kunde inte hitta några ljudenheter. Vissa ljudsystemsspecifika GStreamer-paket kanske saknas. Det kan också vara ett behörighetsproblem."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"Kunde inte köra kommandot \"%s\". Försäkra dig om att antingen platsen för "
+"kommandot finns inkluderad i miljövariabeln PATH eller att den fullständiga "
+"sökvägen till kommandot används."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Insticksmodul för mixer"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Konfigurera mixerspåret och vänsterklickskommando"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Konfigurera ljudkort och kontrollera volymen för valda spår"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Ljudkort"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Ljudkort:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Mixerspår"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Vänsterklickskommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Välj kommando"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Alla filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Körbara filer"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl-skript"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python-skript"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby-skript"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Skalskript"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Volymkontroll för ditt ljudkort"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:251
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Okänd volymkontroll %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Misslyckades med att initiera xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Uppspelning"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Fångst"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Växlar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Alternativ"
 
-#: ../xfce4-mixer/xfce-mixer.c:305
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Inga kontroller synliga"
 
-#: ../xfce4-mixer/xfce-mixer.c:309
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Inga kontroller är markerade som synliga. Öppna dialogrutan <span size='large'><b>Välj kontroller</b></span> för att välja några."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Välj kontroller"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Välj vilka kontroller som ska vara synliga"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Avsluta mixern"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Välj kontroller..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Välj vilka kontroller som ska visas"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Konfigurera ljudkort och kontrollera volymen för valda spår"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Ljudkort:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Inget vänsterklickskommando har definierats än. Du kan ändra detta i "
+#~ "egenskaperna för insticksmodulen."
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Konfigurera mixerspåret och vänsterklickskommando"
+
+#~ msgid "Sound card"
+#~ msgstr "Ljudkort"
+
+#~ msgid "Left-click command"
+#~ msgstr "Vänsterklickskommando"
+
+#~ msgid "Select command"
+#~ msgstr "Välj kommando"
+
+#~ msgid "All Files"
+#~ msgstr "Alla filer"
+
+#~ msgid "Executable Files"
+#~ msgstr "Körbara filer"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl-skript"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python-skript"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby-skript"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Skalskript"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Volymkontroll för ditt ljudkort"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Ljudmixer för skrivbordsmiljön Xfce"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Inga kontroller är markerade som synliga. Öppna dialogrutan <span "
+#~ "size='large'><b>Välj kontroller</b></span> för att välja några."
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Ljudmixer för skrivbordsmiljön Xfce"
diff --git a/po/tr.po b/po/tr.po
index 80e4dcd..26c24d2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,182 +7,261 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-07-11 01:53+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Türkçe <turkce at pardus.org.tr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Sağ tıklama komutu tanımlanmamış"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "Sağ tıklama komutu tanımlı değil. Eklenti özelliklerinden bunu tanımlayabilirsiniz."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer, sisteminizdeki ses kartını bulmak için uyumlu değil. Belki önemli "
+"bir GStreamer paketini yüklemeyi unutmuş olabilirsiniz ve bu da sorunun "
+"kaynağı olabilir."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Özellikler"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Sağ tıklama komutu tanımlanmamış"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "\"%s\" komutu başlatılamadı. PATH çevre değişkeninin, verdiğiniz komutun yerleşimini kapsadığınızdan emin olun ya da komutun tam yolunu yazınız."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer, sisteminizdeki ses kartını bulmak için uyumlu değil. Belki önemli bir GStreamer paketini yüklemeyi unutmuş olabilirsiniz ve bu da sorunun kaynağı olabilir."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"\"%s\" komutu başlatılamadı. PATH çevre değişkeninin, verdiğiniz komutun "
+"yerleşimini kapsadığınızdan emin olun ya da komutun tam yolunu yazınız."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Düzenleyici Eklentisi"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Düzenleyiciyi ve sol tıklama komutunu ayarla"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Ses kart(lar)ınızı ve seçili izlerin ses düzeylerini yapılandırın"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Ses kartı"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Ses kartı:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Düzenleyici izi"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Sol tıklama komutu"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Komut seç"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tüm Dosyalar"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Çalıştırılabilir Dosyalar"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl betikleri"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python Betikleri"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby Betikleri"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Kabuk Betikleri"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Ses Düzenleyicisi"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Ses kartınız için ses düzeyi ayarı"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Bilinmeyen Ses Düzeyi Ayarı: %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf sıfırlamasında hata: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Ses Çıkışı"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Ses Girişi"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Anahtarlar"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Seçenekler"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Görünürde düzenek yok"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "Ayar yapmak için hiç seçilmiş bir düzenek yok. Lütfen <span size='large'><b>Düzenekleri Seç</b></span> penceresini açın ve istediklerinizi seçin."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Düzenekleri Seç"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Görünecek düzenekleri seç"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Çı_k"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Ses düzenleyiciyi kapat"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Düzenekleri Seç..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Görünen düzenekleri seç"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Ses kart(lar)ınızı ve seçili izlerin ses düzeylerini yapılandırın"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Ses kartı:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Sağ tıklama komutu tanımlı değil. Eklenti özelliklerinden bunu "
+#~ "tanımlayabilirsiniz."
+
+#~ msgid "Properties"
+#~ msgstr "Özellikler"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce Masaüstü Yöneticisi için ses düzenleyicisi"
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Düzenleyiciyi ve sol tıklama komutunu ayarla"
+
+#~ msgid "Sound card"
+#~ msgstr "Ses kartı"
+
+#~ msgid "Left-click command"
+#~ msgstr "Sol tıklama komutu"
+
+#~ msgid "Select command"
+#~ msgstr "Komut seç"
+
+#~ msgid "All Files"
+#~ msgstr "Tüm Dosyalar"
+
+#~ msgid "Executable Files"
+#~ msgstr "Çalıştırılabilir Dosyalar"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl betikleri"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python Betikleri"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby Betikleri"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Kabuk Betikleri"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Ses kartınız için ses düzeyi ayarı"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Ayar yapmak için hiç seçilmiş bir düzenek yok. Lütfen <span "
+#~ "size='large'><b>Düzenekleri Seç</b></span> penceresini açın ve "
+#~ "istediklerinizi seçin."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce Masaüstü Yöneticisi için ses düzenleyicisi"
 
 #~ msgid ""
 #~ "Could not execute the command %s. Perhaps you need to adjust the PATH "
 #~ "variable."
 #~ msgstr "%s komutu çalıştırılamadı. Komutun dizin yolunu belirtmeyi deneyin."
+
 #~ msgid "Please select which mixer track should be used by the plugin"
 #~ msgstr "Lütfen eklenti tarafından ihtiyaç duyulan düzenleyici izini seçin"
+
 #~ msgid "Please select which controls you want to be visible"
 #~ msgstr "Lütfen görünmesini istediğiniz düzenekleri seçin"
-
diff --git a/po/ug.po b/po/ug.po
index bd9575a..b208cbb 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,170 +7,250 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2008-12-11 16:54+0900\n"
 "Last-Translator: Gheyret T.Kenji <gheyret at gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ at yahoogroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "سول-چەك بۇيرۇقى بېكىتىلمىگەن"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "سول-چەك بۇيرۇقىنى بېكىتىلمەپتۇ. بۇنى قىستۇرمىنىڭ خاسلىقىدا ئۆزگەرتىشكە بولىدۇ."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer ھېچقانداق ئۈن ئۈسكۈنىسىنى تاپالمىدى. ئۈن سىستېمىسىغا مۇناسىۋەتلىك "
+"بولغان GStreamer نىڭ بىر قىسىم  بولاقلىرى يوقتەك قىلىدۇ. يەنە بىرى بەلكىم "
+"ھوقۇقىڭىز يەتمىگەن بولۇشىمۇ مۇمكىن."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "خاسلىق"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "سول-چەك بۇيرۇقى بېكىتىلمىگەن"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "بۇيرۇق \"%s\" نى ئىجرا قىلغىلى بولمىدى. بۇيرۇقنىڭ يولى PATH دېگەن مۇھىت ئۆزگەرگۈچىنىڭ ئىچىدىمۇ ئەمەسمۇ، ياكى بۇيرۇقنى تولۇق يولى بىلەن يازدىڭىزمۇ يامىدىڭىزمۇ تەكشۈرۈڭ"
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer ھېچقانداق ئۈن ئۈسكۈنىسىنى تاپالمىدى. ئۈن سىستېمىسىغا مۇناسىۋەتلىك بولغان GStreamer نىڭ بىر قىسىم  بولاقلىرى يوقتەك قىلىدۇ. يەنە بىرى بەلكىم ھوقۇقىڭىز يەتمىگەن بولۇشىمۇ مۇمكىن."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"بۇيرۇق \"%s\" نى ئىجرا قىلغىلى بولمىدى. بۇيرۇقنىڭ يولى PATH دېگەن مۇھىت "
+"ئۆزگەرگۈچىنىڭ ئىچىدىمۇ ئەمەسمۇ، ياكى بۇيرۇقنى تولۇق يولى بىلەن يازدىڭىزمۇ "
+"يامىدىڭىزمۇ تەكشۈرۈڭ"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Mixer قىستۇرمىسى"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "mixer track ۋە سول-چەك بۇيرۇقىنى تەڭشەش"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "ئۈن كارتىسىنى تەڭشەيدۇ ۋە تاللانغان track نىڭ ئاۋازى كونترول قىلىدۇ"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
 msgstr "ئۈن كارتىسى"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "mixer رېلىسى"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "سول-چەك بۇيرۇقى"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "بۇيرۇق تاللا"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "ھەممە ھۆججەت"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "پروگرامما(ئىجرا بولىدىغان ھۆججەت)"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl پروگراممىسى"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python پروگراممىسى"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby پروگراممىسى"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell پروگراممىسى"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "ئۈن كارتىسىنىڭ ئاۋاز باشقۇرغۇچى"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "ئاۋاز باشقۇرغۇچ %d نامەلۇم"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf نى دەسلەپلەشتۈرۈش مەغلۇپ بولدى: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "قويۇش"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "تۇت"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "ئۈزچاتلار"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "تاللانما"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "control نىڭ ھېچقايسىسى كۆرۈنمەيدۇ"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "control نىڭ ھېچقايسىسى كۆرۈنمەيدىكەن. <span size='large'><b>Control تاللاش</b> كۆزنىكىنى ئېچىپ</span> بىرەرىنى تاللاڭ."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Control تاللاش"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "كۆرۈنىدىغان control نى تاللا"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "ئاخىرلاشتۇر(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "mixer دىن چىق"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Control تاللا(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "كۆرسىتىلىدىغان control نى تاللايدۇ"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "ئۈن كارتىسىنى تەڭشەيدۇ ۋە تاللانغان track نىڭ ئاۋازى كونترول قىلىدۇ"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "ئۈن كارتىسى"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "سول-چەك بۇيرۇقىنى بېكىتىلمەپتۇ. بۇنى قىستۇرمىنىڭ خاسلىقىدا ئۆزگەرتىشكە "
+#~ "بولىدۇ."
+
+#~ msgid "Properties"
+#~ msgstr "خاسلىق"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "mixer track ۋە سول-چەك بۇيرۇقىنى تەڭشەش"
+
+#~ msgid "Sound card"
+#~ msgstr "ئۈن كارتىسى"
+
+#~ msgid "Left-click command"
+#~ msgstr "سول-چەك بۇيرۇقى"
+
+#~ msgid "Select command"
+#~ msgstr "بۇيرۇق تاللا"
+
+#~ msgid "All Files"
+#~ msgstr "ھەممە ھۆججەت"
+
+#~ msgid "Executable Files"
+#~ msgstr "پروگرامما(ئىجرا بولىدىغان ھۆججەت)"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl پروگراممىسى"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python پروگراممىسى"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby پروگراممىسى"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell پروگراممىسى"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "ئۈن كارتىسىنىڭ ئاۋاز باشقۇرغۇچى"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "control نىڭ ھېچقايسىسى كۆرۈنمەيدىكەن. <span size='large'><b>Control "
+#~ "تاللاش</b> كۆزنىكىنى ئېچىپ</span> بىرەرىنى تاللاڭ."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce ئۈستەلئۈستىدىكى  ئۈن mixer ئى"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce ئۈستەلئۈستىدىكى  ئۈن mixer ئى"
diff --git a/po/uk.po b/po/uk.po
index 46a50a7..6da3502 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,48 +1,48 @@
 # Ukrainian translation of xfce4-mixer.
 # Copyright (C) 2008 Dmitry Nikitin
 # This file is distributed under the same license as the xfce4-mixer package.
-# 
+#
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-26 12:17+0200\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Не визначено команду при клацанні лівою кнопкою миші"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Ще не визначено команди при клацанні лівою кнопкою миші. Ви можете "
-"призначити її у властивостях цього плагіна."
+"GStreamer не вдалось виявити будь-яких звукових карт. У Вашій системі "
+"можливо відсутні пакунки для GStreamer. Можливо проблеми прав доступу."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Властивості"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Не визначено команду при клацанні лівою кнопкою миші"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -53,147 +53,210 @@ msgstr ""
 "команди включено до середовища змінних PATH або зазначте повний шлях до "
 "команди."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStreamer не вдалось виявити будь-яких звукових карт. У Вашій системі "
-"можливо відсутні пакунки для GStreamer. Можливо проблеми прав доступу."
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Плагін мікшера"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Налаштувати повзунок мікшера і команду по лівому клацанню"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr ""
+"Налаштуйте Вашу звукову карту(и) і елементи управління гучністю вибраних "
+"треків"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Звукова карта"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Звукова карта:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Трек мікшера"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Команда при клацанні лівою кнопкою"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Вибрати команду"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Всі файли"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Виконувані файли"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Скрипти Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Скрипти Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Скрипти Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Скрипти Shell"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Регулювання гучності"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Параметри гучності для вашої звукової карти"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Невідомий канал гучності %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Невдача при ініціалізації xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Програвання"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Запис"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Перемикачі"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Параметри"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Немає видимих елементів управління"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Немає позначених видимими. Відкрийте діалог        <span "
-"size='large'><b>Вибір каналів</b></span> щоб вибрати потрібні."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Вибір каналів"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Виберіть елементи управління, які будуть відображатись"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Вийти з мікшера"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "Вибер_іть канали..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Виберіть канали, які будуть відображатись"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
 "Налаштуйте Вашу звукову карту(и) і елементи управління гучністю вибраних "
 "треків"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Звукова карта:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Ще не визначено команди при клацанні лівою кнопкою миші. Ви можете "
+#~ "призначити її у властивостях цього плагіна."
+
+#~ msgid "Properties"
+#~ msgstr "Властивості"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Налаштувати повзунок мікшера і команду по лівому клацанню"
+
+#~ msgid "Sound card"
+#~ msgstr "Звукова карта"
+
+#~ msgid "Left-click command"
+#~ msgstr "Команда при клацанні лівою кнопкою"
+
+#~ msgid "Select command"
+#~ msgstr "Вибрати команду"
+
+#~ msgid "All Files"
+#~ msgstr "Всі файли"
+
+#~ msgid "Executable Files"
+#~ msgstr "Виконувані файли"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Скрипти Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Скрипти Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Скрипти Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Скрипти Shell"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Параметри гучності для вашої звукової карти"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Немає позначених видимими. Відкрийте діалог        <span "
+#~ "size='large'><b>Вибір каналів</b></span> щоб вибрати потрібні."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Регулятор гучності для середовища стільниці Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Регулятор гучності для середовища стільниці Xfce"
diff --git a/po/ur.po b/po/ur.po
index e4d4e0c..81e10eb 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-05-14 02:27+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,301 +20,441 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "کوئی بائیں-کلک کمانڈ متعین نہیں"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "ابھی تک کوئی دائیں-کلک کمانڈ متعین نہیں کی گئی. آپ اسے پلگ ان کی خصوصیات میں تبدیل کر سکتے ہیں."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"جی سٹریمر کوئی صوتی ڈیوائسیں تلاش نہیں کر پایا. کچھ صوتی نظام خاص طور سے "
+"GStreamer پیکج ممکنہ طور پر مفقود ہوسکتا ہے. اس کے علاوہ یہ اجازوں (پرمیشنز) "
+"کا مسئلہ بھی ہوسکتا ہے."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "خصوصیات"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "کوئی بائیں-کلک کمانڈ متعین نہیں"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "کمانڈ \"%s\" نہیں چلائی جاسکتی. اس امر کا یقین کر لیں کہ کیا کمانڈ کا مقام پاتھ ماحول متغیر میں شامل ہے یا یہ کہ آپ کمانڈ کو پورا پاتھ دے رہے ہیں."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "جی سٹریمر کوئی صوتی ڈیوائسیں تلاش نہیں کر پایا. کچھ صوتی نظام خاص طور سے GStreamer پیکج ممکنہ طور پر مفقود ہوسکتا ہے. اس کے علاوہ یہ اجازوں (پرمیشنز) کا مسئلہ بھی ہوسکتا ہے."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"کمانڈ \"%s\" نہیں چلائی جاسکتی. اس امر کا یقین کر لیں کہ کیا کمانڈ کا مقام "
+"پاتھ ماحول متغیر میں شامل ہے یا یہ کہ آپ کمانڈ کو پورا پاتھ دے رہے ہیں."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "مکسر پلگ ان"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "مکسر ٹریک اور دائیں-کلک کمانڈ مرتب کریں"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "صوتی کارڈ مرتب کریں اور منتخب ٹریک کا والیم کنٹرول کریں"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "آواز کارڈ"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "آواز کارڈ:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "مکسر ٹریک"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "بائیں-کلک کمانڈ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "کمانڈ منتخب کریں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "تمام فائلیں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "اطلاقی فائلیں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "پرل سکرپٹ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "پائتھن سکرپت"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "روبی سکرپٹ"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "شیل سکرپٹ"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "مکسر"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "آپ کے آواز کارڈ کے لیے والیم کنٹرول"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "نا معلوم والیم کنٹرول %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf کو چلانے میں ناکامی: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "پلےبیک"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "کیپچر"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "سوچز"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "اختیارات"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "کوئی ظاہری کنٹرول نہیں"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "کوئی کنٹرول بطور ظاہر نشان زدہ نہیں. براہ مہربانی <span size='large'><b>کنٹرول منتخب کریں</b></span> ڈائیلاگ کھولیں اور ایک منتخب کریں."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "کنٹرول منتخب کریں"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "منتخب کریں کہ کون سا کنٹرول ظاہر ہونا چاہیے"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_برخاست"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "مکسر بند کریں"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_کنٹرول منتخب کریں..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "منتخب کریں کہ کون سا کنٹرول نظر آنا چاہیے"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "صوتی کارڈ مرتب کریں اور منتخب ٹریک کا والیم کنٹرول کریں"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "آواز کارڈ:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "ابھی تک کوئی دائیں-کلک کمانڈ متعین نہیں کی گئی. آپ اسے پلگ ان کی خصوصیات "
+#~ "میں تبدیل کر سکتے ہیں."
+
+#~ msgid "Properties"
+#~ msgstr "خصوصیات"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "مکسر ٹریک اور دائیں-کلک کمانڈ مرتب کریں"
+
+#~ msgid "Sound card"
+#~ msgstr "آواز کارڈ"
+
+#~ msgid "Left-click command"
+#~ msgstr "بائیں-کلک کمانڈ"
+
+#~ msgid "Select command"
+#~ msgstr "کمانڈ منتخب کریں"
+
+#~ msgid "All Files"
+#~ msgstr "تمام فائلیں"
+
+#~ msgid "Executable Files"
+#~ msgstr "اطلاقی فائلیں"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
+#~ msgid "Perl Scripts"
+#~ msgstr "پرل سکرپٹ"
+
+#~ msgid "Python Scripts"
+#~ msgstr "پائتھن سکرپت"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "روبی سکرپٹ"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "شیل سکرپٹ"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "آپ کے آواز کارڈ کے لیے والیم کنٹرول"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "کوئی کنٹرول بطور ظاہر نشان زدہ نہیں. براہ مہربانی <span "
+#~ "size='large'><b>کنٹرول منتخب کریں</b></span> ڈائیلاگ کھولیں اور ایک منتخب "
+#~ "کریں."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
 
 #~ msgid "Vol"
 #~ msgstr "والیم"
+
 #~ msgid "Pcm"
 #~ msgstr "Pcm"
+
 #~ msgid "Spkr"
 #~ msgstr "Spkr"
+
 #~ msgid "Line"
 #~ msgstr "لائن"
+
 #~ msgid "Mic"
 #~ msgstr "Mic"
+
 #~ msgid "CD"
 #~ msgstr "CD"
+
 #~ msgid "Bass"
 #~ msgstr "Bass"
+
 #~ msgid "Trebl"
 #~ msgstr "Trebl"
+
 #~ msgid "Synth"
 #~ msgstr "Synth"
+
 #~ msgid "Pcm2"
 #~ msgstr "Pcm2"
+
 #~ msgid "Rec"
 #~ msgstr "Rec"
+
 #~ msgid "IGain"
 #~ msgstr "IGain"
+
 #~ msgid "OGain"
 #~ msgstr "OGain"
+
 #~ msgid "Line1"
 #~ msgstr "لائن1"
+
 #~ msgid "Line2"
 #~ msgstr "لائن2"
+
 #~ msgid "Line3"
 #~ msgstr "لائن3"
+
 #~ msgid "Digital1"
 #~ msgstr "رقمی1"
+
 #~ msgid "Digital2"
 #~ msgstr "رقمی2"
+
 #~ msgid "Digital3"
 #~ msgstr "رقمی3"
+
 #~ msgid "PhoneIn"
 #~ msgstr "فون ان"
+
 #~ msgid "PhoneOut"
 #~ msgstr "فون آؤٹ"
+
 #~ msgid "Video"
 #~ msgstr "وڈیو"
+
 #~ msgid "Radio"
 #~ msgstr "ریڈیو"
+
 #~ msgid "Monitor"
 #~ msgstr "مانیٹر"
+
 #~ msgid "RecSelect"
 #~ msgstr "RecSelect"
+
 #~ msgid "A3.AnalogIn"
 #~ msgstr "A3.AnalogIn"
+
 #~ msgid "A3.AnalogOut"
 #~ msgstr "A3.AnalogOut"
+
 #~ msgid "A3.AnalogOut2"
 #~ msgstr "A3.AnalogOut2"
+
 #~ msgid "A3.CameraMic"
 #~ msgstr "A3.CameraMic"
+
 #~ msgid "A3.Microphone"
 #~ msgstr "A3.Microphone"
+
 #~ msgid "A3.LineIn"
 #~ msgstr "A3.LineIn"
+
 #~ msgid "A3.DAC1In"
 #~ msgstr "A3.DAC1In"
+
 #~ msgid "A3.DAC2In"
 #~ msgstr "A3.DAC2In"
+
 #~ msgid "A3.Speaker"
 #~ msgstr "A3.Speaker"
+
 #~ msgid "A3.LineOut2"
 #~ msgstr "A3.LineOut2"
+
 #~ msgid ""
 #~ "alsa: error: master control not found. I even tried to guess wildly, but "
 #~ "to no avail.\n"
 #~ msgstr ""
 #~ "السا: غلطی: ماسٹر کنٹرول تلاش نہیں کیا جاسکا. میں نے قیاس کرنے کی بھی بہت "
 #~ "کوشش کی مگر کوئی فائدہ نہیں ہوا.\n"
+
 #~ msgid ""
 #~ "alsa: info: developer information follows: (send E-Mail to Developer with "
 #~ "that)\n"
 #~ msgstr ""
 #~ "السا: معلومات: ڈیولپر کی معلومات یہ ہے: (ڈیولپر کو اس سے ای میل بھیجیں)\n"
+
 #~ msgid "hint hint"
 #~ msgstr "اشارہ اشارہ"
+
 #~ msgid "alsa: info: end of developer information\n"
 #~ msgstr "السا: معلومات: ڈیولپر معلومات کا اختتام\n"
+
 #~ msgid "alsa: Mixer %s open error: %s\n"
 #~ msgstr "السا: مکسر %s کھلی غلطی: %s\n"
+
 #~ msgid "alsa: Mixer attach %s error: %s\n"
 #~ msgstr "السا: مکسر اٹیچ %s غلطی: %s\n"
+
 #~ msgid "alsa: Mixer register error: %s\n"
 #~ msgstr "السا: مکسر رجسٹر غلطی: %s\n"
+
 #~ msgid "alsa: Mixer load error: %s: %s\n"
 #~ msgstr "السا: مکسر لوڈ غلطی: %s: %s\n"
+
 #~ msgid "alsa: Unable to find simple control '%s',%i\n"
 #~ msgstr "السا: سادہ کنٹرول تلاش نہیں کیا جاسکا '%s',%i \n"
+
 #~ msgid "oss: No master volume"
 #~ msgstr "oss: کوئی ماسٹر والیم نہیں"
+
 #~ msgid "Run in Terminal"
 #~ msgstr "ٹرمنل میں چلائیں"
+
 #~ msgid "Use Startup Notification"
 #~ msgstr "ابتدائیہ انتباہات استعمال کریں"
+
 #~ msgid "Could not run \"%s\""
 #~ msgstr "\"%s\" کو نہیں چلایا جاسکتا"
+
 #~ msgid "Xfce Panel"
 #~ msgstr "ایکسفس پینل"
+
 #~ msgid "Volume: %d%%"
 #~ msgstr "والیم: %d%%"
+
 #~ msgid "Could not save configuration"
 #~ msgstr "ترتیبات محفوظ نہیں ہوسکتیں"
+
 #~ msgid "Device:"
 #~ msgstr "ڈیوائس:"
+
 #~ msgid "Wannabe Master:"
 #~ msgstr "Wannabe ماسٹر:"
+
 #~ msgid "When clicked"
 #~ msgstr "جب کلک کیا جائے"
+
 #~ msgid "Device"
 #~ msgstr "ڈیوائس"
+
 #~ msgid "None"
 #~ msgstr "کچھ نہیں"
+
 #~ msgid "Button Label|Sound"
 #~ msgstr "آواز"
+
 #~ msgid "/_File"
 #~ msgstr "/_فائل"
+
 #~ msgid "/File/_Exit"
 #~ msgstr "/فائل/_برخاست"
+
 #~ msgid "/_View"
 #~ msgstr "/_منظر"
+
 #~ msgid "/View/_Manage"
 #~ msgstr "/منظر/_ادارت"
+
 #~ msgid "/_Help"
 #~ msgstr "/_ہدایات"
+
 #~ msgid "/Help/_Info"
 #~ msgstr "/ہدایات/_معلومات"
+
 #~ msgid ""
 #~ "This is xfce4-mixer, a volume control program.\n"
 #~ "It is released under the GPL-2 License which you find in the source "
@@ -323,50 +464,72 @@ msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
 #~ "یہ xfce4-mixer ہے جو ایک والیم کنٹرول پروگرام ہے.\n"
 #~ "یہ GPL-2 لائسنس کے تحت جاری کیا گیا ہے جو مصدر ڈائریکٹری میں موجود ہے.\n"
 #~ "اردو ترجمہ از محمد علی مکی."
+
 #~ msgid "Control"
 #~ msgstr "کنٹرول"
+
 #~ msgid "Type"
 #~ msgstr "قسم"
+
 #~ msgid "Up"
 #~ msgstr "اوپر"
+
 #~ msgid "Down"
 #~ msgstr "نیچے"
+
 #~ msgid "Move Entry Up"
 #~ msgstr "انٹری اوپر منتقل کریں"
+
 #~ msgid "Move Entry Down"
 #~ msgstr "انٹری نیچے منتقل کریں"
+
 #~ msgid "Profile Name:"
 #~ msgstr "پروفائل کا نام:"
+
 #~ msgid "<unknown>"
 #~ msgstr "<نا معلوم>"
+
 #~ msgid "<slider>"
 #~ msgstr "<سلائڈر>"
+
 #~ msgid "<onoff>"
 #~ msgstr "<آن آف>"
+
 #~ msgid "<select>"
 #~ msgstr "<منتخب کریں>"
+
 #~ msgid "Create new profile"
 #~ msgstr "نئی پروفائل بنائیں"
+
 #~ msgid "Delete this profile"
 #~ msgstr "یہ پروفائل حذف کریں"
+
 #~ msgid "Profile"
 #~ msgstr "پروفائل"
+
 #~ msgid "Really delete those %d profiles?"
 #~ msgstr "واقعی یہ %d پروفائلیں حذف کردی جائیں؟"
+
 #~ msgid "Really delete profile \"%s\"?"
 #~ msgstr "کیا واقعی پروفائل \"%s\" حذف کردی جائے؟"
+
 #~ msgid "%s - New"
 #~ msgstr "%s - نیا"
+
 #~ msgid "A profile needs a name"
 #~ msgstr "پروفائل کو نام درکار ہے"
+
 #~ msgid "A profile with that name already exists"
 #~ msgstr "اس نام کی پروفائل پہلے ہی موجود ہے"
+
 #~ msgid "profile%d"
 #~ msgstr "پروفائل%d"
+
 #~ msgid "Hide Switches"
 #~ msgstr "سوچز چھپائیں"
+
 #~ msgid "Change the Volume"
 #~ msgstr "والیم تبدیل کریں"
+
 #~ msgid "Xfce 4 Mixer Settings"
 #~ msgstr "ایکسفس 4 مکسر ترتیبات"
-
diff --git a/po/ur_PK.po b/po/ur_PK.po
index e4d4e0c..81e10eb 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-05-14 02:27+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
+"Language: ur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,301 +20,441 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "کوئی بائیں-کلک کمانڈ متعین نہیں"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "ابھی تک کوئی دائیں-کلک کمانڈ متعین نہیں کی گئی. آپ اسے پلگ ان کی خصوصیات میں تبدیل کر سکتے ہیں."
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"جی سٹریمر کوئی صوتی ڈیوائسیں تلاش نہیں کر پایا. کچھ صوتی نظام خاص طور سے "
+"GStreamer پیکج ممکنہ طور پر مفقود ہوسکتا ہے. اس کے علاوہ یہ اجازوں (پرمیشنز) "
+"کا مسئلہ بھی ہوسکتا ہے."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "خصوصیات"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "کوئی بائیں-کلک کمانڈ متعین نہیں"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "کمانڈ \"%s\" نہیں چلائی جاسکتی. اس امر کا یقین کر لیں کہ کیا کمانڈ کا مقام پاتھ ماحول متغیر میں شامل ہے یا یہ کہ آپ کمانڈ کو پورا پاتھ دے رہے ہیں."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "جی سٹریمر کوئی صوتی ڈیوائسیں تلاش نہیں کر پایا. کچھ صوتی نظام خاص طور سے GStreamer پیکج ممکنہ طور پر مفقود ہوسکتا ہے. اس کے علاوہ یہ اجازوں (پرمیشنز) کا مسئلہ بھی ہوسکتا ہے."
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"کمانڈ \"%s\" نہیں چلائی جاسکتی. اس امر کا یقین کر لیں کہ کیا کمانڈ کا مقام "
+"پاتھ ماحول متغیر میں شامل ہے یا یہ کہ آپ کمانڈ کو پورا پاتھ دے رہے ہیں."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "مکسر پلگ ان"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "مکسر ٹریک اور دائیں-کلک کمانڈ مرتب کریں"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "صوتی کارڈ مرتب کریں اور منتخب ٹریک کا والیم کنٹرول کریں"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "آواز کارڈ"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "آواز کارڈ:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "مکسر ٹریک"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "بائیں-کلک کمانڈ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "کمانڈ منتخب کریں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "تمام فائلیں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "اطلاقی فائلیں"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "پرل سکرپٹ"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "پائتھن سکرپت"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "روبی سکرپٹ"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "شیل سکرپٹ"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "مکسر"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "آپ کے آواز کارڈ کے لیے والیم کنٹرول"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "نا معلوم والیم کنٹرول %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "xfconf کو چلانے میں ناکامی: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "پلےبیک"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "کیپچر"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "سوچز"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "اختیارات"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "کوئی ظاہری کنٹرول نہیں"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "کوئی کنٹرول بطور ظاہر نشان زدہ نہیں. براہ مہربانی <span size='large'><b>کنٹرول منتخب کریں</b></span> ڈائیلاگ کھولیں اور ایک منتخب کریں."
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "کنٹرول منتخب کریں"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "منتخب کریں کہ کون سا کنٹرول ظاہر ہونا چاہیے"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_برخاست"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "مکسر بند کریں"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_کنٹرول منتخب کریں..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "منتخب کریں کہ کون سا کنٹرول نظر آنا چاہیے"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "صوتی کارڈ مرتب کریں اور منتخب ٹریک کا والیم کنٹرول کریں"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "آواز کارڈ:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "ابھی تک کوئی دائیں-کلک کمانڈ متعین نہیں کی گئی. آپ اسے پلگ ان کی خصوصیات "
+#~ "میں تبدیل کر سکتے ہیں."
+
+#~ msgid "Properties"
+#~ msgstr "خصوصیات"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "مکسر ٹریک اور دائیں-کلک کمانڈ مرتب کریں"
+
+#~ msgid "Sound card"
+#~ msgstr "آواز کارڈ"
+
+#~ msgid "Left-click command"
+#~ msgstr "بائیں-کلک کمانڈ"
+
+#~ msgid "Select command"
+#~ msgstr "کمانڈ منتخب کریں"
+
+#~ msgid "All Files"
+#~ msgstr "تمام فائلیں"
+
+#~ msgid "Executable Files"
+#~ msgstr "اطلاقی فائلیں"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
+#~ msgid "Perl Scripts"
+#~ msgstr "پرل سکرپٹ"
+
+#~ msgid "Python Scripts"
+#~ msgstr "پائتھن سکرپت"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "روبی سکرپٹ"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "شیل سکرپٹ"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "آپ کے آواز کارڈ کے لیے والیم کنٹرول"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "کوئی کنٹرول بطور ظاہر نشان زدہ نہیں. براہ مہربانی <span "
+#~ "size='large'><b>کنٹرول منتخب کریں</b></span> ڈائیلاگ کھولیں اور ایک منتخب "
+#~ "کریں."
+
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
 
 #~ msgid "Vol"
 #~ msgstr "والیم"
+
 #~ msgid "Pcm"
 #~ msgstr "Pcm"
+
 #~ msgid "Spkr"
 #~ msgstr "Spkr"
+
 #~ msgid "Line"
 #~ msgstr "لائن"
+
 #~ msgid "Mic"
 #~ msgstr "Mic"
+
 #~ msgid "CD"
 #~ msgstr "CD"
+
 #~ msgid "Bass"
 #~ msgstr "Bass"
+
 #~ msgid "Trebl"
 #~ msgstr "Trebl"
+
 #~ msgid "Synth"
 #~ msgstr "Synth"
+
 #~ msgid "Pcm2"
 #~ msgstr "Pcm2"
+
 #~ msgid "Rec"
 #~ msgstr "Rec"
+
 #~ msgid "IGain"
 #~ msgstr "IGain"
+
 #~ msgid "OGain"
 #~ msgstr "OGain"
+
 #~ msgid "Line1"
 #~ msgstr "لائن1"
+
 #~ msgid "Line2"
 #~ msgstr "لائن2"
+
 #~ msgid "Line3"
 #~ msgstr "لائن3"
+
 #~ msgid "Digital1"
 #~ msgstr "رقمی1"
+
 #~ msgid "Digital2"
 #~ msgstr "رقمی2"
+
 #~ msgid "Digital3"
 #~ msgstr "رقمی3"
+
 #~ msgid "PhoneIn"
 #~ msgstr "فون ان"
+
 #~ msgid "PhoneOut"
 #~ msgstr "فون آؤٹ"
+
 #~ msgid "Video"
 #~ msgstr "وڈیو"
+
 #~ msgid "Radio"
 #~ msgstr "ریڈیو"
+
 #~ msgid "Monitor"
 #~ msgstr "مانیٹر"
+
 #~ msgid "RecSelect"
 #~ msgstr "RecSelect"
+
 #~ msgid "A3.AnalogIn"
 #~ msgstr "A3.AnalogIn"
+
 #~ msgid "A3.AnalogOut"
 #~ msgstr "A3.AnalogOut"
+
 #~ msgid "A3.AnalogOut2"
 #~ msgstr "A3.AnalogOut2"
+
 #~ msgid "A3.CameraMic"
 #~ msgstr "A3.CameraMic"
+
 #~ msgid "A3.Microphone"
 #~ msgstr "A3.Microphone"
+
 #~ msgid "A3.LineIn"
 #~ msgstr "A3.LineIn"
+
 #~ msgid "A3.DAC1In"
 #~ msgstr "A3.DAC1In"
+
 #~ msgid "A3.DAC2In"
 #~ msgstr "A3.DAC2In"
+
 #~ msgid "A3.Speaker"
 #~ msgstr "A3.Speaker"
+
 #~ msgid "A3.LineOut2"
 #~ msgstr "A3.LineOut2"
+
 #~ msgid ""
 #~ "alsa: error: master control not found. I even tried to guess wildly, but "
 #~ "to no avail.\n"
 #~ msgstr ""
 #~ "السا: غلطی: ماسٹر کنٹرول تلاش نہیں کیا جاسکا. میں نے قیاس کرنے کی بھی بہت "
 #~ "کوشش کی مگر کوئی فائدہ نہیں ہوا.\n"
+
 #~ msgid ""
 #~ "alsa: info: developer information follows: (send E-Mail to Developer with "
 #~ "that)\n"
 #~ msgstr ""
 #~ "السا: معلومات: ڈیولپر کی معلومات یہ ہے: (ڈیولپر کو اس سے ای میل بھیجیں)\n"
+
 #~ msgid "hint hint"
 #~ msgstr "اشارہ اشارہ"
+
 #~ msgid "alsa: info: end of developer information\n"
 #~ msgstr "السا: معلومات: ڈیولپر معلومات کا اختتام\n"
+
 #~ msgid "alsa: Mixer %s open error: %s\n"
 #~ msgstr "السا: مکسر %s کھلی غلطی: %s\n"
+
 #~ msgid "alsa: Mixer attach %s error: %s\n"
 #~ msgstr "السا: مکسر اٹیچ %s غلطی: %s\n"
+
 #~ msgid "alsa: Mixer register error: %s\n"
 #~ msgstr "السا: مکسر رجسٹر غلطی: %s\n"
+
 #~ msgid "alsa: Mixer load error: %s: %s\n"
 #~ msgstr "السا: مکسر لوڈ غلطی: %s: %s\n"
+
 #~ msgid "alsa: Unable to find simple control '%s',%i\n"
 #~ msgstr "السا: سادہ کنٹرول تلاش نہیں کیا جاسکا '%s',%i \n"
+
 #~ msgid "oss: No master volume"
 #~ msgstr "oss: کوئی ماسٹر والیم نہیں"
+
 #~ msgid "Run in Terminal"
 #~ msgstr "ٹرمنل میں چلائیں"
+
 #~ msgid "Use Startup Notification"
 #~ msgstr "ابتدائیہ انتباہات استعمال کریں"
+
 #~ msgid "Could not run \"%s\""
 #~ msgstr "\"%s\" کو نہیں چلایا جاسکتا"
+
 #~ msgid "Xfce Panel"
 #~ msgstr "ایکسفس پینل"
+
 #~ msgid "Volume: %d%%"
 #~ msgstr "والیم: %d%%"
+
 #~ msgid "Could not save configuration"
 #~ msgstr "ترتیبات محفوظ نہیں ہوسکتیں"
+
 #~ msgid "Device:"
 #~ msgstr "ڈیوائس:"
+
 #~ msgid "Wannabe Master:"
 #~ msgstr "Wannabe ماسٹر:"
+
 #~ msgid "When clicked"
 #~ msgstr "جب کلک کیا جائے"
+
 #~ msgid "Device"
 #~ msgstr "ڈیوائس"
+
 #~ msgid "None"
 #~ msgstr "کچھ نہیں"
+
 #~ msgid "Button Label|Sound"
 #~ msgstr "آواز"
+
 #~ msgid "/_File"
 #~ msgstr "/_فائل"
+
 #~ msgid "/File/_Exit"
 #~ msgstr "/فائل/_برخاست"
+
 #~ msgid "/_View"
 #~ msgstr "/_منظر"
+
 #~ msgid "/View/_Manage"
 #~ msgstr "/منظر/_ادارت"
+
 #~ msgid "/_Help"
 #~ msgstr "/_ہدایات"
+
 #~ msgid "/Help/_Info"
 #~ msgstr "/ہدایات/_معلومات"
+
 #~ msgid ""
 #~ "This is xfce4-mixer, a volume control program.\n"
 #~ "It is released under the GPL-2 License which you find in the source "
@@ -323,50 +464,72 @@ msgstr "صوتی مکسر برائے ایکسفس ڈیسک ٹاپ ماحول"
 #~ "یہ xfce4-mixer ہے جو ایک والیم کنٹرول پروگرام ہے.\n"
 #~ "یہ GPL-2 لائسنس کے تحت جاری کیا گیا ہے جو مصدر ڈائریکٹری میں موجود ہے.\n"
 #~ "اردو ترجمہ از محمد علی مکی."
+
 #~ msgid "Control"
 #~ msgstr "کنٹرول"
+
 #~ msgid "Type"
 #~ msgstr "قسم"
+
 #~ msgid "Up"
 #~ msgstr "اوپر"
+
 #~ msgid "Down"
 #~ msgstr "نیچے"
+
 #~ msgid "Move Entry Up"
 #~ msgstr "انٹری اوپر منتقل کریں"
+
 #~ msgid "Move Entry Down"
 #~ msgstr "انٹری نیچے منتقل کریں"
+
 #~ msgid "Profile Name:"
 #~ msgstr "پروفائل کا نام:"
+
 #~ msgid "<unknown>"
 #~ msgstr "<نا معلوم>"
+
 #~ msgid "<slider>"
 #~ msgstr "<سلائڈر>"
+
 #~ msgid "<onoff>"
 #~ msgstr "<آن آف>"
+
 #~ msgid "<select>"
 #~ msgstr "<منتخب کریں>"
+
 #~ msgid "Create new profile"
 #~ msgstr "نئی پروفائل بنائیں"
+
 #~ msgid "Delete this profile"
 #~ msgstr "یہ پروفائل حذف کریں"
+
 #~ msgid "Profile"
 #~ msgstr "پروفائل"
+
 #~ msgid "Really delete those %d profiles?"
 #~ msgstr "واقعی یہ %d پروفائلیں حذف کردی جائیں؟"
+
 #~ msgid "Really delete profile \"%s\"?"
 #~ msgstr "کیا واقعی پروفائل \"%s\" حذف کردی جائے؟"
+
 #~ msgid "%s - New"
 #~ msgstr "%s - نیا"
+
 #~ msgid "A profile needs a name"
 #~ msgstr "پروفائل کو نام درکار ہے"
+
 #~ msgid "A profile with that name already exists"
 #~ msgstr "اس نام کی پروفائل پہلے ہی موجود ہے"
+
 #~ msgid "profile%d"
 #~ msgstr "پروفائل%d"
+
 #~ msgid "Hide Switches"
 #~ msgstr "سوچز چھپائیں"
+
 #~ msgid "Change the Volume"
 #~ msgstr "والیم تبدیل کریں"
+
 #~ msgid "Xfce 4 Mixer Settings"
 #~ msgstr "ایکسفس 4 مکسر ترتیبات"
-
diff --git a/po/vi.po b/po/vi.po
index c973906..63a261d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,188 +7,250 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-appfinder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-13 22:12+0000\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vinh Nguyen <kureikain at gmail.com>\n"
 "Language-Team: Vietnamese <kureikain at gmail.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s: %i%%"
-
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "Chưa định nghĩa lệnh cho nhấn chuột trái"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"Chưa định nghĩa lệnh cho nhấn chuột trái. Bạn có thể thay đổi điều này trong thuộc tính "
-"của plugin."
+"GStream đã không thể tìm được bất kì thiết bị âm thanh nào. Có thể thiếu một "
+"vài gói GStream cho các hệ thống âm thanh cụ thể nào đó. Điều này cũng có "
+"thể do một vấn đề về quyền."
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "Thuộc tính"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "Chưa định nghĩa lệnh cho nhấn chuột trái"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
 msgstr ""
-"Không thể thực thi lệnh \"%s\". Hãy chắc rằng hoặc đường dẫn lệnh đã được thiết lập trong biến môi trường PATH hoặc là bạn "
-"đang cung cấp đường dẫn đầy đủ đến lệnh."
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"GStream đã không thể tìm được bất kì thiết bị âm thanh nào. Có thể thiếu một vài gói "
-"GStream cho các hệ thống âm thanh cụ thể nào đó. Điều này cũng có thể do một vấn đề về quyền."
+"Không thể thực thi lệnh \"%s\". Hãy chắc rằng hoặc đường dẫn lệnh đã được "
+"thiết lập trong biến môi trường PATH hoặc là bạn đang cung cấp đường dẫn đầy "
+"đủ đến lệnh."
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "Plugin tùy chỉnh âm thanh"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "Cấu hình thiết bị âm thanh và lệnh bấm chuột trái"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "Cấu hình card âm thanh và điều khiển mức độ của các thiết bị đã chọn"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "Card âm thành"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "Card âm thanh:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "Tùy chỉnh thiết bị"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "Lệnh bấm chuột trái"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "Chọn lệnh"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "Tất cả tập tin"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "Các tập tin thực thi được"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Các kịch bản Perl"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Các kịch bản Python"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Các kịch bản Ruby"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Các kịch bản hệ vỏ"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s: %i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "Điều khiển mức độ cho card âm thanh của bạn"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Không Biết Điều Khiển Mức Độ %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "Thất bại khi khởi chạy xfconf: %s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "Phát âm thanh"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "Ghi âm"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "Khóa chuyển"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "Tùy chọn"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "Khôgn có điều khiển nào"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"Không có điều khiển nào đã được đánh dấu để hiển thị. Hãy mở hộp thoại <span  "
-"size='large'><b>Lựa chọn điều khiển</b></span> để chọn vài cái."
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "Lựa chọn điều khiển"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "Lựa chọn những điều khiển sẽ được hiển thị"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "_Thoát"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "Thoát trình tùy chỉnh"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "_Lựa chọn các điều khiển..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "Lựa chọn điều khiển để hiển thị"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "Cấu hình card âm thanh và điều khiển mức độ của các thiết bị đã chọn"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "Card âm thanh:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr ""
+#~ "Chưa định nghĩa lệnh cho nhấn chuột trái. Bạn có thể thay đổi điều này "
+#~ "trong thuộc tính của plugin."
+
+#~ msgid "Properties"
+#~ msgstr "Thuộc tính"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "Cấu hình thiết bị âm thanh và lệnh bấm chuột trái"
+
+#~ msgid "Sound card"
+#~ msgstr "Card âm thành"
+
+#~ msgid "Left-click command"
+#~ msgstr "Lệnh bấm chuột trái"
+
+#~ msgid "Select command"
+#~ msgstr "Chọn lệnh"
+
+#~ msgid "All Files"
+#~ msgstr "Tất cả tập tin"
+
+#~ msgid "Executable Files"
+#~ msgstr "Các tập tin thực thi được"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Các kịch bản Perl"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Các kịch bản Python"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Các kịch bản Ruby"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Các kịch bản hệ vỏ"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "Điều khiển mức độ cho card âm thanh của bạn"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "Không có điều khiển nào đã được đánh dấu để hiển thị. Hãy mở hộp thoại "
+#~ "<span  size='large'><b>Lựa chọn điều khiển</b></span> để chọn vài cái."
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Trình tùy chỉnh âm thanh cho Xfce"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Trình tùy chỉnh âm thanh cho Xfce"
diff --git a/po/xfce4-mixer.pot b/po/xfce4-mixer.pot
index b009d97..73d0f6d 100644
--- a/po/xfce4-mixer.pot
+++ b/po/xfce4-mixer.pot
@@ -8,37 +8,36 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+msgid "No command defined"
 msgstr ""
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
@@ -46,141 +45,144 @@ msgid ""
 "providing the full path to the command."
 msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+msgid "Audio Mixer Plugin"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+msgid "Configure the sound card and mixer track"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+msgid "Sound _card:"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+msgid "Mixer _track:"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
+#. Set application name
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+msgid "Audio Mixer"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
+#: ../libxfce4mixer/libxfce4mixer.c:422
+#, c-format
+msgid "Unknown Volume Control %d"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
 msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
+#: ../xfce4-mixer/main.c:130
+#, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr ""
 
-#. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "_Playback"
 msgstr ""
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "C_apture"
 msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
-#, c-format
-msgid "Unknown Volume Control %d"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "S_witches"
 msgstr ""
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+msgid "_Options"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:390
+msgid "No controls visible"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
+msgid "Select Controls"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:298
-msgid "No controls visible"
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
+msgid "Select which controls should be visible"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
-msgid "Select Controls"
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
-msgid "Select which controls should be visible"
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr ""
-
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr ""
-
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fb91eff..0d49a35 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
-"Report-Msgid-Bugs-To: <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2009-01-19 12:59-0800\n"
 "Last-Translator: Chipong Luo <chipong.luo at yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n-cn at xfce.org>\n"
@@ -19,181 +19,237 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s:%i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "未定义左击命令"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
 msgid ""
-"No left-click command defined yet. You can change this in the plugin "
-"properties."
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
-"左键点击命令仍未定义。您可以在插件属性中"
-"更改它。"
+"Gstreamer 未能检测到任何声音设备。一些声音系统的特定 Gstreamer 软件包可能缺"
+"失。也可能是权限问题。"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "属性"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "未定义左击命令"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
 msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
 msgstr ""
-"未能执行命令 “%s”。确保要么此命令的路径"
-"包含在 PATH 环境变量中,要么您提供了此"
+"未能执行命令 “%s”。确保要么此命令的路径包含在 PATH 环境变量中,要么您提供了此"
 "命令的完整路径。"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
-msgid ""
-"GStreamer was unable to detect any sound devices. Some sound system specific "
-"GStreamer packages may be missing. It may also be a permissions problem."
-msgstr ""
-"Gstreamer 未能检测到任何声音设备。一些"
-"声音系统的特定 Gstreamer 软件包可能缺失。"
-"也可能是权限问题。"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "混音器插件"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "配置混音器音轨和左击命令"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "配置声卡并控制选中音轨的音量"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "声卡"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "声卡:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "混音器音轨"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "左击命令"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "选择命令"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "所有文件"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "可执行文件"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl 脚本"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python 脚本"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby 脚本"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell 脚本"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s:%i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "Mixer 混音器"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "声卡音量控制器"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "未知音量控制器 %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "无法初始化 xfconf:%s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "回放"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "捕获"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "开关"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "选项"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "没有可见的控制器"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
 msgid ""
-"No controls are marked as visible. Please open the <span "
-"size='large'><b>Select Controls</b></span> dialog to select some."
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
 msgstr ""
-"没有控制器标为可见。请打开 "
-"<span size='large'><b>选择控制器</b></span> 对话框来选一些。"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "选择控制器"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "选择哪些控制器应该可见"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "退出混音器"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "选择控制器(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "选择显示哪些控制器"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "配置声卡并控制选中音轨的音量"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "声卡:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr "左键点击命令仍未定义。您可以在插件属性中更改它。"
+
+#~ msgid "Properties"
+#~ msgstr "属性"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "配置混音器音轨和左击命令"
+
+#~ msgid "Sound card"
+#~ msgstr "声卡"
+
+#~ msgid "Left-click command"
+#~ msgstr "左击命令"
+
+#~ msgid "Select command"
+#~ msgstr "选择命令"
+
+#~ msgid "All Files"
+#~ msgstr "所有文件"
+
+#~ msgid "Executable Files"
+#~ msgstr "可执行文件"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl 脚本"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python 脚本"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby 脚本"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell 脚本"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "声卡音量控制器"
+
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "没有控制器标为可见。请打开 <span size='large'><b>选择控制器</b></span> 对"
+#~ "话框来选一些。"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce 桌面环境下的音频混音器"
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce 桌面环境下的音频混音器"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 803062e..5316897 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,174 +7,247 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2012-09-29 13:30+0000\n"
 "PO-Revision-Date: 2012-01-20 00:16+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
-#, c-format
-msgid "%s: %i%%"
-msgstr "%s:%i%%"
+#. Add menu item for muting
+#: ../panel-plugin/xfce-mixer-plugin.c:306
+msgid "_Mute"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:346
-msgid "No left-click command defined"
-msgstr "未定義左點擊指令"
+#: ../panel-plugin/xfce-mixer-plugin.c:314
+msgid "_Run Audio Mixer"
+msgstr ""
 
-#: ../panel-plugin/xfce-mixer-plugin.c:349
-msgid "No left-click command defined yet. You can change this in the plugin properties."
-msgstr "尚未定義左點擊指令。您可以在插件屬性中更改它。"
+#: ../panel-plugin/xfce-mixer-plugin.c:581 ../xfce4-mixer/main.c:148
+msgid ""
+"GStreamer was unable to detect any sound devices. Some sound system specific "
+"GStreamer packages may be missing. It may also be a permissions problem."
+msgstr ""
+"GStreamer 無法偵測到任何音效裝置。某些音效系統特定的 GStreamer 套件可能遺失。"
+"又或者是許可權的問題。"
 
-#: ../panel-plugin/xfce-mixer-plugin.c:350
-msgid "Properties"
-msgstr "屬性"
+#: ../panel-plugin/xfce-mixer-plugin.c:931
+#, fuzzy
+msgid "No command defined"
+msgstr "未定義左點擊指令"
 
 #. Generate error message and insert the current command
-#: ../panel-plugin/xfce-mixer-plugin.c:365
+#: ../panel-plugin/xfce-mixer-plugin.c:939
 #, c-format
-msgid "Could not execute the command \"%s\". Ensure that either the location of the command is included in the PATH environment variable or that you are providing the full path to the command."
-msgstr "無法執行「%s」指令。請確定指令的位置包含在 PATH 環境變數中,或是您需提供指令的完整路徑。"
-
-#: ../panel-plugin/xfce-mixer-plugin.c:398
-#: ../xfce4-mixer/main.c:89
-msgid "GStreamer was unable to detect any sound devices. Some sound system specific GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "GStreamer 無法偵測到任何音效裝置。某些音效系統特定的 GStreamer 套件可能遺失。又或者是許可權的問題。"
+msgid ""
+"Could not execute the command \"%s\". Ensure that either the location of the "
+"command is included in the PATH environment variable or that you are "
+"providing the full path to the command."
+msgstr ""
+"無法執行「%s」指令。請確定指令的位置包含在 PATH 環境變數中,或是您需提供指令"
+"的完整路徑。"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:234
-msgid "Mixer Plugin"
+#: ../panel-plugin/xfce-plugin-dialog.c:150
+#, fuzzy
+msgid "Audio Mixer Plugin"
 msgstr "混音器插件"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:236
-msgid "Configure the mixer track and left-click command"
-msgstr "設定混音器軌道與左點擊指令"
+#: ../panel-plugin/xfce-plugin-dialog.c:152
+#, fuzzy
+msgid "Configure the sound card and mixer track"
+msgstr "設定音效卡並控制選取軌道的音量"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:248
-msgid "Sound card"
-msgstr "音效卡"
+#: ../panel-plugin/xfce-plugin-dialog.c:165
+#: ../xfce4-mixer/xfce-mixer-window.c:185
+#, fuzzy
+msgid "Sound _card:"
+msgstr "音效卡:"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:266
-msgid "Mixer track"
+#: ../panel-plugin/xfce-plugin-dialog.c:174
+#, fuzzy
+msgid "Mixer _track:"
 msgstr "混音器軌道"
 
-#: ../panel-plugin/xfce-plugin-dialog.c:284
-msgid "Left-click command"
-msgstr "左點擊指令"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:322
-msgid "Select command"
-msgstr "選取指令"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:330
-msgid "All Files"
-msgstr "所有檔案"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:335
-msgid "Executable Files"
-msgstr "可執行檔"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:350
-msgid "Perl Scripts"
-msgstr "Perl 指令稿"
-
-#: ../panel-plugin/xfce-plugin-dialog.c:356
-msgid "Python Scripts"
-msgstr "Python 指令稿"
+#: ../panel-plugin/xfce-volume-button.c:854
+msgid "No valid device and/or element."
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:362
-msgid "Ruby Scripts"
-msgstr "Ruby 指令稿"
+#: ../panel-plugin/xfce-volume-button.c:859
+#, c-format
+msgid "%s: muted"
+msgstr ""
 
-#: ../panel-plugin/xfce-plugin-dialog.c:368
-msgid "Shell Scripts"
-msgstr "Shell 指令稿"
+#: ../panel-plugin/xfce-volume-button.c:861
+#, c-format
+msgid "%s: %i%%"
+msgstr "%s:%i%%"
 
 #. Set application name
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60
-#: ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
-msgid "Mixer"
+#: ../panel-plugin/mixer.desktop.in.h:1 ../xfce4-mixer/main.c:99
+#: ../xfce4-mixer/xfce-mixer-window.c:150
+#: ../xfce4-mixer/xfce-mixer-window.c:413
+#: ../xfce4-mixer/xfce-mixer-window.c:427
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:1
+#, fuzzy
+msgid "Audio Mixer"
 msgstr "混音器"
 
-#: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:2
-msgid "Volume control for your sound card"
-msgstr "音效卡的音量控制"
+#: ../panel-plugin/mixer.desktop.in.h:2
+#: ../xfce4-mixer/xfce4-mixer.desktop.in.h:2
+msgid "Adjust volume levels"
+msgstr ""
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:422
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "未知音量控制 %d"
 
-#: ../xfce4-mixer/main.c:70
-#, c-format
-msgid "Failed to initialize xfconf: %s"
+#: ../xfce4-mixer/main.c:86
+msgid "Enable debugging output"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:87
+msgid "Show version and exit"
+msgstr ""
+
+#: ../xfce4-mixer/main.c:130
+#, fuzzy, c-format
+msgid "xfce4-mixer: Failed to initialize xfconf: %s\n"
 msgstr "無法初始化 xfconf:%s"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Playback"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Playback"
 msgstr "播放控制"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Capture"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "C_apture"
 msgstr "捕捉"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Switches"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "S_witches"
 msgstr "開關"
 
-#: ../xfce4-mixer/xfce-mixer.c:164
-msgid "Options"
+#: ../xfce4-mixer/xfce-mixer-container.c:218
+#, fuzzy
+msgid "_Options"
 msgstr "選項"
 
-#: ../xfce4-mixer/xfce-mixer.c:298
+#: ../xfce4-mixer/xfce-mixer-container.c:390
 msgid "No controls visible"
 msgstr "無可見控制項"
 
-#: ../xfce4-mixer/xfce-mixer.c:302
-msgid "No controls are marked as visible. Please open the <span size='large'><b>Select Controls</b></span> dialog to select some."
-msgstr "未有標記為可見的控制項。請開啟 <span size='large'><b>選取控制項</b></span> 對話窗來選取一些控制項。"
+#: ../xfce4-mixer/xfce-mixer-container.c:401
+msgid "<span weight=\"bold\" size=\"larger\">No controls visible</span>"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-container.c:409
+msgid ""
+"In order to toggle the visibility of mixer controls, open the <b>\"Select "
+"Controls\"</b> dialog."
+msgstr ""
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:135
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:118
 msgid "Select Controls"
 msgstr "選取控制項"
 
-#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:137
+#: ../xfce4-mixer/xfce-mixer-controls-dialog.c:120
 msgid "Select which controls should be visible"
 msgstr "選取應該可見哪些控制項"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-track.c:257
+#, c-format
+msgid "Volume of channel %d on %s"
+msgstr ""
+
+#. Lock button
+#: ../xfce4-mixer/xfce-mixer-track.c:293
+#, c-format
+msgid "Lock channels for %s together"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:340
+#, c-format
+msgid "Mute/unmute %s"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-track.c:360
+#, c-format
+msgid "Enable/disable audible input from %s in output"
+msgstr ""
+
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:84
+#: ../xfce4-mixer/xfce-mixer-window.c:91
 msgid "Exit the mixer"
 msgstr "離開混音器"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "_Select Controls..."
 msgstr "選取控制項(_S)..."
 
-#: ../xfce4-mixer/xfce-mixer-window.c:86
+#: ../xfce4-mixer/xfce-mixer-window.c:93
 msgid "Select which controls are displayed"
 msgstr "選取要顯示哪些控制項"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:184
+#: ../xfce4-mixer/xfce-mixer-window.c:154
 msgid "Configure sound card(s) and control the volume of selected tracks"
 msgstr "設定音效卡並控制選取軌道的音量"
 
-#: ../xfce4-mixer/xfce-mixer-window.c:199
-msgid "Sound card:"
-msgstr "音效卡:"
+#~ msgid ""
+#~ "No left-click command defined yet. You can change this in the plugin "
+#~ "properties."
+#~ msgstr "尚未定義左點擊指令。您可以在插件屬性中更改它。"
+
+#~ msgid "Properties"
+#~ msgstr "屬性"
+
+#~ msgid "Configure the mixer track and left-click command"
+#~ msgstr "設定混音器軌道與左點擊指令"
+
+#~ msgid "Sound card"
+#~ msgstr "音效卡"
+
+#~ msgid "Left-click command"
+#~ msgstr "左點擊指令"
+
+#~ msgid "Select command"
+#~ msgstr "選取指令"
+
+#~ msgid "All Files"
+#~ msgstr "所有檔案"
+
+#~ msgid "Executable Files"
+#~ msgstr "可執行檔"
+
+#~ msgid "Perl Scripts"
+#~ msgstr "Perl 指令稿"
+
+#~ msgid "Python Scripts"
+#~ msgstr "Python 指令稿"
+
+#~ msgid "Ruby Scripts"
+#~ msgstr "Ruby 指令稿"
+
+#~ msgid "Shell Scripts"
+#~ msgstr "Shell 指令稿"
+
+#~ msgid "Volume control for your sound card"
+#~ msgstr "音效卡的音量控制"
 
-#: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:1
-msgid "Audio mixer for the Xfce Desktop Environment"
-msgstr "Xfce 桌面環境的混音器"
+#~ msgid ""
+#~ "No controls are marked as visible. Please open the <span "
+#~ "size='large'><b>Select Controls</b></span> dialog to select some."
+#~ msgstr ""
+#~ "未有標記為可見的控制項。請開啟 <span size='large'><b>選取控制項</b></"
+#~ "span> 對話窗來選取一些控制項。"
 
+#~ msgid "Audio mixer for the Xfce Desktop Environment"
+#~ msgstr "Xfce 桌面環境的混音器"


More information about the Xfce4-commits mailing list