[Xfce4-commits] <xfce4-timer-plugin:master> Release 1.0.2

Kemal Ilgar Eroglu noreply at xfce.org
Mon Apr 22 23:30:01 CEST 2013


Updating branch refs/heads/master
         to 8b66524f0038837d68e2a24f1d2acb0eb0160b01 (commit)
       from eb9dc6acf2c4686bd388ee41ba9674c7533dc772 (commit)

commit 8b66524f0038837d68e2a24f1d2acb0eb0160b01
Author: Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
Date:   Tue Apr 23 00:27:29 2013 +0300

    Release 1.0.2

 ChangeLog         |    5 ++
 INSTALL           |    9 ++-
 configure.in.in   |    2 +-
 icons/Makefile.am |   11 +++
 po/ar.po          |  158 +++++++++++++++++++++++++-------------------
 po/ast.po         |  102 ++++++++++++++++------------
 po/ca.po          |  101 ++++++++++++++++------------
 po/cs.po          |  154 ++++++++++++++++++++++++-------------------
 po/da.po          |  101 ++++++++++++++++------------
 po/de.po          |  154 ++++++++++++++++++++++++-------------------
 po/el.po          |  101 ++++++++++++++++------------
 po/en_GB.po       |  102 ++++++++++++++++------------
 po/es.po          |  156 +++++++++++++++++++++++++-------------------
 po/eu.po          |  154 ++++++++++++++++++++++++-------------------
 po/fr.po          |  158 +++++++++++++++++++++++++-------------------
 po/gl.po          |   97 ++++++++++++++++------------
 po/hr.po          |  156 ++++++++++++++++++++++++--------------------
 po/hu.po          |  158 +++++++++++++++++++++++++-------------------
 po/id.po          |  154 ++++++++++++++++++++++++-------------------
 po/it.po          |  154 ++++++++++++++++++++++++-------------------
 po/ja.po          |   97 ++++++++++++++++------------
 po/ko.po          |  145 ++++++++++++++++++++++++-----------------
 po/lv.po          |  101 ++++++++++++++++------------
 po/nl.po          |  156 +++++++++++++++++++++++++-------------------
 po/pl.po          |  155 +++++++++++++++++++++++++------------------
 po/pt.po          |  154 ++++++++++++++++++++++++-------------------
 po/pt_BR.po       |  158 +++++++++++++++++++++++++-------------------
 po/ru.po          |  154 ++++++++++++++++++++++++-------------------
 po/sk.po          |   97 ++++++++++++++++------------
 po/sq.po          |  101 ++++++++++++++++------------
 po/sr.po          |  148 +++++++++++++++++++++++++----------------
 po/sv.po          |  101 ++++++++++++++++------------
 po/tr.po          |   99 ++++++++++++++++------------
 po/ug.po          |  171 +++++++++++++++++++++++++++--------------------
 po/uk.po          |  154 ++++++++++++++++++++++++-------------------
 po/ur.po          |   97 ++++++++++++++++------------
 po/ur_PK.po       |   97 ++++++++++++++++------------
 po/zh_CN.po       |  154 +++++++++++++++++++++++++------------------
 po/zh_TW.po       |  162 +++++++++++++++++++++++++--------------------
 src/xfcetimer.c   |  189 +++++++++++++++++++++++++++++++++--------------------
 src/xfcetimer.h   |   11 +++-
 41 files changed, 2808 insertions(+), 2080 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a49b41f..a182b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+22/04/2013 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
+	* Version 1.0.2
+	* Some code cleanup
+	* Now the alarm dialog window displays the alarm name
+	* Added the option to define a default alarm command
 04/09/2012 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
 	* Version 1.0.0
 	* Fix compile/install issues
diff --git a/INSTALL b/INSTALL
index 7d1c323..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff --git a/configure.in.in b/configure.in.in
index 9fd58ad..1046375 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -6,7 +6,7 @@ dnl 	Please disable it in the Anjuta project configuration
 dnl version info
 m4_define([xfce4_timer_version_major], [1])
 m4_define([xfce4_timer_version_minor], [0])
-m4_define([xfce4_timer_version_micro], [0])
+m4_define([xfce4_timer_version_micro], [2])
 m4_define([xfce4_timer_version_build], [@REVISION@])
 m4_define([xfce4_timer_version_tag])
 m4_define([xfce4_timer_version], [xfce4_timer_version_major().xfce4_timer_version_minor().xfce4_timer_version_micro()ifelse(xfce4_timer_version_tag(), [git], [xfce4_timer_version_tag()-xfce4_timer_version_build()], [xfce4_timer_version_tag()])])
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 5d431c0..f325313 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -13,3 +13,14 @@ install-data-hook:
                 echo "***   $(gtk_update_icon_cache)";			\
 		echo "***";						\
         fi
+
+uninstall-hook:
+	@-if test -z "$(DESTDIR)"; then					\
+                echo "Updating Gtk icon cache.";			\
+                $(gtk_update_icon_cache);				\
+        else								\
+                echo "*** Icon cache not updated. Remember to run:";	\
+		echo "***";						\
+                echo "***   $(gtk_update_icon_cache)";			\
+		echo "***";						\
+        fi
diff --git a/po/ar.po b/po/ar.po
index 09a595d..798d6c1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-11-18 22:49+0300\n"
 "Last-Translator: محمد الحرقان <malham1 at gmail.com>\n"
 "Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n"
@@ -18,128 +18,140 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dس %dد %ds تبقت"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dد %dث تبقت"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%dث تبقت"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "بيييب! :) \n"
 "حان الوقت!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+#, fuzzy
+msgid "Resume timer"
+msgstr "بدء تشغيل ضبط المؤقت"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "إيقاف ضبط المؤقت"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+#, fuzzy
+msgid "Pause timer"
+msgstr "بدء تشغيل ضبط المؤقت"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "بدء تشغيل ضبط المؤقت"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "إيقاف التنبيه"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dس %dد %dث"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dد %dث"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dث"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "عند %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "اسم"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "أدخل وقت العد التنازلي"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "أدخل وقت التنبيه (تنسيق 24 ساعة)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "س  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "د  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "ث  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"أو\n"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "or"
+msgstr "أو"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "الأمر للتشغيل"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "أضف تنبيه جديد"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "حرّر المنبّه"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "خصائص"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "خيارات ضبط مؤقت اكسفس4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+#, fuzzy
+msgid "Xfce 4 Timer Plugin"
+msgstr "خيارات ضبط المؤقت Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "اسم\n"
 "المؤقت"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,52 +159,60 @@ msgstr ""
 "فترة العد التنازلي /\n"
 "وقت التنبيه"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "أمر التنبيه"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "لا تعرض إطار التنبيه\n"
 "إذا تم ضبط أمر التنبيه"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "تكرار أمر التنبيه:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "أمر التنبيه"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "تكرار أمر التنبيه:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "مرات التكرار"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  الفاصل الزمني (ثانية.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "المؤقت، ملحق لوحة إكس"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "مؤقت إكسفس 4"
 
-#, fuzzy
-#~ msgid "Resume timer"
-#~ msgstr "بدء تشغيل ضبط المؤقت"
-
-#, fuzzy
-#~ msgid "Pause timer"
-#~ msgstr "بدء تشغيل ضبط المؤقت"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "المؤقت، ملحق لوحة إكس"
 
-#, fuzzy
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "أو\n"
 
-#, fuzzy
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "خيارات ضبط المؤقت Xfce4"
+#~ msgid "Properties"
+#~ msgstr "خصائص"
diff --git a/po/ast.po b/po/ast.po
index a35c8cc..75ee7b2 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-07-13 19:55+0100\n"
 "Last-Translator: Marcos Antonio Alvarez Costales <marcoscostales at gmail.com>\n"
 "Language-Team: Asturian <alministradores at softastur.org>\n"
@@ -13,139 +13,140 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restantes"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restantes"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds restantes"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
 "¡Acabóse'l tiempu!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Entamar temporizador"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Entamar temporizador"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Parar l'alarma"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A les %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Meta'l tiempu de cuenta atrás"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Entre la hora d'alarma (formatu 24h)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"o\n"
+msgstr "o"
 
-#: ../src/xfcetimer.c:792
+
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "El comandu a executar"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Amestar nueva alarma"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Editar alarma"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Nome del\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -153,40 +154,53 @@ msgstr ""
 "Periodu de cuenta atrás /\n"
 "Hora d'alarma"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Comandu d'alarma"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Nun amosar la ventana d'alvertencia\n"
 "si se configuró un comandu d'alarma"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Repetir el comandu d'alarma:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Comandu d'alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir el comandu d'alarma:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Númberu de repeticiones"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Intervalu tiempu (seg.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Complementu temporizador pal panel de Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Complementu temporizador pal panel de Xfce"
+
 #~ msgid "Properties"
 #~ msgstr "Propiedaes"
diff --git a/po/ca.po b/po/ca.po
index 7146d75..68a3a43 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-03-04 12:33+0100\n"
 "Last-Translator: Harald Servat <redcrash at gmail.com>\n"
 "Language-Team: Catalan\n"
@@ -17,138 +17,138 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "queden %dh %dm %ds"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "queden %dm %ds"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "queden %ds"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiiiiiip! :)\n"
 "S'ha acabat el temps!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 #, fuzzy
 msgid "Resume timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Atura temporitzador"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 msgid "Pause timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Atura l'alarma"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A les %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Nom"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Introdueix l'hora del compta enrera"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introdueix l'ha de l'alarma (format de 24h)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"o\n"
+msgstr "o"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "L'ordre a executar"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Afegeix una alarma nova"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Edita l'alarma"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opcions del temporitzador Xfce4"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opcions del temporitzador Xfce4"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Temporitzador\n"
 "nom"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -156,41 +156,54 @@ msgstr ""
 "Temps de compta enrere /\n"
 "Hora de l'alarma"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Ordre de l'alarma"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "No mostris la finestra d'avís\n"
 "si hi ha programada una ordre per l'alarma"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Repeteix l'ordre de l'alarma:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Ordre de l'alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Repeteix l'ordre de l'alarma:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Nombre de repeticions"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Interval de temps (en segons)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Connector de temporitzador pel quadre Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Temporitzador Xfce4"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Connector de temporitzador pel quadre Xfce"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/cs.po b/po/cs.po
index be57d31..ae0249c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,143 +2,151 @@
 # Copyright (C) 2006 THE xfce4-timer'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-timer package.
 # Michal Várady <miko.vaji at gmail.com>, 2006-2012.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-04-08 11:37+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds zbývá"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds zbývá"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds zbývá"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Pííííp! :) \n"
 "Čas vypršel!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Spustit odpočet času"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Zastavit odpočet času"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Spustit odpočet času"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Spustit odpočet času"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Zastavit výstrahu"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "V %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Název"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Zadejte čas pro odpočítávání"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Zadejte čas výstrahy (ve 24hodinovém formátu)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"nebo\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "nebo"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Příkaz ke spuštění"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Přidat novou výstrahu"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Upravit výstrahu"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Název\n"
 "odpočtu"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,48 +154,60 @@ msgstr ""
 "Interval odpočtu /\n"
 "Čas výstrahy"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Příkaz výstrahy"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Nezobrazovat okno s varováním\n"
 "pokud je příkaz výstrahy nastaven"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Opakovat příkaz výstrahy"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Příkaz výstrahy"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Opakovat příkaz výstrahy"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Počet opakování"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Časový interval (s)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Zásuvný modul pro odpočítávání času pro panel Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Odpočet času pro Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Spustit odpočet času"
-
-#~ msgid "Pause timer"
-#~ msgstr "Spustit odpočet času"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Zásuvný modul pro odpočítávání času pro panel Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "nebo\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
diff --git a/po/da.po b/po/da.po
index 695daca..68dff5e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-10-14 15:19+0100\n"
 "Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -19,137 +19,137 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: DENMARK\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dt %dm %ds tilbage"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds tilbage"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds tilbage"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
 "Tiden er gået!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Stop timer"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 msgid "Pause timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Stop alarmen"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dt %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ved %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Navn"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Indtast nedtællingstiden"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Indtast tiden for alarmen (24t format)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "t  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"eller\n"
+msgstr "eller"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Kommadoen der skal køres"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Tilføj ny alarm"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Redigér alarm"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4-timerindstillinger"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4-timerindstillinger"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Timer\n"
 "navn"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -157,41 +157,54 @@ msgstr ""
 "Nedtællingsperiode /\n"
 "Alarmtid"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarmkommando"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Vis ikke advarselsvinduet\n"
 "hvis en alarmkommando er indstillet"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Gentag alarmkommandoen:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarmkommando"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Gentag alarmkommandoen:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Antal gentagelser"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Tidsinterval (sek.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Timer-udvidelsesmodul til Xfce panelet"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4-timer"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Timer-udvidelsesmodul til Xfce panelet"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/de.po b/po/de.po
index 38326f4..715a1be 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,143 +3,151 @@
 # Copyright (C) 2009 THE xfce4-timer-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-timer-plugin package.
 # Simon Schneider <simon at schneiderimtal.de>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-03-13 14:03+0000\n"
 "Last-Translator: Simon Schneider <simon at schneiderimtal.de>\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"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "verbleibend: %d Stunden %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "verbleibend: %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "verbleibend: %d Sekunden"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Bing! :) \n"
 "Die Zeit ist abgelaufen"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Uhr starten"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Uhr stoppen"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Uhr starten"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Uhr starten"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Alarm ausschalten"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d Stunden %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d Sekunden"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Bei %02d: %02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Name"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Wartezeit eingeben"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarmzeit eingeben "
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "Stunden  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "Minuten  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "Sekunden  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"oder\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "oder"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Auszuführender Befehl:"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Neuen Alarm erstellen"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Alarm bearbeiten"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Einstellungen für die Xfce-Eieruhr"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce-Eieruhr"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Name der\n"
 "Eieruhr"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,48 +155,60 @@ msgstr ""
 "Wartezeit /\n"
 "Alarmzeit"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarmbefehl"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Meldungsfenster nicht anzeigen,\n"
 "wenn ein Alarmbefehl angegeben ist"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Alarmbefehl wiederholen:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarmbefehl"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Alarmbefehl wiederholen:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Anzahl der Wiederholungen"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Zeitabstand (Sek.): "
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Eieruhr für die Xfce-Leiste"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4-Eieruhr"
 
-#~ msgid "Resume timer"
-#~ msgstr "Uhr starten"
-
-#~ msgid "Pause timer"
-#~ msgstr "Uhr starten"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Eieruhr für die Xfce-Leiste"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "oder\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce-Eieruhr"
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
diff --git a/po/el.po b/po/el.po
index d2be2e2..9606ac2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-05-20 11:36+0300\n"
 "Last-Translator: Efstathios Iosifidis <iosifidis at opensuse.org>\n"
 "Language-Team: Ελληνικά, Σύγχρονα <opensuse-translation-el at opensuse.org>\n"
@@ -16,140 +16,140 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dω %dλ %dδ απέμειναν"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dλ %dδ απέμειναν"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%dδ απέμειναν"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Μπιιιιιμπ! :) \n"
 "Ο χρόνος ολοκληρώθηκε!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 #, fuzzy
 msgid "Resume timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Τερματισμός χρονόμετρου "
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Τερματισμός ειδοποίησης  "
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dω %dλ %dδ"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dλ %dδ"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dδ"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Σε %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Όνομα"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Εισαγωγή του αντίστροφου χρόνου"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Εισαγωγή της ώρας της ειδοποίησης (σε 24 μορφή)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "ώρα"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "λεπτά"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "δευτ"
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"ή\n"
+msgstr "ή"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Η εντολή που θα εκτελεστεί"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Προσθήκη νέας ειδοποίησης  "
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Επεξεργασία ειδοποίησης "
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Επιλογές χρονόμετρου  xfce4"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Επιλογές χρονόμετρου  xfce4"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Όνομα\n"
 "χρονόμετρου"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -157,41 +157,54 @@ msgstr ""
 "Περίοδος αντίστροφου χρόνου /\n"
 "Χρόνος ειδοποίησης"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Εντολή ειδοποίησης "
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Μην εμφανίσεις το παράθυρο προειδοποίησης\n"
 "εάν η εντολή ειδοποίησης έχει ορισθεί"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Επανάληψη της εντολής του ξυπνητήρι:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Εντολή ειδοποίησης "
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Επανάληψη της εντολής του ξυπνητήρι:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Αριθμός επαναλήψεων"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Διαστημα ανανέωσης (δευτ.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Άρθρωμα χρονόμετρου για το ταμπλό του Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Χρονόμετρο xfce4"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Άρθρωμα χρονόμετρου για το ταμπλό του Xfce"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 7322ef7..418a9e7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2007-03-31 10:36+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -18,138 +18,139 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds left"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds left"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds left"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Beeep! :) \n"
 "Time is up!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 #, fuzzy
 msgid "Resume timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Stop timer"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 msgid "Pause timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Stop the alarm"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "At %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Name"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Enter the countdown time"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Enter the time of alarm (24h format)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"or\n"
+msgstr "or"
 
-#: ../src/xfcetimer.c:792
+
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "The command to run"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Add new alarm"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Edit alarm"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Timer Options"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 Timer Options"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Timer\n"
 "name"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -157,41 +158,54 @@ msgstr ""
 "Countdown period /\n"
 "Alarm time"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarm command"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Don't display the warning window\n"
 "if an alarm command is set"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Repeat the alarm command:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarm command"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Repeat the alarm command:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Number of repetitions"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Time interval (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Timer plugin for Xfce panel"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Timer plugin for Xfce panel"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/es.po b/po/es.po
index 201adf6..62ba29d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,143 +2,151 @@
 # Copyright (C) 2009 THE xfce4-timer-plugin'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-timer-plugin package.
 #  <abel.martin.ruiz at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-04-18 22:53-0600\n"
 "Last-Translator: Sergio <oigres200 at gmail.com>\n"
 "Language-Team: Spanish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restantes"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restantes"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds restantes"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
-"¡Se acabó el tiempo!"
+"¡Se acabó el tiempo para la alarma %s!"
+
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Iniciar temporizador"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Iniciar temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Parar la alarma"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A las %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nombre"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Introduzca el tiempo de cuenta atrás"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introduzca la hora de alarma (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"o\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "o"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "El comando a ejecutar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Añadir nueva alarma"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Editar alarma"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propiedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opciones del temporizador de Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nombre del\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,48 +154,60 @@ msgstr ""
 "Periodo de cuenta atrás /\n"
 "Hora de alarma"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Comando de alarma"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "No mostrar la ventana de advertencia\n"
 "si se ha configurado un comando de alarma"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Repetir el comando de alarma:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Comando de alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir el comando de alarma:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Número de repeticiones"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Intervalo de tiempo (seg.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Complemento temporizador para el panel de Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar temporizador"
-
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Complemento temporizador para el panel de Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "o\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opciones del temporizador de Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
diff --git a/po/eu.po b/po/eu.po
index 585926d..eb05247 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,144 +3,152 @@
 # This file is distributed under the same license as
 #   the xfce4-timer package.
 # Piarres Beobide <pi at beobide.net>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-11-09 15:43+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: Librezale <Librezale at librezale.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.0\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%do %dm %ds falta dira"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds falta dira"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds falta dira"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Beep! :) \n"
 "Ordua pasa da!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Abiarazte ordua"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Amaiera ordua"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Abiarazte ordua"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Abiarazte ordua"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Alarma gelditu"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%do %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d-etan"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Izena"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "atzekoz aurrera kontatze denbora idatzi"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarmaren ordua idatzi (24h formatua)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "o  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"edo\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "edo"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "abiarazteko komandoa"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Alarma Berri bat gehitu"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Alarma Editatu"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propietateak"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Kronometro Aukerak"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 Kronometro Aukerak"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Kronometroa\n"
 "izena"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,48 +156,60 @@ msgstr ""
 "Kontatze aldia /\n"
 "Alarma ordua"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarma komandoa"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Abisu leihoa ez bistarazi\n"
 "alarma komando bat ezarririk badago"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Alarma komandoa errepikatu:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarma komandoa"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Alarma komandoa errepikatu:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Errepikapen kopurua"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Denbora tartea (seg.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce panelarentzat kronometro plugin-a"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 kronometroa"
 
-#~ msgid "Resume timer"
-#~ msgstr "Abiarazte ordua"
-
-#~ msgid "Pause timer"
-#~ msgstr "Abiarazte ordua"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce panelarentzat kronometro plugin-a"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "edo\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce4 Kronometro Aukerak"
+#~ msgid "Properties"
+#~ msgstr "Propietateak"
diff --git a/po/fr.po b/po/fr.po
index 104f94d..bc1a07d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,142 +4,150 @@
 # S. Roy <sroy at j2n.net>, 2006.
 # Gérald Barré <g.barre at free.fr>, 2006.
 # Maximilian Schleiss <maximilian at xfce.org>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2007-02-20 22:49+0100\n"
 "Last-Translator: Maximilian Schleiss <maximilian 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"
-"Language: fr\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restante(s)"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restante(s)"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds restante(s)"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiiiip ! :)\n"
 "C'est l'heure !"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Lancer le chronomètre"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Arrêter le chronomètre"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Lancer le chronomètre"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Lancer le chronomètre"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Arrêter l'alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "À %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nom"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Entrer la durée du compte à rebours"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Entrer l'heure de l'alarme (format 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "ou"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "La commande a exécuter"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Ajouter une nouvelle alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Éditer l'alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriétés"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Options du chronomètre Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Options du chronomètre Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Chronomètre\n"
 "nom"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,46 +155,60 @@ msgstr ""
 "Période de compte à rebours /\n"
 "Heure d'alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Commande d'alarme"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Ne pas afficher la fenêtre d'avertissement\n"
 "si une commande d'alarme est précisée"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Répéter la commande d'alarme :"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Commande d'alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Répéter la commande d'alarme :"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Nombre de répétitions"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Intervalle de temps (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Greffon de chronomètre pour le panneau Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Chronomètre Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Lancer le chronomètre"
-
-#~ msgid "Pause timer"
-#~ msgstr "Lancer le chronomètre"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Greffon de chronomètre pour le panneau Xfce"
 
-#~ msgid "or"
-#~ msgstr "ou"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Options du chronomètre Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
diff --git a/po/gl.po b/po/gl.po
index ea3c292..a34b194 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-07-15 18:13+0100\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -21,139 +21,141 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "quedan %dh %dm %ds"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "quedan %dm %ds"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "quedan %ds"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiiiiip! :) \n"
 "Esgotouse o tempo!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 #, fuzzy
 msgid "Resume timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Deter o contador"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 msgid "Pause timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Deter a alarma"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ás %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Introducir o tempo de conta"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introduza a hora da alarma (formato 24h)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "ou\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "A orde a executar"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Engadir nova alarma"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Editar a alarma"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opcións de Xfce4 Timer"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opcións de Xfce4 Timer"
 
 # Contador
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Nome do\n"
 "contador"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -161,41 +163,54 @@ msgstr ""
 "Periodo de conta/\n"
 "Tempo da alarma"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Orde de alarma"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Non mostrar a xanela de advertencia\n"
 "se se definiu unha orde de alarma"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Repetir a orde de alarma:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Orde de alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Repetir a orde de alarma:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Número de repeticións"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Intervalo de tempo (seg.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Engadido de contador para o panel de Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Engadido de contador para o panel de Xfce"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/hr.po b/po/hr.po
index c79888a..477b526 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,141 +1,152 @@
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2011-05-21 18:39+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"
-"Language: hr\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"
 "X-Poedit-Language: Croatian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: CROATIA\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds preostalo"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds preostalo"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds preostalo"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Beeep! :) \n"
 "Vrijeme je isteklo!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Pokreni mjerač vremena"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Zaustavi mjerač vremena"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Pokreni mjerač vremena"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Pokreni mjerač vremena"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Zaustavi alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "U %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Ime"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Unesite vrijeme odbrojavanja"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Unesite vrijeme alarma (format 24 sata)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "ili"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Pokrenuti naredbu"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Dodaj novi alarm"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Uredi alarm"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Svojstva"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Pocije Xfce4 mjerača vremena"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Pocije Xfce4 mjerača vremena"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Ime\n"
 "mjerača vremena"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -143,48 +154,53 @@ msgstr ""
 "Period odbrojavanja /\n"
 "Vrijeme alarma"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Naredba alarma"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Ne prikazuj prozor upozorenja\n"
 "ako naredba alarma nije postavljena"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Ponovi naredbu alarma"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Naredba alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Ponovi naredbu alarma"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Broj ponavljanja"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Vremenski interval (sec)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Priključak mjerača vremena za Xfce4 ploču"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Mjerač vremena"
 
-#~ msgid "Resume timer"
-#~ msgstr "Pokreni mjerač vremena"
-
-#~ msgid "Pause timer"
-#~ msgstr "Pokreni mjerač vremena"
-
-#~ msgid "or"
-#~ msgstr ""
-#~ "\n"
-#~ "ili\n"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Priključak mjerača vremena za Xfce4 ploču"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Pocije Xfce4 mjerača vremena"
+#~ msgid "Properties"
+#~ msgstr "Svojstva"
diff --git a/po/hu.po b/po/hu.po
index 6220aa0..ecd1b2f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,146 +1,154 @@
 # Hungarian translation of xfce4-timer-plugin
 # Copyright 2009. Free Software Foundation, Inc.
 # This file is distributed under the same license as the xfce4-timer-plugin package.
-# 
+#
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2009.
 # SZERVÁC Attila <sas at 321.hu>
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-07-25 01:53+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"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dó %dp %dmp van hátra"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dp %dmp van hátra"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%dmp van hátra"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Csörrr! :)\n"
 "Letelt az idő!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Időzítő indítása"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Időzítő leállítása"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Időzítő indítása"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Időzítő indítása"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Figyelmeztetés leállítása"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dó %dp %dmp"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dp %dmp"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dmp"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ekkor: %02d.%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Név"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Adja meg a visszaszámlálási időt"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Adja meg a figyelmeztetés időpontját (24 órás formátumban)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "ó  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "p  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "mp  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"vagy\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "vagy"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Futtatandó parancs"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Új figyelmeztetés hozzáadása"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Figyelmeztetés szerkesztése"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Tulajdonságok"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce 4 időzítő beállításai"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce 4 időzítő bővítmény"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Időzítő\n"
 "neve"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,46 +156,60 @@ msgstr ""
 "Visszaszámlálási idő/\n"
 "Figyelmeztetés ideje"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Figyelmeztető parancs"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Ne jelenjen meg figyelmeztetés,\n"
 "ha be van állítva figyelmeztető parancs"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "A figyelmeztető parancs ismétlése:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Figyelmeztető parancs"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "A figyelmeztető parancs ismétlése:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Ismétlések száma"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Időköz (mp)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Időzítő bővítmény az Xfce panelhez"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce 4 időzítő"
 
-#~ msgid "Resume timer"
-#~ msgstr "Időzítő indítása"
-
-#~ msgid "Pause timer"
-#~ msgstr "Időzítő indítása"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Időzítő bővítmény az Xfce panelhez"
 
-#~ msgid "or"
-#~ msgstr "vagy"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "vagy\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce 4 időzítő bővítmény"
+#~ msgid "Properties"
+#~ msgstr "Tulajdonságok"
diff --git a/po/id.po b/po/id.po
index de8dc90..247cd12 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2,142 +2,150 @@
 # Copyright (C) 2006 Kemal Ilgar Eroglu <kieroglu at math.washington.edu>.
 # This file is distributed under the same license as the xfce4-timer-plugin package.
 # Andhika Padmawan <andhika.padmawan at gmail.com>, 2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-06-21 18:22+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
 "Language-Team: Indonesian <id at li.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dj %dm %dd tersisa"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %dd tersisa"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%dd tersisa"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
 "Waktu habis!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Mulai pengukur waktu"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Stop pengukur waktu"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Mulai pengukur waktu"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Mulai pengukur waktu"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Stop alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dj %dm %dd"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %dd"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dd"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Pada %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nama"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Masukkan waktu hitung mundur"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Masukkan waktu alarm (format 24 jam)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "j  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "d  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"atau\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "atau"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Perintah untuk dijalankan"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Tambah alarm baru"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Sunting alarm"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Properti"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opsi Pengukur Waktu Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opsi Pengukur Waktu Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Pengukur Waktu\n"
 "nama"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -145,48 +153,60 @@ msgstr ""
 "Waktu hitung mundur /\n"
 "Waktu alarm"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Perintah alarm"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Jangan tampilkan jendela peringatan\n"
 "jika perintah alarm diatur"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Ulangi perintah alarm:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Perintah alarm"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Ulangi perintah alarm:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Jumlah pengulangan"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Interval waktu (det.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Plugin pengukur waktu untuk panel Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Pengukur Waktu Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Mulai pengukur waktu"
-
-#~ msgid "Pause timer"
-#~ msgstr "Mulai pengukur waktu"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Plugin pengukur waktu untuk panel Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "atau\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opsi Pengukur Waktu Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Properti"
diff --git a/po/it.po b/po/it.po
index d459928..a366261 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,145 +2,153 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the xfce4-timer-plugin package.
 # Cristian Marchi <cri.penta at gmail.com>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-02-01 19:33+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta at gmail.com>\n"
 "Language-Team: Italian <xfce-it-translators at googlegroups.com>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 
 # GLOSSARIO
 # left = mancare
 # timer = sveglia
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Mancano %dore %dminuti %dsecondi"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "Mancano %dminuti %dsecondi"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "Mancano %dsecondi"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Driiin! :) \n"
 "Il tempo è scaduto!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Avvia la sveglia"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Interrompi la sveglia"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Avvia la sveglia"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Avvia la sveglia"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Interrompi la sveglia"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Alle %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Inserire la durata del conto alla rovescia"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Inserire l'ora della sveglia (nel formato a 24 ore)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"or\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "or"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Il comando da eseguire"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Aggiungi una nuova sveglia"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Modifica sveglia"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Proprietà"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opzioni della sveglia di Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opzioni della sveglia di Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome\n"
 "sveglia"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,48 +156,60 @@ msgstr ""
 "Durata del conto alla rovescia/\n"
 "ora della sveglia."
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Comando di sveglia"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Non visualizzare la finestra di avviso\n"
 "se è impostato un comando di sveglia"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Ripeti il comando di sveglia:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Comando di sveglia"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Ripeti il comando di sveglia:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Numero di ripetizioni"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Intervallo di tempo (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Plugin della sveglia per il pannello di Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Sveglia di Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Avvia la sveglia"
-
-#~ msgid "Pause timer"
-#~ msgstr "Avvia la sveglia"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Plugin della sveglia per il pannello di Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "or\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opzioni della sveglia di Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Proprietà"
diff --git a/po/ja.po b/po/ja.po
index 92f8697..3b4d704 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-10-10 03:36+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -20,139 +20,141 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "残り%d時間%d分%d秒"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "残り%d分%d秒"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "残り%d秒"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "ビーー! :) \n"
 "時間です!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "タイマーを停止する"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "タイマーを開始する"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "タイマーを開始する"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "アラームを停止する"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d時間%d分%d秒"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d分%d秒"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d秒"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "名前"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "秒読みする時間を入力してください"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "アラームが鳴る時間を入力してください (24時間制)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "時間  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "分  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "秒  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "または\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "実行するコマンド"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "新規アラームを追加"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "アラームの編集"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 タイマーオプション"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 タイマーオプション"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "タイマー\n"
 "名"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -160,40 +162,53 @@ msgstr ""
 "秒読み時間 /\n"
 "アラーム時間"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "アラームコマンド"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "アラームコマンドが設定されている場合は\n"
 "警告ウィンドウを表示しない"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "繰り返すアラームコマンド:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "アラームコマンド"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "繰り返すアラームコマンド:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "繰り返し回数"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  時間間隔 (秒.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce パネル用のタイマープラグインです。"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 タイマー"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce パネル用のタイマープラグインです。"
+
 #~ msgid "Properties"
 #~ msgstr "プロパティ"
diff --git a/po/ko.po b/po/ko.po
index 6b673ee..87737aa 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin.master\n"
-"Report-Msgid-Bugs-To: xfce-i18n <xfce-i18n at xfce.org>\n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-09-18 13:22+0900\n"
 "Last-Translator: Seong-ho Cho <darkcircle.0426 at gmail.com>\n"
 "Language-Team: xfce-i18n <xfce-i18n at xfce.org>\n"
@@ -20,132 +20,141 @@ msgstr ""
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%d시 %d분 %d초 남음"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%d분 %d초 남음"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%d초 남음"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "삑~~~! :) \n"
 "시간이 되었습니다!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr ""
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "타이머 멈추기"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+#, fuzzy
+msgid "Pause timer"
+msgstr "타이머 시작하기"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "타이머 시작하기"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "알림 중단하기"
 
-#: ../src/xfcetimer.c:482
-#: ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d시 %d분 %d초"
 
-#: ../src/xfcetimer.c:484
-#: ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d분 %d초"
 
-#: ../src/xfcetimer.c:486
-#: ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d초"
 
-#: ../src/xfcetimer.c:496
-#: ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "이름"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "카운트다운 시간 입력"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "알림 시간 입력(24시간제 형식)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "시"
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "분"
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "초"
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "or"
 msgstr ""
 "\n"
 "또는\n"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "실행할 명령"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "새 알림 추가"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "알림 편집"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "속성"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 타이머 옵션"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+#, fuzzy
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 타이머 옵션"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "타이머\n"
 "이름"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -153,35 +162,53 @@ msgstr ""
 "카운트다운 주기 /\n"
 "알림 시간"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "알림 명령"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "알림 명령을 설정했을 경우\n"
 "경고 창을 표시하지 않습니다"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "반복할 알림 명령:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "알림 명령"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "반복할 알림 명령:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "반복 횟수"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  시간 간격(초)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce 패널용 타이머 플러그인"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 타이머"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce 패널용 타이머 플러그인"
+
+#~ msgid "Properties"
+#~ msgstr "속성"
diff --git a/po/lv.po b/po/lv.po
index 81b319b..8dbe34f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he xfce4-timer package 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2007-11-16 21:23+0300\n"
 "Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
 "Language-Team: Latvian <rprieditis at inbox.lv>\n"
@@ -16,139 +16,139 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds palicis"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds palicis"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds palicis"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Pīīīīp! :) \n"
 "Laiks iztecējis!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Apturēt taimeri"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Palaist taimeri"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Palaist taimeri"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Apturēt trauksmi"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Pie %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Nosaukums"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Ievadiet atskaites punkta laiku"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Ievadiet trauksmes laiku (24st formāts)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "st  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"vai\n"
+msgstr "vai"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Izpildāmā komanda"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Pievienot jaunu trauksmi"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Rediģēt trauksmi"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Taimera Uzstādījumi"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 Taimera Uzstādījumi"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Taimera\n"
 "nosaukums"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -156,40 +156,53 @@ msgstr ""
 "Atskaites periods /\n"
 "Trauksmes laiks"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Trauksmes komanda"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Nerādit brīdinājuma logu,\n"
 "ja trauksmes komanda nav uzstādīta"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Atkārtotas trauksmi komanda:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Trauksmes komanda"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Atkārtotas trauksmi komanda:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Mēģinājumu skaits"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Laika intervāls (sek.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Taimera spraudnis Xfce panelim"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Taimeris"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Taimera spraudnis Xfce panelim"
+
 #~ msgid "Properties"
 #~ msgstr "Rekvizīti"
diff --git a/po/nl.po b/po/nl.po
index 8167f56..fdb0597 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,141 +3,149 @@
 # This file is distributed under the same license as the
 # xfce4-timer-plugin package.
 # Pjotr, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2011-06-15 11:34+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"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%du %dm %ds over"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds over"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds over"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr "Tijd is voorbij!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Begin met aftellen"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Staak aftellen"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Begin met aftellen"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Begin met aftellen"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Staak het alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%du %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Om %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Naam"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Voer de afteltijd in"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Voer de alarmtijd in (24-uurs-opmaak)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "u  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"och\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "of"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "De opdracht om uit te voeren"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Voeg nieuw alarm toe"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Bewerk alarm"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Schakelklok-opties"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 Timer-opties"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Timer\n"
 "naam"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -145,48 +153,60 @@ msgstr ""
 "Aftelperiode /\n"
 "Alarmtijd"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarmopdracht"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Toon het waarschuwingsvenster niet\n"
 "indien een alarmopdracht is ingesteld"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Herhaal de alarmopdracht"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarmopdracht"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Herhaal de alarmopdracht"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Aantal herhalingen"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Tijdinterval (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Schakelklok-invoegtoepassing voor Xfce4-werkbalk"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Schakelklok"
 
-#~ msgid "Resume timer"
-#~ msgstr "Begin met aftellen"
-
-#~ msgid "Pause timer"
-#~ msgstr "Begin met aftellen"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Schakelklok-invoegtoepassing voor Xfce4-werkbalk"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
-#~ "of\n"
+#~ "och\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce4 Timer-opties"
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
diff --git a/po/pl.po b/po/pl.po
index 9cf6c42..d97edca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,183 +3,210 @@
 # This file is distributed under the same license as the xfce4-timer package.
 # Piotr Maliński <admin at rk.edu.pl>, 2006.
 # Piotr Sokół <piotr.sokol at 10g.pl>, 2009.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-03-24 11:05+0100\n"
 "Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
 "Language-Team: Polish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2));\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20)) ? 1 : 2));\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Pozostało %d godz %d min %d s"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "Pozostało %d min %d s"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "Pozostało %d s"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr "Czas upłynął!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+#, fuzzy
+msgid "Resume timer"
+msgstr "Uruchom stoper"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Zatrzymaj stoper"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Uruchom stoper"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Uruchom stoper"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Zatrzymaj alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d godz %d min %d s"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d min %d s"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d s"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nazwa"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Czas odliczania"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Godzina alarmu (format 24-godzinny)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "godz. "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "min "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"lub\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "lub"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Polecenie:"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Dodawanie alarmu"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Edycja alarmu"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+msgid "Xfce4 Timer Options"
 msgstr "Stoper"
 
-#: ../src/xfcetimer.c:1174
-msgid "Xfce4 Timer Options"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
 msgstr "Stoper"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nazwa\n"
 "alarmu"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
 msgstr "Czas odliczania / godzina alarmu"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Polecenie"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Nie wyświetlaj okna ostrzeżenia\n"
 "jeśli wprowadzono polecenie alarmu"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Powtarzanie polecenia alarmu"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Polecenie"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Powtarzanie polecenia alarmu"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Ilość powtórzeń: "
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Interwał (s): "
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Stoper dla Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Stoper"
 
-#~ msgid "Pause timer"
-#~ msgstr "Uruchom stoper"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Stoper dla Xfce"
 
-#~ msgid "or"
-#~ msgstr "\n"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "lub\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
+#~ msgid "Properties"
 #~ msgstr "Stoper"
diff --git a/po/pt.po b/po/pt.po
index 1a6a040..8ec1a80 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,145 +2,153 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Nuno Miguel <nunis at netcabo.pt>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-01-09 16:08-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt 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"
-"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: PORTUGAL\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Restam %dh %dm %ds"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "Restam %dm %ds"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "Restam %ds"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Atenção! :)\n"
 "Acabou o tempo!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Iniciar temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Parar o alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Em %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Coloque o tempo de contagem"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Coloque a hora do alarme (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h"
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m"
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s"
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "ou"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "O comando a executar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Adicionar novo alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Editar alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opções do temporizador Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opções do temporizador Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome\n"
 "do temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,48 +156,60 @@ msgstr ""
 "Período de contagem /\n"
 "Hora do alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Comando do alarme"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Não exibir a janela de aviso\n"
 "se o comando de alarme estiver definido"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Repetir o comando de alarme:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Comando do alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir o comando de alarme:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Número de repetições"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Intervalo de tempo (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "\"Plug-in\" para painel Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Temporizador Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar temporizador"
-
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "\"Plug-in\" para painel Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "ou\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opções do temporizador Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e4cff05..922600f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,142 +4,150 @@
 # Vladimir Melo <vladimirmelo at foresightlinux.org>, 2007.
 # Fábio Nogueira <deb-user-ba at ubuntu.com>, 2008.
 # Sérgio Cipolla <secipolla at gmail.com>, 2011.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2011-04-25 14:03-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"
-"Language: pt_BR\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Restando %dh %dmin %ds"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "Restando %dmin %ds"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "Restando %ds"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
 "Acabou o tempo!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Iniciar o temporizador"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Parar o temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Iniciar o temporizador"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Iniciar o temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Parar o alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dmin %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dmin %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "às %02dh%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Insira o tempo de contagem regressiva"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Insira a hora do alarme (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "min  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "ou"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "O comando a executar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Adicionar novo alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Editar alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Opções do temporizador do Xfce 4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opções do temporizador do Xfce 4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome do\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,46 +155,60 @@ msgstr ""
 "Período de contagem regressiva /\n"
 "Hora do alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Comando de alarme"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Não exibir a janela de aviso\n"
 "se um comando de alarme estiver definido"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Repetir o comando de alarme:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Comando de alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir o comando de alarme:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Número de repetições "
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Intervalo de tempo (s) "
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Plugin temporizador para o painel do Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Temporizador do Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar o temporizador"
-
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar o temporizador"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Plugin temporizador para o painel do Xfce"
 
-#~ msgid "or"
-#~ msgstr "ou"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opções do temporizador do Xfce 4"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
diff --git a/po/ru.po b/po/ru.po
index 763e4c9..819aaeb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,187 +3,207 @@
 # This file is distributed under the same license as
 #   the xfce4-timer package.
 # Andrey Fedoseev <andrey.fedoseev at gmail.com>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2010-03-01 11:17+0200\n"
 "Last-Translator: Dima Smirnov <arch at cnc-parts.info>\n"
 "Language-Team: Russian <ru at li.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "осталось %dч %dм %dс "
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "осталось %dм %dс"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "осталось %dс"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr "Время вышло"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Запустить таймер"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Остановить таймер"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Запустить таймер"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Запустить таймер"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Остановить таймер"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dч %dм %dс"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dм %dс"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dс"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "В %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Название"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Обратный отсчет"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Время срабатывания сигнала"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "ч  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "м  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "с  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"или\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "или"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Выполнить команду"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Добавить новый сигнал"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Редактировать сигнал"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Параметры"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Настройки таймера Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Настройки таймера Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Таймер\n"
 "Название"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
 msgstr "Период срабатывания"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Команда"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Не показывать уведомление\n"
 "если задана команда"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Команда повторения таймера:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Команда"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Команда повторения таймера:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Количество повторов"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "Интервал (сек.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Создание таймеров обратного отсчета"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Таймер Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Запустить таймер"
-
-#~ msgid "Pause timer"
-#~ msgstr "Запустить таймер"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Создание таймеров обратного отсчета"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "или\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Настройки таймера Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Параметры"
diff --git a/po/sk.po b/po/sk.po
index 9a0dec6..7770772 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin-0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-02-07 10:51+0100\n"
 "Last-Translator: Tomáš Vadina <kyberdev at gmail.com>\n"
 "Language-Team: slovenčina <slovenska-lokalizacia-xfce at googlegroups.com>\n"
@@ -18,140 +18,142 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds zostáva"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds zostáva"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds zostáva"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Pííííp! :) \n"
 "Čas vypršal!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 #, fuzzy
 msgid "Resume timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Zastaviť časovač"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Zastaviť alarm"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Od %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Názov"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Zadajte čas pre odpočítavanie"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Zadajte čas alarmu (v 24 hodinovej forme)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "alebo\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Príkaz na spustenie"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Pridať nový časovač"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Upraviť časovač"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Voľby Časovača Xfce4"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Voľby Časovača Xfce4"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Názov\n"
 "časovača"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -159,41 +161,54 @@ msgstr ""
 "Interval odpočtu /\n"
 "Čas alarmu"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Príkaz alarmu"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Nezobrazovať okno s varovaním\n"
 "pokiaľ je nastavený príkaz alarmu"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Opakovať príkaz alarmu:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Príkaz alarmu"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Opakovať príkaz alarmu:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Počet opakovaní"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Časový interval (s)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Zásuvný modul Časovač pre panel Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Časovač Xfce4"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Zásuvný modul Časovač pre panel Xfce"
+
 #~ msgid ""
 #~ "\n"
 #~ "or\n"
diff --git a/po/sq.po b/po/sq.po
index 5353e40..c412882 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-11-04 23:34+0200\n"
 "Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -15,139 +15,139 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%do %dm %ds të mbetura"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds të mbetura"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds të mbetura"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Xërrrrrrrr! :) \n"
 "Erdhi koha!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Ndal Kohësin"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Nis kohësin"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Nis kohësin"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Ndal alarmin"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%do %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Më %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Emër"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Jepni kohë skadimi"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Jepni kohën e alarmit (në format 24orësh)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "o "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"ose\n"
+msgstr "ose"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Urdhri për xhirim"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Shto alarm të ri"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Përpunoni Alarm"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Mundësi Kohësi Xfce4"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Mundësi Kohësi Xfce4"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Kohës\n"
 "emër"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -155,40 +155,53 @@ msgstr ""
 "Periudhë skadimi/\n"
 "Kohë alarmi"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Urdhër alarmi"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Mos shfaq dritare sinjalizimi\n"
 "po qe caktuar urdhër alarmi"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Përsërit urdhrin e alarmit:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Urdhër alarmi"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Përsërit urdhrin e alarmit:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Numër përsëritjesh"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Interval kohe (sec.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Shtojcë kohësi për panelin e Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Kohës Xfce4"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Shtojcë kohësi për panelin e Xfce"
+
 #~ msgid "Properties"
 #~ msgstr "Veti"
diff --git a/po/sr.po b/po/sr.po
index a46f712..9649980 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,142 +3,155 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 # Саша Петровић <salepetronije at gmail.com>, 2013.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2013-01-30 15:28+0100\n"
 "Last-Translator: Саша Петровић <salepetronije 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"
-"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"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds преостаје"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds преостаје"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds преостаје"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Туутуу! :)\n"
 "Време је истекло"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr ""
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Заустави бројач времена"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+#, fuzzy
+msgid "Pause timer"
+msgstr "Покрени бројач времена"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Покрени бројач времена"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Заустави узбуну"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "У %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Назив"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Унесите време одбројавања"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Унесите време узбуне (у облику 24 часа)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"или\n"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "or"
+msgstr "или"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Наредба за извршавање"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Додај нову узбуну"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Уредите узбуну"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Особине"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Могућности ИксФЦЕ бројача"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+#, fuzzy
+msgid "Xfce 4 Timer Plugin"
+msgstr "Могућности ИксФЦЕ бројача"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Бројач\n"
 "назив"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,34 +159,53 @@ msgstr ""
 "Раздобље одбројавања /\n"
 "Време узбуне"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Наредба узбуне"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Не приказуј прозор упозорења\n"
 "ако наредба узбуне није постављена"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Поновите наредбу за узбуну:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Наредба узбуне"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Поновите наредбу за узбуну:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Број понављања"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Временско раздобље (сек.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "ИксФЦЕ бројач времена"
+
+#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Timer plugin for Xfce panel"
 msgstr "Прикључак бројача на ИксФЦЕ полици"
 
-#: ../src/xfce4-timer.desktop.in.in.h:2
-msgid "Xfce4 Timer"
-msgstr "ИксФЦЕ бројач времена"
+#~ msgid "Properties"
+#~ msgstr "Особине"
diff --git a/po/sv.po b/po/sv.po
index 4985c70..9ae1a61 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-12-16 17:35+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,138 +16,138 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds kvar"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds kvar"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds kvar"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Piiiiip! :) \n"
 "Det är dags nu!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Stoppa tidtagare"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Starta tidtagare"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Starta tidtagare"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Stoppa alarmet"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Klockan %02d.%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "Namn"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Ange nedräkningstiden"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Ange tid för alarmet (24-timmarsformat)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
-msgstr ""
-"\n"
-"eller\n"
+msgstr "eller"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Kommandot att köra"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Lägg till nytt alarm"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Redigera alarm"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Alternativ för Xfce4-tidtagare"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce 4-tidtagare"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Tidtagar-\n"
 "namn"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -155,40 +155,53 @@ msgstr ""
 "Nedräkningsperiod /\n"
 "Alarmtid"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarmkommando"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Visa inte en varning om\n"
 "ett alarmkommando är inställt"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Upprepa alarmkommandot:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarmkommando"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Upprepa alarmkommandot:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Antal upprepningar"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Tidsintervall (s)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Tidtagare för Xfce-panelen"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4-tidtagare"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Tidtagare för Xfce-panelen"
+
 #~ msgid "Properties"
 #~ msgstr "Egenskaper"
diff --git a/po/tr.po b/po/tr.po
index 10675e9..0b2e155 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-11-11 14:07+0200\n"
 "Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
 "Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -18,139 +18,141 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dsa %ddk %dsn kaldı"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%ddk %dsn kaldı"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%dsn kaldı"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr " (Dondurulmuş)"
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiiiip ! :)\n"
-"Süre doldu !"
+"\"%s\" alarmı için süre doldu!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr "Saati devam ettir"
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Saati durdur"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "Saati dondur"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Saati başlat"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Uyarıyı durdur"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dsa %ddk %dsn"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%ddk %dsn"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dsn"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Alarm saati: %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "İsim"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Gerisayım süresini giriniz"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarm satini giriniz (24 saat formatında)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "sa  "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "dk  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "sn  "
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "ya da\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Çalıştırılacak komut"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Yeni alarm ekle"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Alarmı düzenle"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "XFCE4 Timer Özellikleri"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "XFCE4 Timer Özellikleri"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Alarmın\n"
 "adı"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -158,40 +160,53 @@ msgstr ""
 "Gerisayım süresi /\n"
 "Alarm saati"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Alarm komutu"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Eğer alarm komutu girilmişse\n"
 "uyarı penceresini gösterme"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr "Seçilen alarm başlasın"
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Uyarı komutunu yinele:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Alarm komutu"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Uyarı komutunu yinele:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Yinelemelerin sayısı"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Zaman aralığı (saniye)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "XFCE paneli için alarm eklentisi"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "XFCE4 Alarm Eklentisi -- XFCE4 Timer"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "XFCE paneli için alarm eklentisi"
+
 #~ msgid "Properties"
 #~ msgstr "Özellikler"
diff --git a/po/ug.po b/po/ug.po
index f10f3ef..5462d37 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,181 +8,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-10-10 03:36+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"
-"Language: \n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%d سائەت %d مىنۇت %d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%d مىنۇت %d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr " (ۋاقىتلىق توختىدى)"
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
-msgstr "تىرىڭ :) \n"
+"Time is up for the alarm %s."
+msgstr ""
+"تىرىڭ :) \n"
 "ۋاقىت توشتى"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "ۋاقىت ئۆلچىگۈچنى قايتا باشلا"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى توختات"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "ۋاقىت ئۆلچىگۈچنى ۋاقىتلىق توختات"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى باشلا"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "قوڭغۇراقنى توختات"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d سائەت %d مىنۇت %d سېكۇنت"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d مىنۇت %d سېكۇنت"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d سېكۇنت"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d دە"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "ئاتى"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "تەتۈر ساناش ۋاقتىنى كىرگۈزۈڭ"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "قوڭغۇراق چېلىش ۋاقتىنى كىرگۈزۈڭ (24 پىچىمىدا)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr "\n"
-"or\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "or"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
+msgstr ""
 "\n"
-"The command to run"
-msgstr "\n"
 "ئىجرا قىلىدىغان بۇيرۇق:"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "يېڭى قوڭغۇراق قوش"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "قوڭغۇراق تەھرىرلە"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "خاسلىق"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4  ۋاقىت ئۆلچىگۈچ تاللانمىسى"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
-msgstr "ۋاقىت ئۆلچىگۈچ\n"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce 4 ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
+msgstr ""
+"ۋاقىت ئۆلچىگۈچ\n"
 "ئاتى"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
-msgstr "تەتۈر ساناش ۋاقتى/\n"
+msgstr ""
+"تەتۈر ساناش ۋاقتى/\n"
 "قوڭغۇراق ۋاقتى"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "قوڭغۇراق بۇيرۇقى"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
-msgstr "قوڭغۇراق بۇيرۇقى بەلگىلەن بولسا\n"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
+msgstr ""
+"قوڭغۇراق بۇيرۇقى بەلگىلەن بولسا\n"
 "ئاگاھلاندۇرۇشنى كۆرسەتمىسۇن"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "قوڭغۇراق بۇيرۇقى تەكرارلانسۇن:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "قوڭغۇراق بۇيرۇقى"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "قوڭغۇراق بۇيرۇقى تەكرارلانسۇن:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "تەكرارلىنىش ۋاقتى"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  ۋاقىت ئىنتېرۋالى(سېكۇنت.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce نىڭ ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 ۋاقىت ئۆلچىگۈچى"
 
-#~ msgid " (Paused)"
-#~ msgstr " (ۋاقىتلىق توختىدى)"
-
-#~ msgid "Resume timer"
-#~ msgstr "ۋاقىت ئۆلچىگۈچنى قايتا باشلا"
-
-#~ msgid "Pause timer"
-#~ msgstr "ۋاقىت ئۆلچىگۈچنى ۋاقىتلىق توختات"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce نىڭ ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
 
-#~ msgid "or"
-#~ msgstr "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "or\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce 4 ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
+#~ msgid "Properties"
+#~ msgstr "خاسلىق"
diff --git a/po/uk.po b/po/uk.po
index 7709cfd..62d9f89 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,144 +1,152 @@
 # Ukrainian translation of xfce4-timer-plugin.
 # Copyright (C) 2005 Kemal Ilgar Eroglu.
 # This file is distributed under the same license as the xfce4-timer-plugin package.
-# 
+#
 # Dmitry Nikitin <luckas_fb at mail.ru>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2008-07-14 13:28+0300\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"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "залишилось %dг %dх %dс"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "залишилось %dх %dс"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "залишилось %dс"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Все-е-е! :) \n"
 "Час вийшов!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+msgid "Resume timer"
+msgstr "Запустити таймер"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "Зупинити таймер"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+msgid "Pause timer"
+msgstr "Запустити таймер"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "Запустити таймер"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "Зупинити сигнал"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dг %dх %dс"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dх %dс"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%dс"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "В %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "Назва"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "Введіть час зворотного відліку"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "Введіть час спрацьовування сигналу (в форматі 24 годин)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "г  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "х  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "с  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"або\n"
+#: ../src/xfcetimer.c:774
+msgid "or"
+msgstr "або"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Команда для запуску"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "Додати новий сигнал"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "Редагувати сигнал"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Властивості"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Опції таймеру Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+msgid "Xfce 4 Timer Plugin"
+msgstr "Опції таймеру Xfce4"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Таймер\n"
 "назва"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,48 +154,60 @@ msgstr ""
 "Період зворотного відліку /\n"
 "Час сигналу"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "Команда сигналу"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Не показувати вікно попереджень\n"
 "якщо налаштовано команду сигналу"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "Повторити команду сигналу:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "Команда сигналу"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Повторити команду сигналу:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "Кількість повторів"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  Інтервал часу (сек.)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Плагін Таймер для панелі Xfce"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Таймер Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Запустити таймер"
-
-#~ msgid "Pause timer"
-#~ msgstr "Запустити таймер"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Плагін Таймер для панелі Xfce"
 
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "або\n"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Опції таймеру Xfce4"
+#~ msgid "Properties"
+#~ msgstr "Властивості"
diff --git a/po/ur.po b/po/ur.po
index f52d93e..e6edf40 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-05-14 03:24+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,139 +20,141 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds باقی ہے"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "بیپ! :) \n"
 "وقت پورا ہوگیا!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "ٹائمر روکیں"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "الارم بند کریں"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "پر %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "نام"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "تنزلی وقت لکھیں"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "الارم کا وقت لکھیں (24گ فارمیٹ)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "گ"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "م"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "س"
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "or\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "چلانے کے لیے کمانڈ"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "نیا الارم شامل کریں"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "الارم مدون کریں"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "ٹائمر\n"
 "نام"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -160,40 +162,53 @@ msgstr ""
 "تنزلی مدت /\n"
 "الارم وقت"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "الارم کمانڈ"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "اگر الارم کمانڈ مرتب ہو یہ\n"
 "انتباہی ونڈو ظاہر مت کریں"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "الارم کمانڈ"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "الارم کمانڈ دہرائیں:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "تکرار کی تعداد"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  وقت وقفہ (سیکنڈ)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "ٹائمر پلگ ان برائے ایکسفس 4.4 پینل"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "ایکسفس4 ٹائمر"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "ٹائمر پلگ ان برائے ایکسفس 4.4 پینل"
+
 #~ msgid "Properties"
 #~ msgstr "خصوصیات"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index f52d93e..e6edf40 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-04 15:53+0300\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2009-05-14 03:24+0500\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
 "Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -20,139 +20,141 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:111
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "%ds باقی ہے"
 
-#: ../src/xfcetimer.c:116
+#: ../src/xfcetimer.c:113
 msgid " (Paused)"
 msgstr ""
 
-#: ../src/xfcetimer.c:141
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "بیپ! :) \n"
 "وقت پورا ہوگیا!"
 
-#: ../src/xfcetimer.c:430
+#: ../src/xfcetimer.c:439
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:436 ../src/xfcetimer.c:504
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "ٹائمر روکیں"
 
-#: ../src/xfcetimer.c:490
+#: ../src/xfcetimer.c:496
 #, fuzzy
 msgid "Pause timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:506
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:516
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "الارم بند کریں"
 
-#: ../src/xfcetimer.c:562 ../src/xfcetimer.c:637
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:564 ../src/xfcetimer.c:639
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:566 ../src/xfcetimer.c:641
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:576 ../src/xfcetimer.c:651
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "پر %02d:%02d"
 
-#: ../src/xfcetimer.c:733
+#: ../src/xfcetimer.c:738
 #, fuzzy
 msgid "Name:"
 msgstr "نام"
 
 #. ********
-#: ../src/xfcetimer.c:741
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "تنزلی وقت لکھیں"
 
-#: ../src/xfcetimer.c:744
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "الارم کا وقت لکھیں (24گ فارمیٹ)"
 
-#: ../src/xfcetimer.c:756
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "گ"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "م"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "س"
 
-#: ../src/xfcetimer.c:769
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "or\n"
 
-#: ../src/xfcetimer.c:792
+#: ../src/xfcetimer.c:797
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "چلانے کے لیے کمانڈ"
 
-#: ../src/xfcetimer.c:822
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "نیا الارم شامل کریں"
 
-#: ../src/xfcetimer.c:861
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "الارم مدون کریں"
 
-#: ../src/xfcetimer.c:1439 ../src/xfcetimer.c:1448
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1450
+#: ../src/xfcetimer.c:1471
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1499
+#: ../src/xfcetimer.c:1516
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "ٹائمر\n"
 "نام"
 
-#: ../src/xfcetimer.c:1504
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -160,40 +162,53 @@ msgstr ""
 "تنزلی مدت /\n"
 "الارم وقت"
 
-#: ../src/xfcetimer.c:1508
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "الارم کمانڈ"
 
-#: ../src/xfcetimer.c:1564
+#: ../src/xfcetimer.c:1583
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "اگر الارم کمانڈ مرتب ہو یہ\n"
 "انتباہی ونڈو ظاہر مت کریں"
 
-#: ../src/xfcetimer.c:1569
+#: ../src/xfcetimer.c:1588
 msgid "Selecting a timer starts it"
 msgstr ""
 
-#: ../src/xfcetimer.c:1574
-msgid "Repeat the alarm command:"
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1581
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "الارم کمانڈ"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "الارم کمانڈ دہرائیں:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "تکرار کی تعداد"
 
-#: ../src/xfcetimer.c:1587
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  وقت وقفہ (سیکنڈ)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "ٹائمر پلگ ان برائے ایکسفس 4.4 پینل"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "ایکسفس4 ٹائمر"
 
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "ٹائمر پلگ ان برائے ایکسفس 4.4 پینل"
+
 #~ msgid "Properties"
 #~ msgstr "خصوصیات"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7ca65f8..16f893a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2012-11-11 22:31+0800\n"
 "Last-Translator: Hunt Xu <huntxu at live.cn>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n-cn at xfce.org>\n"
@@ -19,128 +19,142 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "剩余 %d 小时 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "剩余 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "剩余 %d 秒"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "嘟嘟嘟!:)\n"
 "时间到!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+#, fuzzy
+msgid "Resume timer"
+msgstr "启动定时器"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "停止定时器"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+#, fuzzy
+msgid "Pause timer"
+msgstr "启动定时器"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "启动定时器"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "停止闹钟"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d 时 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d 分 %d 秒"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d 秒"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "在 %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "名称"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "输入倒计时时间"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "输入提示时间(24小时制)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "时 "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "分 "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "秒 "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "or"
 msgstr ""
 "\n"
-"or\n"
+"或\n"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "要运行的命令"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "添加新闹钟"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "编辑闹钟"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "属性"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce 定时器选项"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+#, fuzzy
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce 定时器选项"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "定时器\n"
 "名称"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,48 +162,60 @@ msgstr ""
 "倒计时周期/\n"
 "闹钟时间"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "闹钟命令"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "如果已设置闹钟命令\n"
 "则不显示警告窗口"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
+msgstr "重复闹钟命令:"
+
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "闹钟命令"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "重复闹钟命令:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "重复次数"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  时间间隔(秒。)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce 面板的定时器插件"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce 定时器"
 
-#, fuzzy
-#~ msgid "Pause timer"
-#~ msgstr "启动定时器"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce 面板的定时器插件"
 
-#, fuzzy
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
-#~ "或\n"
+#~ "or\n"
 
-#, fuzzy
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce 定时器选项"
+#~ msgid "Properties"
+#~ msgstr "属性"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4b4cc1a..8ec8090 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2013-04-22 19:23+0300\n"
 "PO-Revision-Date: 2013-01-28 12:28+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 at gmail.com>\n"
 "Language-Team: chinese-l10n <chinese-l10n at googlegroups.com>\n"
@@ -17,132 +17,140 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:105
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "剩下 %d 小時 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:108
 #, c-format
 msgid "%dm %ds left"
 msgstr "剩下 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:110
 #, c-format
 msgid "%ds left"
 msgstr "剩下 %d 秒"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:113
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:134
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "嗶!:) \n"
 "時間到!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:439
+#, fuzzy
+msgid "Resume timer"
+msgstr "啟動定時器"
+
+#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
 msgid "Stop timer"
 msgstr "停止定時器"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:496
+#, fuzzy
+msgid "Pause timer"
+msgstr "啟動定時器"
+
+#: ../src/xfcetimer.c:512
 msgid "Start timer"
 msgstr "啟動定時器"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:522
 msgid "Stop the alarm"
 msgstr "停止鬧鈴"
 
-#: ../src/xfcetimer.c:482
-#: ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d 小時 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:484
-#: ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
 #, c-format
 msgid "%dm %ds"
 msgstr "%d 分 %d 秒"
 
-#: ../src/xfcetimer.c:486
-#: ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
 #, c-format
 msgid "%ds"
 msgstr "%d 秒"
 
-#: ../src/xfcetimer.c:496
-#: ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
 #, c-format
 msgid "At %02d:%02d"
 msgstr "於 %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:738
+#, fuzzy
+msgid "Name:"
 msgstr "名稱"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:746
 msgid "Enter the countdown time"
 msgstr "請輸入倒數時間"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:749
 msgid "Enter the time of alarm (24h format)"
 msgstr "請輸入鬧鈴時間 (24 小時制)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:761
 msgid "h  "
 msgstr "點"
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:766
 msgid "m  "
 msgstr "分"
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:771
 msgid "s  "
 msgstr "秒"
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"或\n"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "or"
+msgstr "或"
 
-#. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:797
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "要執行的指令"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:827
 msgid "Add new alarm"
 msgstr "加入新鬧鈴"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:866
 msgid "Edit alarm"
 msgstr "編輯鬧鈴"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "屬性"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 定時器選項"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1471
+#, fuzzy
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 定時器選項"
+
+#: ../src/xfcetimer.c:1516
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "定時器\n"
 "名稱"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1521
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -150,52 +158,60 @@ msgstr ""
 "倒數期 /\n"
 "鬧鈴時間"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1525
 msgid "Alarm command"
 msgstr "鬧鈴指令"
 
-#: ../src/xfcetimer.c:1257
-msgid ""
-"Don't display the warning window\n"
-"if an alarm command is set"
+#: ../src/xfcetimer.c:1583
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "如果有設定鬧鈴指令的話\n"
 "請不要顯示警告視窗"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1588
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1596
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "重複鬧鈴指令:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1603
+#, fuzzy
+msgid "Default command: "
+msgstr "鬧鈴指令"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1615
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "重複鬧鈴指令:"
+
+#: ../src/xfcetimer.c:1622
 msgid "Number of repetitions"
 msgstr "重複次數"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1628
 msgid "  Time interval (sec.)"
 msgstr "  時間間隔 (秒)"
 
 #: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Xfce 面板的定時器插件"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
 msgid "Xfce4 Timer"
 msgstr "Xfce4 定時器"
 
-#, fuzzy
-#~ msgid "Resume timer"
-#~ msgstr "啟動定時器"
-
-#, fuzzy
-#~ msgid "Pause timer"
-#~ msgstr "啟動定時器"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce 面板的定時器插件"
 
-#, fuzzy
-#~ msgid "or"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
 #~ msgstr ""
 #~ "\n"
 #~ "或\n"
 
-#, fuzzy
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce4 定時器選項"
+#~ msgid "Properties"
+#~ msgstr "屬性"
diff --git a/src/xfcetimer.c b/src/xfcetimer.c
index a2a7c0d..34b4a1c 100644
--- a/src/xfcetimer.c
+++ b/src/xfcetimer.c
@@ -91,14 +91,11 @@ static gboolean update_function (gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
   gint elapsed_sec,remaining;
-  gchar *tiptext = NULL, *temp;
+  gchar *tiptext = NULL, *temp, *dialog_title, *dialog_message;
   GtkWidget *dialog;
 
   elapsed_sec=(gint)g_timer_elapsed(pd->timer,NULL);
 
-  /*g_fprintf(stderr,"\nElapsed %d seconds of %d",elapsed_sec,pd-
-                    >timeout_period_in_sec);*/
-
   /* If countdown is not over, update tooltip */
   if(elapsed_sec < pd->timeout_period_in_sec){
 
@@ -130,19 +127,28 @@ static gboolean update_function (gpointer data){
 
   /* Countdown is over, stop timer and free resources */
 
-  /*g_fprintf(stderr,"\nTimer command is ==> %s...",pd->timeout_command);*/
-
   if( (strlen(pd->timeout_command)==0) || !pd->nowin_if_alarm ) {
     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),1);
+
+	/* Display the name of the alarm when the countdown ends */
+    dialog_message = g_strdup_printf(_("Beeep! :) \nTime is up for the alarm %s."), pd->active_timer_name);
+
     dialog = gtk_message_dialog_new     (NULL,
                                     GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
                                     GTK_MESSAGE_WARNING,
                                     GTK_BUTTONS_CLOSE,
-                                    _("Beeep! :) \nTime is up!"));
+                                    dialog_message);
 
     g_signal_connect_swapped (dialog, "response",
                            G_CALLBACK (gtk_widget_destroy),
                            dialog);
+    
+    dialog_title = g_strdup_printf("Xfce4 Timer Plugin: %s", pd->active_timer_name);                       
+    gtk_window_set_title ((GtkWindow *) dialog, dialog_title);  
+                        
+	g_free(dialog_title);
+	g_free(dialog_message);
+	
     gtk_widget_show(dialog);
   }
 
@@ -204,8 +210,6 @@ static void timer_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer
 
   pd->selected=row_count;
 
-  /*g_fprintf(stderr,"\n Selecten menuitem is %d",row_count);*/
-  
   /* start the timer if the option to do so on selecting is set */
   if(pd->selecting_starts && !pd->timer_on)
     start_stop_selected(menuitem,event,data);  
@@ -224,7 +228,7 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
   GtkTreeIter iter;
   gboolean valid;
   GSList *group=NULL;
-  gchar *timerinfo,*tout_command;
+  gchar *timerinfo,*tout_command,*timername;
   gchar temp[8];
   gint row_count,cur_h,cur_m,cur_s,time;
   gint timeout_period;
@@ -235,7 +239,6 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
   /* If counting down, we stop the timer and free the resources */
   if(pd->timer_on){
 
-    /*g_fprintf(stderr,"\nTimer is running, shutting down...");*/
     if(pd->timer)
        g_timer_destroy(pd->timer);
     if(pd->timeout)
@@ -263,8 +266,6 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
 
   /* If we're here then the timer is off, so we start it */
 
-  /*g_fprintf(stderr,"\nStarting timer...");*/
-
   valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
   row_count=0;
 
@@ -278,12 +279,26 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
       row_count++;
   }
 
-  gtk_tree_model_get    (GTK_TREE_MODEL(pd->list), &iter, 2, &timerinfo, 3,
+  gtk_tree_model_get    (GTK_TREE_MODEL(pd->list), &iter, 1, &timername, 2, &timerinfo, 3,
             &tout_command, 4, &is_cd ,5, &time, -1);
 
-  /* This will not be freed until the timeout is destroyed */
-  pd->timeout_command=tout_command;
-
+  /* Record the timer name */
+  if (pd->active_timer_name)
+	g_free(pd->active_timer_name);
+  pd->active_timer_name = timername; /* It's freed next time or at exit */
+
+  /* If an alarm command is set, it overrides the default (if any) */
+  if (strlen(tout_command)>0)
+    /* This will not be freed until the timeout is destroyed */
+	pd->timeout_command=tout_command;
+  else if (pd->use_global_command) {
+
+	pd->timeout_command = g_strdup (pd->global_command);
+	/* tout_command is no longer needed, free it */
+	g_free(tout_command);
+  } else
+	pd->timeout_command = g_strdup("");
+  
   /* If it's a 24h type alarm, we find the difference with current time
      Here 'time' is in minutes */
   if(!is_cd) {
@@ -292,13 +307,10 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
      current = localtime((time_t *)&timeval.tv_sec);
      strftime(temp,7,"%H",current);
      cur_h=atoi(temp);
-     /*g_fprintf(stderr,"\n Current time: %d : ",cur_h);*/
      strftime(temp,7,"%M",current);
      cur_m=atoi(temp);
-     /*g_fprintf(stderr,"%d : ",cur_m);*/
      strftime(temp,7,"%S",current);
      cur_s=atoi(temp);
-     /*g_fprintf(stderr,"%d \n",cur_s);*/
 
      timeout_period=time*60 - ((60*cur_h + cur_m)*60 + cur_s);
 
@@ -386,9 +398,6 @@ static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data)
 
     plugin_data *pd=(plugin_data *)data;
 
-    /*g_fprintf(stderr,"\nReceived click on button %d",event->button);*/
-
-
     if(!pd->menu){
       g_fprintf(stderr,"\nNo menu\n");
       return;
@@ -450,8 +459,6 @@ void make_menu(plugin_data *pd){
 
       /* Run through the list, read name and timer period info */
 
-      /*g_fprintf(stderr,"\nMaking menuitem %d while selected is %d",row_count,pd->
-                                selected);*/
       gtk_tree_model_get(GTK_TREE_MODEL(pd->list),&iter,1,&timername,2,&timerinfo,-1);
       itemtext = g_strdup_printf("%s (%s)",timername,timerinfo);
       menuitem=gtk_radio_menu_item_new_with_label(group,itemtext);
@@ -470,7 +477,6 @@ void make_menu(plugin_data *pd){
 
       gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
 
-      /*g_fprintf(stderr,"\nAdding menuitem with label : %s",itemtext);*/
       g_free(itemtext);
 
       /* We add the address of menuitem to the array */
@@ -668,7 +674,6 @@ static void ok_edit(GtkButton *button, gpointer data){
  */
 static void alarmdialog_countdown_toggled (GtkButton *button, gpointer data)
 {
-  //plugin_data *pd = (plugin_data *)data;
   alarm_data *adata = (alarm_data *) data;
   gboolean active;
 
@@ -892,7 +897,6 @@ static void remove_clicked(GtkButton *button, gpointer data){
      /* The selected one is removed, the corresponding menuitem array is also
         updated */
      if(gtk_tree_selection_iter_is_selected(select,&iter)){
-       /*g_fprintf(stderr,"\n Removing node %d ...\n", row_count);*/
        iter_remove=iter; /* Mark to be deleted */
        g_array_remove_index(pd->menuarray,row_count);
        if(pd->selected==row_count) /* Update the index of the selected item */
@@ -1125,24 +1129,17 @@ static void load_settings(plugin_data *pd)
 
                  xfce_rc_set_group(rc,groupname);
 
-             /*g_fprintf(stderr,"\nLoading item %d\n",groupnum);*/
              gtk_list_store_append(pd->list,&iter);
 
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timername","No name");
              gtk_list_store_set(pd->list,&iter,0,groupnum,1,timerstring,-1);
-             /* g_free(timerstring); */ /* Entries read are not freed ! */
-
+    
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timercommand","");
              gtk_list_store_set(pd->list,&iter,3,timerstring,-1);
-             /*g_fprintf(stderr,"\nLoaded timer command ==> %s... with length %d",
-                            timerstring,strlen(timerstring));*/
-             /*g_free(timerstring);*/
 
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timerinfo","");
              gtk_list_store_set(pd->list,&iter,2,timerstring,-1);
 
-             /*g_free(timerstring);*/
-
              is_cd=xfce_rc_read_bool_entry(rc,"is_countdown",TRUE);
              time=xfce_rc_read_int_entry(rc,"time",0);
 
@@ -1162,7 +1159,14 @@ static void load_settings(plugin_data *pd)
             pd->nowin_if_alarm= xfce_rc_read_bool_entry
                 (rc,"nowin_if_alarm",FALSE);
             pd->selecting_starts= xfce_rc_read_bool_entry
-               (rc,"selecting_starts",FALSE);                
+               (rc,"selecting_starts",FALSE);           
+            pd->use_global_command= xfce_rc_read_bool_entry
+               (rc,"use_global_command",FALSE); 
+               
+            if(pd->global_command) g_free(pd->global_command);
+            pd->global_command = g_strdup((gchar *)xfce_rc_read_entry
+               (rc,"global_command",""));
+                            
             pd->repeat_alarm= xfce_rc_read_bool_entry
                 (rc,"repeat_alarm",FALSE);
             pd->repetitions= xfce_rc_read_int_entry
@@ -1221,10 +1225,6 @@ static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
   if (!rc)
     return;
 
-
-
-  /*g_fprintf(stderr,"\n Running write\n");*/
-
   valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
 
   row_count=0;
@@ -1265,6 +1265,8 @@ static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
 
   xfce_rc_write_bool_entry(rc,"nowin_if_alarm",pd->nowin_if_alarm);
   xfce_rc_write_bool_entry(rc,"selecting_starts",pd->selecting_starts);
+  xfce_rc_write_bool_entry(rc,"use_global_command",pd->use_global_command);
+  xfce_rc_write_entry(rc,"global_command",pd->global_command);
   xfce_rc_write_bool_entry(rc,"repeat_alarm",pd->repeat_alarm);
   xfce_rc_write_int_entry(rc,"repetitions",pd->repetitions);
   xfce_rc_write_int_entry(rc,"repeat_interval",pd->repeat_interval);
@@ -1321,6 +1323,12 @@ plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
   if(pd->timeout_command)
     g_free(pd->timeout_command);
 
+  if(pd->global_command)
+    g_free(pd->global_command);
+    
+  if(pd->active_timer_name)
+    g_free(pd->active_timer_name);
+        
   if(pd->configfile)
     g_free(pd->configfile);
 
@@ -1349,14 +1357,17 @@ plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
 static void
 options_dialog_response (GtkWidget *dlg, int reponse, plugin_data *pd)
 {
+	if(pd->global_command)
+		g_free(pd->global_command);
+	pd->global_command = g_strdup (gtk_entry_get_text((GtkEntry *)pd->glob_command_entry));
     gtk_widget_destroy (dlg);
     xfce_panel_plugin_unblock_menu (pd->base);
     save_settings(pd->base,pd);
 }
 
-/**********************************/
-/* nowin_if_alarm toggle callback */
-/**********************************/
+/**
+ * nowin_if_alarm toggle callback
+**/
 static void toggle_nowin_if_alarm(GtkToggleButton *button, gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
@@ -1365,9 +1376,9 @@ static void toggle_nowin_if_alarm(GtkToggleButton *button, gpointer data){
 
 }
 
-/************************************/
-/* selecting_starts toggle callback */
-/************************************/
+/**
+ * selecting_starts toggle callback
+**/
 static void toggle_selecting_starts(GtkToggleButton *button, gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
@@ -1375,26 +1386,36 @@ static void toggle_selecting_starts(GtkToggleButton *button, gpointer data){
   pd->selecting_starts = gtk_toggle_button_get_active(button);
 
 }
+/**
+ * toggle_global_command toggle callback
+**/
+static void toggle_global_command(GtkToggleButton *button, gpointer data){
+
+  plugin_data *pd=(plugin_data *)data;
+
+  pd->use_global_command = gtk_toggle_button_get_active(button);
 
-/***************************************/
-/* toggle_repeat_alarm toggle callback */
-/***************************************/
+  gtk_widget_set_sensitive(pd->global_command_box,pd->use_global_command);
+
+}
+
+/**
+ * toggle_repeat_alarm toggle callback
+**/
 static void toggle_repeat_alarm(GtkToggleButton *button, gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
 
   pd->repeat_alarm = gtk_toggle_button_get_active(button);
-  gtk_widget_set_sensitive(GTK_WIDGET(pd->spin_interval), pd->repeat_alarm);
-  gtk_widget_set_sensitive(GTK_WIDGET(pd->spin_repeat), pd->repeat_alarm);
 
   gtk_widget_set_sensitive(pd->repeat_alarm_box,pd->repeat_alarm);
 
 }
 
-/***************************************/
-/* Spinbutton 1 (#of alarm repetitions */
-/* value change callback               */
-/***************************************/
+/**
+ * Spinbutton 1 (#of alarm repetitions
+ * value change callback              
+**/
 static void spin1_changed(GtkSpinButton *button, gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
@@ -1403,10 +1424,10 @@ static void spin1_changed(GtkSpinButton *button, gpointer data){
 
 }
 
-/***************************************/
-/* Spinbutton 1 (alarm repetition      */
-/* interval) value change callback     */
-/***************************************/
+/**
+ * Spinbutton 1 (alarm repetition 
+ * interval) value change callback 
+**/
 static void spin2_changed(GtkSpinButton *button, gpointer data){
 
   plugin_data *pd=(plugin_data *)data;
@@ -1415,9 +1436,9 @@ static void spin2_changed(GtkSpinButton *button, gpointer data){
 
 }
 
-/******************/
-/* options dialog */
-/******************/
+/**
+ * options dialog
+**/
 static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
 
   GtkWidget *vbox=gtk_vbox_new(FALSE,0); /*outermost box */
@@ -1464,12 +1485,8 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
 
   gtk_container_set_border_width (GTK_CONTAINER(dlg), BORDER);
 
-  gtk_widget_set_size_request (dlg, 650, 450);
+  gtk_widget_set_size_request (dlg, 650, -1);
   gtk_window_set_position(GTK_WINDOW(header),GTK_WIN_POS_CENTER);
-  
-  //gtk_container_set_border_width (GTK_CONTAINER (header), 6);
-  //gtk_widget_show (header);
-
 
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox,
                       TRUE, TRUE, WIDGET_SPACING);
@@ -1515,7 +1532,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   else
      g_fprintf(stderr,"\n pd->tree is NULL\n");
 
-  gtk_widget_set_size_request(GTK_WIDGET(sw),350,250);
+  gtk_widget_set_size_request(GTK_WIDGET(sw),350,200);
 
   select = gtk_tree_view_get_selection (GTK_TREE_VIEW (pd->tree));
   gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
@@ -1559,6 +1576,8 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   gtk_widget_set_sensitive(button,FALSE);
   g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK(down_clicked), pd);
   
+  gtk_widget_set_size_request(hbox,-1,-1);
+  
   gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
 
   button=gtk_check_button_new_with_label(_("Don't display a warning  if an alarm command is set"));
@@ -1571,11 +1590,33 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_selecting_starts),pd);
   gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
 
-  button=gtk_check_button_new_with_label(_("Repeat the alarm command:"));
+  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
+
+  /* Default alarm command config */
+  button=gtk_check_button_new_with_label(_("Use a default alarm command"));
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->use_global_command);
+  g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_global_command),pd);
+  gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
+
+  hbox = gtk_hbox_new (FALSE,0);
+  pd->global_command_box=hbox;
+  gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Default command: ")),FALSE,FALSE,0);
+  pd->glob_command_entry = (GtkWidget *) gtk_entry_new();
+  gtk_widget_set_size_request(pd->glob_command_entry,400,-1);
+  gtk_entry_set_text(GTK_ENTRY(pd->glob_command_entry), pd->global_command);
+  gtk_box_pack_start(GTK_BOX(hbox),pd->glob_command_entry,FALSE,FALSE,0);
+
+  gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
+  gtk_widget_set_sensitive(hbox,pd->use_global_command);
+  
+  gtk_box_pack_start(GTK_BOX(vbox),gtk_hseparator_new(),FALSE,FALSE,BORDER);
+  
+  /* Alarm repetitions config */  
+  button=gtk_check_button_new_with_label(_("Repeat the alarm command"));
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),pd->repeat_alarm);
   g_signal_connect(G_OBJECT(button),"toggled",G_CALLBACK(toggle_repeat_alarm),pd);
   gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,WIDGET_SPACING);
-
+  
   hbox = gtk_hbox_new (FALSE,0);
   pd->repeat_alarm_box=hbox;
   gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("Number of repetitions")),FALSE,FALSE,0);
@@ -1651,11 +1692,16 @@ create_plugin_control (XfcePanelPlugin *plugin)
   pd->tip=gtk_tooltips_new();
   pd->timeout_command=NULL;
   pd->timer=NULL;
+  pd->active_timer_name = g_strdup("");
   pd->nowin_if_alarm=FALSE;
   pd->selecting_starts=FALSE;
   pd->repeat_alarm=FALSE;
   pd->is_paused=FALSE;
   pd->is_countdown=TRUE;
+  pd->use_global_command = FALSE;
+  pd->glob_command_entry = NULL;
+  pd->global_command = g_strdup(""); /* For Gtk >= 3.4 one could just set = NULL */
+  pd->global_command_box = NULL;  
   pd->repeat_alarm_box=NULL;
   pd->repetitions=1;
   pd->rem_repetitions=1;
@@ -1712,6 +1758,7 @@ create_plugin_control (XfcePanelPlugin *plugin)
   xfce_panel_plugin_menu_show_configure (plugin);
   g_signal_connect (plugin, "configure-plugin",
                       G_CALLBACK (plugin_create_options), pd);
+                   
 }
 
 
diff --git a/src/xfcetimer.h b/src/xfcetimer.h
index f083bab..86bf0ac 100644
--- a/src/xfcetimer.h
+++ b/src/xfcetimer.h
@@ -28,6 +28,10 @@ typedef struct {
 		*buttonup, *buttondown,
 		*spin_repeat, *spin_interval,			/* spinbuttons for alarm repeat */
 		*menu,
+		*glob_command_entry,		/* Text entry widget for
+								the default alarm command */
+		*global_command_box,	/* Box holding the default
+								command settings */
 		*repeat_alarm_box;		/* Box holding the repeat 
 								alarm settings */
 		
@@ -47,6 +51,8 @@ typedef struct {
 									alarm command is set */
 			selecting_starts,       /* selecting a timer also starts it */							   
 			repeat_alarm,			/* Repeat alarm */
+			use_global_command,		/* Use a default alarm command
+									if no alarm command is set */
 			alarm_repeating,		/* True while alarm repeats */
 			is_paused,				/* True if the countdown is paused */
 			is_countdown;			/* True if the alarm type is contdown */
@@ -56,10 +62,13 @@ typedef struct {
 								are used to find the index
 								of the selected menuitem. */
   gchar 	*timeout_command,	/* Command when countdown ends */
+			*global_command,	/* The global (default) command to be
+								run when countdown ends */
+			*active_timer_name, /* Name of the timer running */
   			*configfile;		/* Full address of the permanent
   								config file -- this is not the
   								plugin rc file. */
-  GTimer 	*timer;				/* Keeps time elapsed */
+  GTimer 	*timer;				/* Keeps track of the time elapsed */
 
 } plugin_data;
 


More information about the Xfce4-commits mailing list