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

Kemal Ilgar Eroglu noreply at xfce.org
Fri May 10 11:38:01 CEST 2013


Updating branch refs/heads/master
         to 8b61ebf3fb1a07b34d3a691ecec4ed038f1d2e9a (commit)
       from 49a7be42ad06143a7b6f2ea2f41fa0bda1c8b663 (commit)

commit 8b61ebf3fb1a07b34d3a691ecec4ed038f1d2e9a
Author: Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
Date:   Fri May 10 12:37:15 2013 +0300

    Release 1.5.0

 ChangeLog       |    6 +
 configure.in.in |    8 +-
 po/ar.po        |   88 ++++---
 po/ast.po       |   89 ++++---
 po/ca.po        |   88 ++++---
 po/cs.po        |   88 ++++---
 po/da.po        |   88 ++++---
 po/de.po        |   88 ++++---
 po/el.po        |   88 ++++---
 po/en_GB.po     |   89 ++++---
 po/es.po        |  174 +++++++-----
 po/eu.po        |  174 +++++++-----
 po/fr.po        |  174 +++++++-----
 po/gl.po        |   88 ++++---
 po/hr.po        |  170 +++++++-----
 po/hu.po        |   88 ++++---
 po/id.po        |   88 ++++---
 po/it.po        |  174 +++++++-----
 po/ja.po        |   88 ++++---
 po/ko.po        |   88 ++++---
 po/lv.po        |   88 ++++---
 po/nl.po        |  174 +++++++-----
 po/pl.po        |   88 ++++---
 po/pt.po        |  174 +++++++-----
 po/pt_BR.po     |  174 +++++++-----
 po/ru.po        |   88 ++++---
 po/sk.po        |   88 ++++---
 po/sq.po        |   88 ++++---
 po/sr.po        |  175 +++++++-----
 po/sv.po        |   88 ++++---
 po/tr.po        |   88 ++++---
 po/ug.po        |   88 ++++---
 po/uk.po        |  174 +++++++-----
 po/ur.po        |   88 ++++---
 po/ur_PK.po     |   88 ++++---
 po/zh_CN.po     |   88 ++++---
 po/zh_TW.po     |   88 ++++---
 src/xfcetimer.c |  801 +++++++++++++++++++++++++++++--------------------------
 src/xfcetimer.h |   20 +-
 39 files changed, 2731 insertions(+), 2043 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a182b74..f84098c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+10/05/2013 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
+	* Version 1.5.0
+	* Major code reorganization
+	* Allow popup menuitems to be activated by keyboard (bug #10035)
+	* Various minor bugfixes
+	* Add the "About" dialog
 22/04/2013 Kemal Ilgar Eroglu <ilgar_eroglu at yahoo.com>
 	* Version 1.0.2
 	* Some code cleanup
diff --git a/configure.in.in b/configure.in.in
index 1046375..93a3cc7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -5,11 +5,11 @@ 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], [2])
+m4_define([xfce4_timer_version_minor], [5])
+m4_define([xfce4_timer_version_micro], [0])
 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()])])
+m4_define([xfce4_timer_version_tag]) # Leave empty only for releases, but use 'git' in most cases
+m4_define([xfce4_timer_version], [xfce4_timer_version_major().xfce4_timer_version_minor().xfce4_timer_version_micro()ifelse(xfce4_timer_version_tag(), [], [],[xfce4_timer_version_tag()-xfce4_timer_version_build()])])
 
 dnl init autoconf
 AC_INIT([xfce4-timer-plugin], [xfce4_timer_version], [ilgar_eroglu at yahoo.com])
diff --git a/po/ar.po b/po/ar.po
index 798d6c1..26b7195 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +18,27 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Arabic\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dس %dد %ds تبقت"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dد %dث تبقت"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%dث تبقت"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -47,111 +47,112 @@ msgstr ""
 "بيييب! :) \n"
 "حان الوقت!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "بدء تشغيل ضبط المؤقت"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "إيقاف ضبط المؤقت"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "بدء تشغيل ضبط المؤقت"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "بدء تشغيل ضبط المؤقت"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "إيقاف التنبيه"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dس %dد %dث"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dد %dث"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dث"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "عند %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "اسم"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "أدخل وقت العد التنازلي"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "أدخل وقت التنبيه (تنسيق 24 ساعة)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "س  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "د  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "ث  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "أو"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "الأمر للتشغيل"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "أضف تنبيه جديد"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "حرّر المنبّه"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "خيارات ضبط مؤقت اكسفس4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "خيارات ضبط المؤقت Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "اسم\n"
 "المؤقت"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -159,46 +160,59 @@ msgstr ""
 "فترة العد التنازلي /\n"
 "وقت التنبيه"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "أمر التنبيه"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "لا تعرض إطار التنبيه\n"
 "إذا تم ضبط أمر التنبيه"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "تكرار أمر التنبيه:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "أمر التنبيه"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "تكرار أمر التنبيه:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "مرات التكرار"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  الفاصل الزمني (ثانية.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "خيارات ضبط المؤقت Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "مؤقت إكسفس 4"
diff --git a/po/ast.po b/po/ast.po
index 75ee7b2..f4a454d 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +13,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restantes"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restantes"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds restantes"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -42,111 +42,111 @@ msgstr ""
 "Biiip! :) \n"
 "¡Acabóse'l tiempu!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Entamar temporizador"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Entamar temporizador"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Parar l'alarma"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A les %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Meta'l tiempu de cuenta atrás"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Entre la hora d'alarma (formatu 24h)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "o"
 
-
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "El comandu a executar"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Amestar nueva alarma"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Editar alarma"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Nome del\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -154,46 +154,59 @@ msgstr ""
 "Periodu de cuenta atrás /\n"
 "Hora d'alarma"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Comandu d'alarma"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Repetir el comandu d'alarma:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Comandu d'alarma"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Repetir el comandu d'alarma:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Númberu de repeticiones"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Intervalu tiempu (seg.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opciones del temporizador de Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
diff --git a/po/ca.po b/po/ca.po
index 68a3a43..59cb9f3 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "queden %dh %dm %ds"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "queden %dm %ds"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "queden %ds"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -46,109 +46,110 @@ msgstr ""
 "Biiiiiiip! :)\n"
 "S'ha acabat el temps!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Atura temporitzador"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Engega temporitzador"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Atura l'alarma"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A les %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nom"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Introdueix l'hora del compta enrera"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introdueix l'ha de l'alarma (format de 24h)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "o"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "L'ordre a executar"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Afegeix una alarma nova"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Edita l'alarma"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opcions del temporitzador Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opcions del temporitzador Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Temporitzador\n"
 "nom"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -156,46 +157,59 @@ msgstr ""
 "Temps de compta enrere /\n"
 "Hora de l'alarma"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Ordre de l'alarma"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Repeteix l'ordre de l'alarma:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Ordre de l'alarma"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Repeteix l'ordre de l'alarma:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Nombre de repeticions"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Interval de temps (en segons)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opcions del temporitzador Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Temporitzador Xfce4"
diff --git a/po/cs.po b/po/cs.po
index ae0249c..bd44d4c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds zbývá"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds zbývá"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds zbývá"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -46,107 +46,108 @@ msgstr ""
 "Pííííp! :) \n"
 "Čas vypršel!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Spustit odpočet času"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Zastavit odpočet času"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Spustit odpočet času"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Spustit odpočet času"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Zastavit výstrahu"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "V %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Název"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Zadejte čas pro odpočítávání"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Zadejte čas výstrahy (ve 24hodinovém formátu)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "nebo"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Příkaz ke spuštění"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Přidat novou výstrahu"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Upravit výstrahu"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Název\n"
 "odpočtu"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -154,46 +155,59 @@ msgstr ""
 "Interval odpočtu /\n"
 "Čas výstrahy"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Příkaz výstrahy"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Opakovat příkaz výstrahy"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Příkaz výstrahy"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Opakovat příkaz výstrahy"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Počet opakování"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Časový interval (s)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Volby zásuvného modulu Odpočet času pro Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Odpočet času pro Xfce4"
diff --git a/po/da.po b/po/da.po
index 68dff5e..8be320e 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +19,27 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: DENMARK\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dt %dm %ds tilbage"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds tilbage"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds tilbage"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -48,108 +48,109 @@ msgstr ""
 "Biiip! :) \n"
 "Tiden er gået!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Stop timer"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Stop alarmen"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dt %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ved %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Navn"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Indtast nedtællingstiden"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Indtast tiden for alarmen (24t format)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "t  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "eller"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Kommadoen der skal køres"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Tilføj ny alarm"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Redigér alarm"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4-timerindstillinger"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4-timerindstillinger"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Timer\n"
 "navn"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -157,46 +158,59 @@ msgstr ""
 "Nedtællingsperiode /\n"
 "Alarmtid"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Alarmkommando"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Gentag alarmkommandoen:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Alarmkommando"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Gentag alarmkommandoen:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Antal gentagelser"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Tidsinterval (sek.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4-timerindstillinger"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4-timer"
diff --git a/po/de.po b/po/de.po
index 715a1be..0d03846 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -18,27 +18,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "verbleibend: %d Stunden %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "verbleibend: %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "verbleibend: %d Sekunden"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -47,107 +47,108 @@ msgstr ""
 "Bing! :) \n"
 "Die Zeit ist abgelaufen"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Uhr starten"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Uhr stoppen"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Uhr starten"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Uhr starten"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Alarm ausschalten"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d Stunden %d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d Minuten %d Sekunden"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d Sekunden"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Bei %02d: %02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Name"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Wartezeit eingeben"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarmzeit eingeben "
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "Stunden  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "Minuten  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "Sekunden  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "oder"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Auszuführender Befehl:"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Neuen Alarm erstellen"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Alarm bearbeiten"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Einstellungen für die Xfce-Eieruhr"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce-Eieruhr"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Name der\n"
 "Eieruhr"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -155,46 +156,59 @@ msgstr ""
 "Wartezeit /\n"
 "Alarmzeit"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Alarmbefehl"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Alarmbefehl wiederholen:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Alarmbefehl"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Alarmbefehl wiederholen:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Anzahl der Wiederholungen"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "Zeitabstand (Sek.): "
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce-Eieruhr"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4-Eieruhr"
diff --git a/po/el.po b/po/el.po
index 9606ac2..0012220 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +16,27 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dω %dλ %dδ απέμειναν"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dλ %dδ απέμειναν"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%dδ απέμειναν"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -45,111 +45,112 @@ msgstr ""
 "Μπιιιιιμπ! :) \n"
 "Ο χρόνος ολοκληρώθηκε!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Τερματισμός χρονόμετρου "
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Έναρξη χρονόμετρου "
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Τερματισμός ειδοποίησης  "
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dω %dλ %dδ"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dλ %dδ"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dδ"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Σε %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Όνομα"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Εισαγωγή του αντίστροφου χρόνου"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Εισαγωγή της ώρας της ειδοποίησης (σε 24 μορφή)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "ώρα"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "λεπτά"
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "δευτ"
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "ή"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Η εντολή που θα εκτελεστεί"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Προσθήκη νέας ειδοποίησης  "
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Επεξεργασία ειδοποίησης "
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Επιλογές χρονόμετρου  xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Επιλογές χρονόμετρου  xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Όνομα\n"
 "χρονόμετρου"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -157,46 +158,59 @@ msgstr ""
 "Περίοδος αντίστροφου χρόνου /\n"
 "Χρόνος ειδοποίησης"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Εντολή ειδοποίησης "
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Μην εμφανίσεις το παράθυρο προειδοποίησης\n"
 "εάν η εντολή ειδοποίησης έχει ορισθεί"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Επανάληψη της εντολής του ξυπνητήρι:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Εντολή ειδοποίησης "
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Επανάληψη της εντολής του ξυπνητήρι:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Αριθμός επαναλήψεων"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "Διαστημα ανανέωσης (δευτ.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Επιλογές χρονόμετρου  xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Χρονόμετρο xfce4"
diff --git a/po/en_GB.po b/po/en_GB.po
index 418a9e7..a0f0e34 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +18,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds left"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds left"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds left"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -47,110 +47,110 @@ msgstr ""
 "Beeep! :) \n"
 "Time is up!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Stop timer"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Start timer"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Stop the alarm"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "At %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Name"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Enter the countdown time"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Enter the time of alarm (24h format)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "or"
 
-
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "The command to run"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Add new alarm"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Edit alarm"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Timer Options"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 Timer Options"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Timer\n"
 "name"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -158,46 +158,59 @@ msgstr ""
 "Countdown period /\n"
 "Alarm time"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Alarm command"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Repeat the alarm command:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Alarm command"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Repeat the alarm command:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Number of repetitions"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Time interval (sec.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 Timer Options"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
diff --git a/po/es.po b/po/es.po
index 7e9131b..c65caec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,143 +2,152 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restantes"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restantes"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds restantes"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
-"Time is up!"
+"Time is up for the alarm %s."
 msgstr ""
 "Biiip! :) \n"
 "¡Se acabó el tiempo para la alarma %s!"
 
-#: ../src/xfcetimer.c:424
+#: ../src/xfcetimer.c:462
+msgid "Resume timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Iniciar temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Parar la alarma"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "A las %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Nombre"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Introduzca el tiempo de cuenta atrás"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introduzca la hora de alarma (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"o\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "o"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "El comando a ejecutar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Añadir nueva alarma"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Editar alarma"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propiedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opciones del temporizador de Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opciones del temporizador de Xfce4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nombre del\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,52 +155,71 @@ msgstr ""
 "Periodo de cuenta atrás /\n"
 "Hora de alarma"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
+msgstr "Repetir el comando de alarma:"
+
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Comando de alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir la orden de alarma:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Número de repeticiones"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opciones del temporizador de Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "o"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Xfce4 Timer"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opciones del temporizador de Xfce4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Complemento temporizador para el panel de Xfce"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Repetir el comando de alarma:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "o\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Comando de alarma"
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
diff --git a/po/eu.po b/po/eu.po
index 1ca900c..a895b92 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,144 +3,153 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%do %dm %ds falta dira"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds falta dira"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds falta dira"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Abiarazte ordua"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Amaiera ordua"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Abiarazte ordua"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Abiarazte ordua"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Alarma gelditu"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%do %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d-etan"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Izena"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "atzekoz aurrera kontatze denbora idatzi"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarmaren ordua idatzi (24h formatua)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "o  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"edo\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "edo"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "abiarazteko komandoa"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Alarma Berri bat gehitu"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Alarma Editatu"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propietateak"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Kronometro Aukerak"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 Kronometro Aukerak"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Kronometroa\n"
 "izena"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,52 +157,71 @@ msgstr ""
 "Kontatze aldia /\n"
 "Alarma ordua"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
 msgstr "Alarma komandoa errepikatu:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Alarma komandoa"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Alarma komandoa errepikatu:"
+
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Errepikapen kopurua"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 Kronometro Aukerak"
 
-#~ msgid "Resume timer"
-#~ msgstr "Abiarazte ordua"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Abiarazte ordua"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "edo"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Xfce4 kronometroa"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce4 Kronometro Aukerak"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Xfce panelarentzat kronometro plugin-a"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Alarma komandoa errepikatu:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "edo\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Alarma komandoa"
+#~ msgid "Properties"
+#~ msgstr "Propietateak"
diff --git a/po/fr.po b/po/fr.po
index 7dcd793..bfac3ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,142 +4,151 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds restante(s)"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds restante(s)"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds restante(s)"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Lancer le chronomètre"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Arrêter le chronomètre"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Lancer le chronomètre"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Lancer le chronomètre"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Arrêter l'alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "À %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Nom"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Entrer la durée du compte à rebours"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Entrer l'heure de l'alarme (format 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "ou"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "La commande a exécuter"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Ajouter une nouvelle alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Éditer l'alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriétés"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Options du chronomètre Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Options du chronomètre Xfce4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Chronomètre\n"
 "nom"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,52 +156,71 @@ msgstr ""
 "Période de compte à rebours /\n"
 "Heure d'alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
 msgstr "Répéter la commande d'alarme :"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Commande d'alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Répéter la commande d'alarme :"
+
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Nombre de répétitions"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Options du chronomètre Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Lancer le chronomètre"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Lancer le chronomètre"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "ou"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Chronomètre Xfce4"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Options du chronomètre Xfce4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Greffon de chronomètre pour le panneau Xfce"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Répéter la commande d'alarme :"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Commande d'alarme"
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
diff --git a/po/gl.po b/po/gl.po
index a34b194..090f6a5 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +21,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "quedan %dh %dm %ds"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "quedan %dm %ds"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "quedan %ds"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -50,112 +50,113 @@ msgstr ""
 "Biiiiiip! :) \n"
 "Esgotouse o tempo!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Deter o contador"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Iniciar o contador"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Deter a alarma"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ás %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Introducir o tempo de conta"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Introduza a hora da alarma (formato 24h)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "ou\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "A orde a executar"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Engadir nova alarma"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Editar a alarma"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opcións de Xfce4 Timer"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opcións de Xfce4 Timer"
 
 # Contador
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Nome do\n"
 "contador"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -163,46 +164,59 @@ msgstr ""
 "Periodo de conta/\n"
 "Tempo da alarma"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Orde de alarma"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Repetir a orde de alarma:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Orde de alarma"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Repetir a orde de alarma:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Número de repeticións"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Intervalo de tempo (seg.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opcións de Xfce4 Timer"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Timer"
diff --git a/po/hr.po b/po/hr.po
index f2a79b7..867fac1 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,141 +1,153 @@
-# 
+#
 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds preostalo"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds preostalo"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds preostalo"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Pokreni mjerač vremena"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Zaustavi mjerač vremena"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Pokreni mjerač vremena"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Pokreni mjerač vremena"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Zaustavi alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "U %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Ime"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Unesite vrijeme odbrojavanja"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Unesite vrijeme alarma (format 24 sata)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "ili"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Pokrenuti naredbu"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Dodaj novi alarm"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Uredi alarm"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Svojstva"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Pocije Xfce4 mjerača vremena"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Pocije Xfce4 mjerača vremena"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Ime\n"
 "mjerača vremena"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -143,52 +155,64 @@ msgstr ""
 "Period odbrojavanja /\n"
 "Vrijeme alarma"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
+msgstr "Ponovi naredbu alarma"
+
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Naredba alarma"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Ponovi naredbu alarma:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Broj ponavljanja"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Pocije Xfce4 mjerača vremena"
 
-#~ msgid "Pause timer"
-#~ msgstr "Pokreni mjerač vremena"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "ili"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Pocije Xfce4 mjerača vremena"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Xfce4 Mjerač vremena"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Ponovi naredbu alarma"
+#: ../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 "Default command: "
-#~ msgstr "Naredba alarma"
+#~ msgid "Properties"
+#~ msgstr "Svojstva"
diff --git a/po/hu.po b/po/hu.po
index ecd1b2f..7678f1c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -19,27 +19,27 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dó %dp %dmp van hátra"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dp %dmp van hátra"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%dmp van hátra"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -48,107 +48,108 @@ msgstr ""
 "Csörrr! :)\n"
 "Letelt az idő!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Időzítő indítása"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Időzítő leállítása"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Időzítő indítása"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Időzítő indítása"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Figyelmeztetés leállítása"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dó %dp %dmp"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dp %dmp"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dmp"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Ekkor: %02d.%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Név"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Adja meg a visszaszámlálási időt"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 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:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "ó  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "p  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "mp  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "vagy"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Futtatandó parancs"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Új figyelmeztetés hozzáadása"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Figyelmeztetés szerkesztése"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce 4 időzítő beállításai"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce 4 időzítő bővítmény"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Időzítő\n"
 "neve"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -156,46 +157,59 @@ msgstr ""
 "Visszaszámlálási idő/\n"
 "Figyelmeztetés ideje"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Figyelmeztető parancs"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "A figyelmeztető parancs ismétlése:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Figyelmeztető parancs"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "A figyelmeztető parancs ismétlése:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Ismétlések száma"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "Időköz (mp)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce 4 időzítő bővítmény"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce 4 időzítő"
diff --git a/po/id.po b/po/id.po
index 247cd12..b2cc36f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -16,27 +16,27 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dj %dm %dd tersisa"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %dd tersisa"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%dd tersisa"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -45,107 +45,108 @@ msgstr ""
 "Biiip! :) \n"
 "Waktu habis!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Mulai pengukur waktu"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Stop pengukur waktu"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Mulai pengukur waktu"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Mulai pengukur waktu"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Stop alarm"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dj %dm %dd"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %dd"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dd"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Pada %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nama"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Masukkan waktu hitung mundur"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Masukkan waktu alarm (format 24 jam)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "j  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "d  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "atau"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Perintah untuk dijalankan"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Tambah alarm baru"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Sunting alarm"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opsi Pengukur Waktu Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Opsi Pengukur Waktu Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Pengukur Waktu\n"
 "nama"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -153,46 +154,59 @@ msgstr ""
 "Waktu hitung mundur /\n"
 "Waktu alarm"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Perintah alarm"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Ulangi perintah alarm:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Perintah alarm"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Ulangi perintah alarm:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Jumlah pengulangan"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Interval waktu (det.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opsi Pengukur Waktu Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Pengukur Waktu Xfce4"
diff --git a/po/it.po b/po/it.po
index cbae061..0cea320 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2,145 +2,154 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Mancano %dore %dminuti %dsecondi"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "Mancano %dminuti %dsecondi"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "Mancano %dsecondi"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Avvia la sveglia"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Interrompi la sveglia"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Avvia la sveglia"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Avvia la sveglia"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Interrompi la sveglia"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Alle %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Inserire la durata del conto alla rovescia"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 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:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"or\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "or"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Il comando da eseguire"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Aggiungi una nuova sveglia"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Modifica sveglia"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Proprietà"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opzioni della sveglia di Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opzioni della sveglia di Xfce4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome\n"
 "sveglia"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,52 +157,71 @@ msgstr ""
 "Durata del conto alla rovescia/\n"
 "ora della sveglia."
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
 msgstr "Ripeti il comando di sveglia:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Comando di sveglia"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Ripeti il comando di sveglia:"
+
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Numero di ripetizioni"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opzioni della sveglia di Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Avvia la sveglia"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Avvia la sveglia"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "or"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Sveglia di Xfce4"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opzioni della sveglia di Xfce4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Plugin della sveglia per il pannello di Xfce"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Ripeti il comando di sveglia:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "or\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Comando di sveglia"
+#~ msgid "Properties"
+#~ msgstr "Proprietà"
diff --git a/po/ja.po b/po/ja.po
index 3b4d704..4cdced9 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +20,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "残り%d時間%d分%d秒"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "残り%d分%d秒"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "残り%d秒"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -49,112 +49,113 @@ msgstr ""
 "ビーー! :) \n"
 "時間です!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "タイマーを停止する"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "タイマーを開始する"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "タイマーを開始する"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "アラームを停止する"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d時間%d分%d秒"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d分%d秒"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d秒"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "名前"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "秒読みする時間を入力してください"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "アラームが鳴る時間を入力してください (24時間制)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "時間  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "分  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "秒  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "または\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "実行するコマンド"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "新規アラームを追加"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "アラームの編集"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 タイマーオプション"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 タイマーオプション"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "タイマー\n"
 "名"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -162,46 +163,59 @@ msgstr ""
 "秒読み時間 /\n"
 "アラーム時間"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "アラームコマンド"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "アラームコマンドが設定されている場合は\n"
 "警告ウィンドウを表示しない"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "繰り返すアラームコマンド:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "アラームコマンド"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "繰り返すアラームコマンド:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "繰り返し回数"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  時間間隔 (秒.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 タイマーオプション"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 タイマー"
diff --git a/po/ko.po b/po/ko.po
index 87737aa..5c480e4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer-plugin.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +20,27 @@ msgstr ""
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%d시 %d분 %d초 남음"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%d분 %d초 남음"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%d초 남음"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -49,112 +49,113 @@ msgstr ""
 "삑~~~! :) \n"
 "시간이 되었습니다!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "타이머 멈추기"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "타이머 시작하기"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "타이머 시작하기"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "알림 중단하기"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d시 %d분 %d초"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d분 %d초"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d초"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "이름"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "카운트다운 시간 입력"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "알림 시간 입력(24시간제 형식)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "시"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "분"
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "초"
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "또는\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "실행할 명령"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "새 알림 추가"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "알림 편집"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 타이머 옵션"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 타이머 옵션"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "타이머\n"
 "이름"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -162,46 +163,59 @@ msgstr ""
 "카운트다운 주기 /\n"
 "알림 시간"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "알림 명령"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "알림 명령을 설정했을 경우\n"
 "경고 창을 표시하지 않습니다"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "반복할 알림 명령:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "알림 명령"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "반복할 알림 명령:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "반복 횟수"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  시간 간격(초)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 타이머 옵션"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 타이머"
diff --git a/po/lv.po b/po/lv.po
index 8dbe34f..ce743f1 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +16,27 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds palicis"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds palicis"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds palicis"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -45,110 +45,111 @@ msgstr ""
 "Pīīīīp! :) \n"
 "Laiks iztecējis!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Apturēt taimeri"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Palaist taimeri"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Palaist taimeri"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Apturēt trauksmi"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Pie %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nosaukums"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Ievadiet atskaites punkta laiku"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Ievadiet trauksmes laiku (24st formāts)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "st  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "vai"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Izpildāmā komanda"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Pievienot jaunu trauksmi"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Rediģēt trauksmi"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 Taimera Uzstādījumi"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 Taimera Uzstādījumi"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Taimera\n"
 "nosaukums"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -156,46 +157,59 @@ msgstr ""
 "Atskaites periods /\n"
 "Trauksmes laiks"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Trauksmes komanda"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Atkārtotas trauksmi komanda:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Trauksmes komanda"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Atkārtotas trauksmi komanda:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Mēģinājumu skaits"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Laika intervāls (sek.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 Taimera Uzstādījumi"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 Taimeris"
diff --git a/po/nl.po b/po/nl.po
index b1ccdb3..c13cf83 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,141 +3,150 @@
 # This file is distributed under the same license as the
 # xfce4-timer-plugin package.
 # Pjotr <pjotrvertaalt at gmail.com> , 2011 - 2013.
-# 
+#
 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-05-10 12:32+0300\n"
 "PO-Revision-Date: 2011-06-15 11:34+0200\n"
 "Last-Translator: Pjotr pjotrvertaalt at gmail.com\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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%du %dm %ds over"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds over"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds over"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Hervat aftellen"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Staak tijdmeter"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Pauzeer aftellen"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Start tijdmeter"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Staak het alarm"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%du %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Om %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Naam"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Voer de afteltijd in"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Voer de alarmtijd in (24-uurs-opmaak)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "u  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"och\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "of"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "De opdracht om uit te voeren"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Voeg nieuw alarm toe"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Bewerk alarm"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opties voor Xfce4-Aftelklok"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Xfce4 Aftelklok-opties"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Aftelklok\n"
 "naam"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -145,52 +154,71 @@ msgstr ""
 "Aftelperiode /\n"
 "Alarmtijd"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, fuzzy
+msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Toon het waarschuwingsvenster niet\n"
 "indien er een alarmopdracht is ingesteld"
 
-#: ../src/xfcetimer.c:1264
-msgid "Repeat the alarm command:"
+#: ../src/xfcetimer.c:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
+msgstr "Gebruik een standaard-alarmopdracht"
+
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Standaardopdracht:"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Herhaal de alarmopdracht:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Aantal herhalingen"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Tijdinterval (sec.)"
 
-#: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Tijdmeter-invoegtoepassing voor Xfce4-werkbalk"
-
-#: ../src/xfce4-timer.desktop.in.in.h:2
-msgid "Xfce4 Timer"
-msgstr "Xfce4-Tijdmeter"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 Aftelklok-opties"
 
-#~ msgid "Resume timer"
-#~ msgstr "Hervat aftellen"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Pauzeer aftellen"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "of"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Xfce4-Tijdmeter"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Xfce4 Aftelklok-opties"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Tijdmeter-invoegtoepassing voor Xfce4-werkbalk"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Gebruik een standaard-alarmopdracht"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "och\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Standaardopdracht:"
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
diff --git a/po/pl.po b/po/pl.po
index d97edca..c83e69f 100644
--- a/po/pl.po
+++ b/po/pl.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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -19,180 +19,194 @@ msgstr ""
 "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:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Pozostało %d godz %d min %d s"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "Pozostało %d min %d s"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "Pozostało %d s"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
 "Time is up for the alarm %s."
 msgstr "Czas upłynął!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Uruchom stoper"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Zatrzymaj stoper"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Uruchom stoper"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Uruchom stoper"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Zatrzymaj alarm"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d godz %d min %d s"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d min %d s"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d s"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Nazwa"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Czas odliczania"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Godzina alarmu (format 24-godzinny)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "godz. "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "min "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "lub"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Polecenie:"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Dodawanie alarmu"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Edycja alarmu"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Stoper"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Stoper"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Nazwa\n"
 "alarmu"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
 msgstr "Czas odliczania / godzina alarmu"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Polecenie"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Powtarzanie polecenia alarmu"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Polecenie"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Powtarzanie polecenia alarmu"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Ilość powtórzeń: "
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Interwał (s): "
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Stoper"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Stoper"
diff --git a/po/pt.po b/po/pt.po
index 7cd2894..974e6e2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,145 +2,154 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Restam %dh %dm %ds"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "Restam %dm %ds"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "Restam %ds"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Parar temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Iniciar temporizador"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Iniciar temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Parar o alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Em %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Coloque o tempo de contagem"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Coloque a hora do alarme (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h"
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m"
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s"
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "ou"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "O comando a executar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Adicionar novo alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Editar alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opções do temporizador Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opções do temporizador Xfce4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome\n"
 "do temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,52 +157,71 @@ msgstr ""
 "Período de contagem /\n"
 "Hora do alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
+msgstr "Repetir o comando de alarme:"
+
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Comando do alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Repetir comando do alarme:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Número de repetições"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opções do temporizador Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar temporizador"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "ou"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Temporizador Xfce4"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opções do temporizador Xfce4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "\"Plug-in\" para painel Xfce"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Repetir o comando de alarme:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Comando do alarme"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3a1132f..e2962e6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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-05-10 12:32+0300\n"
 "PO-Revision-Date: 2013-04-25 20:39-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1 at gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -19,128 +19,137 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: ../src/xfcetimer.c:100
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "Restando %dh %dmin %ds"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "Restando %dmin %ds"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "Restando %ds"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Iniciar o temporizador"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Parar o temporizador"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Iniciar o temporizador"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Iniciar o temporizador"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Parar o alarme"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dmin %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dmin %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "às %02dh%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Nome"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Insira o tempo de contagem regressiva"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Insira a hora do alarme (formato 24h)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "min  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"ou\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "ou"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "O comando para executar"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Adicionar novo alarme"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Editar alarme"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Propriedades"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Opções do temporizador do Xfce 4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Opções do temporizador do Xfce 4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Nome do\n"
 "temporizador"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -148,54 +157,73 @@ msgstr ""
 "Período de contagem regressiva /\n"
 "Hora do alarme"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+#, fuzzy
+msgid "Use a default alarm command"
 msgstr "Repetir o comando de alarme:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1592
+#, fuzzy
+msgid "Default command: "
+msgstr "Comando de alarme"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Repetir o comando de alarme:"
+
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Número de repetições "
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Opções do temporizador do Xfce 4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Iniciar o temporizador"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Iniciar o temporizador"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "ou"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Temporizador do Xfce4"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Opções do temporizador do Xfce 4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Plugin temporizador para o painel do Xfce"
 
-#, fuzzy
-#~ msgid "Use a default alarm command"
-#~ msgstr "Repetir o comando de alarme:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ou\n"
 
-#, fuzzy
-#~ msgid "Default command: "
-#~ msgstr "Comando de alarme"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
diff --git a/po/ru.po b/po/ru.po
index 819aaeb..993f4ac 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -17,179 +17,193 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "осталось %dч %dм %dс "
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "осталось %dм %dс"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "осталось %dс"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
 "Time is up for the alarm %s."
 msgstr "Время вышло"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Запустить таймер"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Остановить таймер"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "Запустить таймер"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Запустить таймер"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Остановить таймер"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dч %dм %dс"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dм %dс"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dс"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "В %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Название"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Обратный отсчет"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Время срабатывания сигнала"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "ч  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "м  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "с  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "или"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Выполнить команду"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Добавить новый сигнал"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Редактировать сигнал"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Настройки таймера Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Настройки таймера Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Таймер\n"
 "Название"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
 msgstr "Период срабатывания"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Команда"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "Не показывать уведомление\n"
 "если задана команда"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Команда повторения таймера:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Команда"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Команда повторения таймера:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Количество повторов"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "Интервал (сек.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Настройки таймера Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Таймер Xfce4"
diff --git a/po/sk.po b/po/sk.po
index 7770772..48692dd 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +18,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds zostáva"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds zostáva"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds zostáva"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -47,113 +47,114 @@ msgstr ""
 "Pííííp! :) \n"
 "Čas vypršal!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Zastaviť časovač"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Spustiť časovač"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Zastaviť alarm"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Od %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Názov"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Zadajte čas pre odpočítavanie"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Zadajte čas alarmu (v 24 hodinovej forme)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "alebo\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Príkaz na spustenie"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Pridať nový časovač"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Upraviť časovač"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Voľby Časovača Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Voľby Časovača Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Názov\n"
 "časovača"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -161,46 +162,59 @@ msgstr ""
 "Interval odpočtu /\n"
 "Čas alarmu"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Príkaz alarmu"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Opakovať príkaz alarmu:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Príkaz alarmu"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Opakovať príkaz alarmu:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Počet opakovaní"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Časový interval (s)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Voľby Časovača Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Časovač Xfce4"
diff --git a/po/sq.po b/po/sq.po
index c412882..a7fa5f5 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +15,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%do %dm %ds të mbetura"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds të mbetura"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds të mbetura"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -44,110 +44,111 @@ msgstr ""
 "Xërrrrrrrr! :) \n"
 "Erdhi koha!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Ndal Kohësin"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Nis kohësin"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Nis kohësin"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Ndal alarmin"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%do %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Më %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Emër"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Jepni kohë skadimi"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Jepni kohën e alarmit (në format 24orësh)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "o "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "ose"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Urdhri për xhirim"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Shto alarm të ri"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Përpunoni Alarm"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Mundësi Kohësi Xfce4"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Mundësi Kohësi Xfce4"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Kohës\n"
 "emër"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -155,46 +156,59 @@ msgstr ""
 "Periudhë skadimi/\n"
 "Kohë alarmi"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Urdhër alarmi"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Përsërit urdhrin e alarmit:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Urdhër alarmi"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Përsërit urdhrin e alarmit:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Numër përsëritjesh"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Interval kohe (sec.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Mundësi Kohësi Xfce4"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Kohës Xfce4"
diff --git a/po/sr.po b/po/sr.po
index edad326..5e87b4a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,143 +3,154 @@
 # 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-05-10 12:32+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"
-"Language: \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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds преостаје"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds преостаје"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds преостаје"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+#, fuzzy
+msgid "Resume timer"
+msgstr "Покрени бројач времена"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Заустави бројач времена"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Покрени бројач времена"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Покрени бројач времена"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Заустави узбуну"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "У %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Назив"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Унесите време одбројавања"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Унесите време узбуне (у облику 24 часа)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"или\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "или"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Наредба за извршавање"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Додај нову узбуну"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Уредите узбуну"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Особине"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Могућности ИксФЦЕ бројача"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Могућности ИксФЦЕ бројача"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Бројач\n"
 "назив"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -147,49 +158,71 @@ msgstr ""
 "Раздобље одбројавања /\n"
 "Време узбуне"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
+msgstr "Поновите наредбу за узбуну:"
+
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Наредба узбуне"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
 msgstr "Поновите наредбу за узбуну:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Број понављања"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Временско раздобље (сек.)"
 
-#: ../src/xfce4-timer.desktop.in.in.h:1
-msgid "Timer plugin for Xfce panel"
-msgstr "Прикључак бројача на ИксФЦЕ полици"
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Могућности ИксФЦЕ бројача"
 
-#: ../src/xfce4-timer.desktop.in.in.h:2
-msgid "Xfce4 Timer"
-msgstr "ИксФЦЕ бројач времена"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Покрени бројач времена"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "или"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "ИксФЦЕ бројач времена"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Могућности ИксФЦЕ бројача"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Прикључак бројача на ИксФЦЕ полици"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Поновите наредбу за узбуну:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "или\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Наредба узбуне"
+#~ msgid "Properties"
+#~ msgstr "Особине"
diff --git a/po/sv.po b/po/sv.po
index 9ae1a61..111b659 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +16,27 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds kvar"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds kvar"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds kvar"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -45,109 +45,110 @@ msgstr ""
 "Piiiiip! :) \n"
 "Det är dags nu!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Stoppa tidtagare"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Starta tidtagare"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Starta tidtagare"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Stoppa alarmet"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Klockan %02d.%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "Namn"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Ange nedräkningstiden"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Ange tid för alarmet (24-timmarsformat)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "eller"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Kommandot att köra"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Lägg till nytt alarm"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Redigera alarm"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Alternativ för Xfce4-tidtagare"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce 4-tidtagare"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Tidtagar-\n"
 "namn"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -155,46 +156,59 @@ msgstr ""
 "Nedräkningsperiod /\n"
 "Alarmtid"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Alarmkommando"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Upprepa alarmkommandot:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Alarmkommando"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Upprepa alarmkommandot:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Antal upprepningar"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Tidsintervall (s)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce 4-tidtagare"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4-tidtagare"
diff --git a/po/tr.po b/po/tr.po
index 0b2e155..8440192 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +18,27 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dsa %ddk %dsn kaldı"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%ddk %dsn kaldı"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%dsn kaldı"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr " (Dondurulmuş)"
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -47,112 +47,113 @@ msgstr ""
 "Biiiiip ! :)\n"
 "\"%s\" alarmı için süre doldu!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "Saati devam ettir"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Saati durdur"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "Saati dondur"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Saati başlat"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Uyarıyı durdur"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dsa %ddk %dsn"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%ddk %dsn"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dsn"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "Alarm saati: %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "İsim"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Gerisayım süresini giriniz"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Alarm satini giriniz (24 saat formatında)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "sa  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "dk  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "sn  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "ya da\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "Çalıştırılacak komut"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Yeni alarm ekle"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Alarmı düzenle"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "XFCE4 Timer Özellikleri"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "XFCE4 Timer Özellikleri"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "Alarmın\n"
 "adı"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -160,46 +161,59 @@ msgstr ""
 "Gerisayım süresi /\n"
 "Alarm saati"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "Alarm komutu"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, 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:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr "Seçilen alarm başlasın"
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "Uyarı komutunu yinele:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "Alarm komutu"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "Uyarı komutunu yinele:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Yinelemelerin sayısı"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  Zaman aralığı (saniye)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "XFCE4 Timer Hakkında"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr "Geri sayım ya da saat alarmı tanımlamak için bir eklenti."
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr "Telif hakkı (c) 2005-2013\n"
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "XFCE4 Alarm Eklentisi -- XFCE4 Timer"
diff --git a/po/ug.po b/po/ug.po
index 5462d37..7ddadf1 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-timer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%d سائەت %d مىنۇت %d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%d مىنۇت %d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%d سېكۇنت قالدى"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr " (ۋاقىتلىق توختىدى)"
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -46,107 +46,108 @@ msgstr ""
 "تىرىڭ :) \n"
 "ۋاقىت توشتى"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى قايتا باشلا"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى توختات"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 msgid "Pause timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى ۋاقىتلىق توختات"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "ۋاقىت ئۆلچىگۈچنى باشلا"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "قوڭغۇراقنى توختات"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d سائەت %d مىنۇت %d سېكۇنت"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d مىنۇت %d سېكۇنت"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d سېكۇنت"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "%02d:%02d دە"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "ئاتى"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "تەتۈر ساناش ۋاقتىنى كىرگۈزۈڭ"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "قوڭغۇراق چېلىش ۋاقتىنى كىرگۈزۈڭ (24 پىچىمىدا)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "h  "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "m  "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "s  "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 msgid "or"
 msgstr "or"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "ئىجرا قىلىدىغان بۇيرۇق:"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "يېڭى قوڭغۇراق قوش"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "قوڭغۇراق تەھرىرلە"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4  ۋاقىت ئۆلچىگۈچ تاللانمىسى"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce 4 ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "ۋاقىت ئۆلچىگۈچ\n"
 "ئاتى"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -154,46 +155,59 @@ msgstr ""
 "تەتۈر ساناش ۋاقتى/\n"
 "قوڭغۇراق ۋاقتى"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "قوڭغۇراق بۇيرۇقى"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "قوڭغۇراق بۇيرۇقى بەلگىلەن بولسا\n"
 "ئاگاھلاندۇرۇشنى كۆرسەتمىسۇن"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "قوڭغۇراق بۇيرۇقى تەكرارلانسۇن:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "قوڭغۇراق بۇيرۇقى"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "قوڭغۇراق بۇيرۇقى تەكرارلانسۇن:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "تەكرارلىنىش ۋاقتى"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  ۋاقىت ئىنتېرۋالى(سېكۇنت.)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce 4 ۋاقىت ئۆلچىگۈچ قىستۇرمىسى"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 ۋاقىت ئۆلچىگۈچى"
diff --git a/po/uk.po b/po/uk.po
index 34353eb..3ec6544 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,144 +1,153 @@
 # 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-05-10 12:32+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:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "залишилось %dг %dх %dс"
 
-#: ../src/xfcetimer.c:103
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "залишилось %dх %dс"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "залишилось %dс"
 
-#: ../src/xfcetimer.c:126
+#: ../src/xfcetimer.c:149
+msgid " (Paused)"
+msgstr ""
+
+#. Display the name of the alarm when the countdown ends
+#: ../src/xfcetimer.c:170
+#, 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:462
+msgid "Resume timer"
+msgstr "Запустити таймер"
+
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "Зупинити таймер"
 
-#: ../src/xfcetimer.c:426
+#: ../src/xfcetimer.c:513
+msgid "Pause timer"
+msgstr "Запустити таймер"
+
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "Запустити таймер"
 
-#: ../src/xfcetimer.c:436
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "Зупинити сигнал"
 
-#: ../src/xfcetimer.c:482 ../src/xfcetimer.c:556
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dг %dх %dс"
 
-#: ../src/xfcetimer.c:484 ../src/xfcetimer.c:558
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dх %dс"
 
-#: ../src/xfcetimer.c:486 ../src/xfcetimer.c:560
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%dс"
 
-#: ../src/xfcetimer.c:496 ../src/xfcetimer.c:570
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "В %02d:%02d"
 
-#: ../src/xfcetimer.c:619
-msgid "Name"
+#: ../src/xfcetimer.c:774
+#, fuzzy
+msgid "Name:"
 msgstr "Назва"
 
 #. ********
-#: ../src/xfcetimer.c:627
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "Введіть час зворотного відліку"
 
-#: ../src/xfcetimer.c:629
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "Введіть час спрацьовування сигналу (в форматі 24 годин)"
 
-#: ../src/xfcetimer.c:640
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "г  "
 
-#: ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "х  "
 
-#: ../src/xfcetimer.c:650
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "с  "
 
-#: ../src/xfcetimer.c:653
-msgid ""
-"\n"
-"or\n"
-msgstr ""
-"\n"
-"або\n"
+#: ../src/xfcetimer.c:810
+msgid "or"
+msgstr "або"
 
 #. **************
-#: ../src/xfcetimer.c:673
-msgid ""
-"\n"
-"The command to run"
+#: ../src/xfcetimer.c:830
+#, fuzzy
+msgid "Command to run:"
 msgstr ""
 "\n"
 "Команда для запуску"
 
-#: ../src/xfcetimer.c:699
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "Додати новий сигнал"
 
-#: ../src/xfcetimer.c:737
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "Редагувати сигнал"
 
-#: ../src/xfcetimer.c:1162
-msgid "Properties"
-msgstr "Властивості"
-
-#: ../src/xfcetimer.c:1174
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Опції таймеру Xfce4"
 
-#: ../src/xfcetimer.c:1205
-msgid ""
-"Timer\n"
-"name"
+#: ../src/xfcetimer.c:1461
+msgid "Xfce 4 Timer Plugin"
+msgstr "Опції таймеру Xfce4"
+
+#: ../src/xfcetimer.c:1507
+#, fuzzy
+msgid "Timer name"
 msgstr ""
 "Таймер\n"
 "назва"
 
-#: ../src/xfcetimer.c:1210
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -146,52 +155,71 @@ msgstr ""
 "Період зворотного відліку /\n"
 "Час сигналу"
 
-#: ../src/xfcetimer.c:1214
+#: ../src/xfcetimer.c:1516
 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:1572
+#, 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:1577
+msgid "Selecting a timer starts it"
+msgstr ""
+
+#. Default alarm command config
+#: ../src/xfcetimer.c:1585
+msgid "Use a default alarm command"
 msgstr "Повторити команду сигналу:"
 
-#: ../src/xfcetimer.c:1271
+#: ../src/xfcetimer.c:1592
+msgid "Default command: "
+msgstr "Команда сигналу"
+
+#. Alarm repetitions config
+#: ../src/xfcetimer.c:1604
+#, fuzzy
+msgid "Repeat the alarm command"
+msgstr "Повторити команду сигналу:"
+
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "Кількість повторів"
 
-#: ../src/xfcetimer.c:1277
+#: ../src/xfcetimer.c:1617
 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/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Опції таймеру Xfce4"
 
-#~ msgid "Resume timer"
-#~ msgstr "Запустити таймер"
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
 
-#~ msgid "Pause timer"
-#~ msgstr "Запустити таймер"
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
 
-#~ msgid "or"
-#~ msgstr "або"
+#: ../src/xfce4-timer.desktop.in.in.h:1
+msgid "Xfce4 Timer"
+msgstr "Таймер Xfce4"
 
-#~ msgid "Xfce 4 Timer Plugin"
-#~ msgstr "Опції таймеру Xfce4"
+#: ../src/xfce4-timer.desktop.in.in.h:2
+msgid "Timer plugin for Xfce panel"
+msgstr "Плагін Таймер для панелі Xfce"
 
-#~ msgid "Use a default alarm command"
-#~ msgstr "Повторити команду сигналу:"
+#~ msgid ""
+#~ "\n"
+#~ "or\n"
+#~ msgstr ""
+#~ "\n"
+#~ "або\n"
 
-#~ msgid "Default command: "
-#~ msgstr "Команда сигналу"
+#~ msgid "Properties"
+#~ msgstr "Властивості"
diff --git a/po/ur.po b/po/ur.po
index e6edf40..9448fc2 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +20,27 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds باقی ہے"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -49,112 +49,113 @@ msgstr ""
 "بیپ! :) \n"
 "وقت پورا ہوگیا!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "ٹائمر روکیں"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "الارم بند کریں"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "پر %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "نام"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "تنزلی وقت لکھیں"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "الارم کا وقت لکھیں (24گ فارمیٹ)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "گ"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "م"
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "س"
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "or\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "چلانے کے لیے کمانڈ"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "نیا الارم شامل کریں"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "الارم مدون کریں"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "ٹائمر\n"
 "نام"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -162,46 +163,59 @@ msgstr ""
 "تنزلی مدت /\n"
 "الارم وقت"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "الارم کمانڈ"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "اگر الارم کمانڈ مرتب ہو یہ\n"
 "انتباہی ونڈو ظاہر مت کریں"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "الارم کمانڈ"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "تکرار کی تعداد"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  وقت وقفہ (سیکنڈ)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "ایکسفس4 الارم اختیارات"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "ایکسفس4 ٹائمر"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index e6edf40..9448fc2 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +20,27 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "%dh %dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "%dm %ds باقی ہے"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "%ds باقی ہے"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -49,112 +49,113 @@ msgstr ""
 "بیپ! :) \n"
 "وقت پورا ہوگیا!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 msgid "Resume timer"
 msgstr ""
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "ٹائمر روکیں"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "ٹائمر شروع کریں"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "الارم بند کریں"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%dh %dm %ds"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%dm %ds"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%ds"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "پر %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "نام"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "تنزلی وقت لکھیں"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "الارم کا وقت لکھیں (24گ فارمیٹ)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "گ"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "م"
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "س"
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "or\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "چلانے کے لیے کمانڈ"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "نیا الارم شامل کریں"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "الارم مدون کریں"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "ایکسفس4 الارم اختیارات"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "ٹائمر\n"
 "نام"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -162,46 +163,59 @@ msgstr ""
 "تنزلی مدت /\n"
 "الارم وقت"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "الارم کمانڈ"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "اگر الارم کمانڈ مرتب ہو یہ\n"
 "انتباہی ونڈو ظاہر مت کریں"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "الارم کمانڈ"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "الارم کمانڈ دہرائیں:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "تکرار کی تعداد"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  وقت وقفہ (سیکنڈ)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "ایکسفس4 الارم اختیارات"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "ایکسفس4 ٹائمر"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 16f893a..c716140 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +19,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "剩余 %d 小时 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "剩余 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "剩余 %d 秒"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -48,113 +48,114 @@ msgstr ""
 "嘟嘟嘟!:)\n"
 "时间到!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "启动定时器"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "停止定时器"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "启动定时器"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "启动定时器"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "停止闹钟"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d 时 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d 分 %d 秒"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d 秒"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "在 %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "名称"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "输入倒计时时间"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "输入提示时间(24小时制)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "时 "
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "分 "
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "秒 "
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr ""
 "\n"
 "或\n"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "要运行的命令"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "添加新闹钟"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "编辑闹钟"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce 定时器选项"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce 定时器选项"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "定时器\n"
 "名称"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -162,46 +163,59 @@ msgstr ""
 "倒计时周期/\n"
 "闹钟时间"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "闹钟命令"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "如果已设置闹钟命令\n"
 "则不显示警告窗口"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "重复闹钟命令:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "闹钟命令"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "重复闹钟命令:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "重复次数"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  时间间隔(秒。)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce 定时器选项"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce 定时器"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8ec8090..db749fd 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: 2013-04-22 19:23+0300\n"
+"POT-Creation-Date: 2013-05-10 12:32+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,27 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/xfcetimer.c:105
+#: ../src/xfcetimer.c:141
 #, c-format
 msgid "%dh %dm %ds left"
 msgstr "剩下 %d 小時 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:108
+#: ../src/xfcetimer.c:144
 #, c-format
 msgid "%dm %ds left"
 msgstr "剩下 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:110
+#: ../src/xfcetimer.c:146
 #, c-format
 msgid "%ds left"
 msgstr "剩下 %d 秒"
 
-#: ../src/xfcetimer.c:113
+#: ../src/xfcetimer.c:149
 msgid " (Paused)"
 msgstr ""
 
 #. Display the name of the alarm when the countdown ends
-#: ../src/xfcetimer.c:134
+#: ../src/xfcetimer.c:170
 #, fuzzy, c-format
 msgid ""
 "Beeep! :) \n"
@@ -46,111 +46,112 @@ msgstr ""
 "嗶!:) \n"
 "時間到!"
 
-#: ../src/xfcetimer.c:439
+#: ../src/xfcetimer.c:462
 #, fuzzy
 msgid "Resume timer"
 msgstr "啟動定時器"
 
-#: ../src/xfcetimer.c:445 ../src/xfcetimer.c:510
+#: ../src/xfcetimer.c:469 ../src/xfcetimer.c:525
 msgid "Stop timer"
 msgstr "停止定時器"
 
-#: ../src/xfcetimer.c:496
+#: ../src/xfcetimer.c:513
 #, fuzzy
 msgid "Pause timer"
 msgstr "啟動定時器"
 
-#: ../src/xfcetimer.c:512
+#: ../src/xfcetimer.c:527
 msgid "Start timer"
 msgstr "啟動定時器"
 
-#: ../src/xfcetimer.c:522
+#: ../src/xfcetimer.c:536
 msgid "Stop the alarm"
 msgstr "停止鬧鈴"
 
-#: ../src/xfcetimer.c:568 ../src/xfcetimer.c:643
+#: ../src/xfcetimer.c:591 ../src/xfcetimer.c:662
 #, c-format
 msgid "%dh %dm %ds"
 msgstr "%d 小時 %d 分 %d 秒"
 
-#: ../src/xfcetimer.c:570 ../src/xfcetimer.c:645
+#: ../src/xfcetimer.c:593 ../src/xfcetimer.c:664
 #, c-format
 msgid "%dm %ds"
 msgstr "%d 分 %d 秒"
 
-#: ../src/xfcetimer.c:572 ../src/xfcetimer.c:647
+#: ../src/xfcetimer.c:595 ../src/xfcetimer.c:666
 #, c-format
 msgid "%ds"
 msgstr "%d 秒"
 
-#: ../src/xfcetimer.c:582 ../src/xfcetimer.c:657
+#: ../src/xfcetimer.c:604 ../src/xfcetimer.c:675
 #, c-format
 msgid "At %02d:%02d"
 msgstr "於 %02d:%02d"
 
-#: ../src/xfcetimer.c:738
+#: ../src/xfcetimer.c:774
 #, fuzzy
 msgid "Name:"
 msgstr "名稱"
 
 #. ********
-#: ../src/xfcetimer.c:746
+#: ../src/xfcetimer.c:782
 msgid "Enter the countdown time"
 msgstr "請輸入倒數時間"
 
-#: ../src/xfcetimer.c:749
+#: ../src/xfcetimer.c:785
 msgid "Enter the time of alarm (24h format)"
 msgstr "請輸入鬧鈴時間 (24 小時制)"
 
-#: ../src/xfcetimer.c:761
+#: ../src/xfcetimer.c:797
 msgid "h  "
 msgstr "點"
 
-#: ../src/xfcetimer.c:766
+#: ../src/xfcetimer.c:802
 msgid "m  "
 msgstr "分"
 
-#: ../src/xfcetimer.c:771
+#: ../src/xfcetimer.c:807
 msgid "s  "
 msgstr "秒"
 
-#: ../src/xfcetimer.c:774
+#: ../src/xfcetimer.c:810
 #, fuzzy
 msgid "or"
 msgstr "或"
 
-#: ../src/xfcetimer.c:797
+#. **************
+#: ../src/xfcetimer.c:830
 #, fuzzy
 msgid "Command to run:"
 msgstr ""
 "\n"
 "要執行的指令"
 
-#: ../src/xfcetimer.c:827
+#: ../src/xfcetimer.c:860
 msgid "Add new alarm"
 msgstr "加入新鬧鈴"
 
-#: ../src/xfcetimer.c:866
+#: ../src/xfcetimer.c:897
 msgid "Edit alarm"
 msgstr "編輯鬧鈴"
 
-#: ../src/xfcetimer.c:1460 ../src/xfcetimer.c:1469
+#: ../src/xfcetimer.c:1450 ../src/xfcetimer.c:1459
 msgid "Xfce4 Timer Options"
 msgstr "Xfce4 定時器選項"
 
-#: ../src/xfcetimer.c:1471
+#: ../src/xfcetimer.c:1461
 #, fuzzy
 msgid "Xfce 4 Timer Plugin"
 msgstr "Xfce4 定時器選項"
 
-#: ../src/xfcetimer.c:1516
+#: ../src/xfcetimer.c:1507
 #, fuzzy
 msgid "Timer name"
 msgstr ""
 "定時器\n"
 "名稱"
 
-#: ../src/xfcetimer.c:1521
+#: ../src/xfcetimer.c:1512
 msgid ""
 "Countdown period /\n"
 "Alarm time"
@@ -158,46 +159,59 @@ msgstr ""
 "倒數期 /\n"
 "鬧鈴時間"
 
-#: ../src/xfcetimer.c:1525
+#: ../src/xfcetimer.c:1516
 msgid "Alarm command"
 msgstr "鬧鈴指令"
 
-#: ../src/xfcetimer.c:1583
+#: ../src/xfcetimer.c:1572
 #, fuzzy
 msgid "Don't display a warning  if an alarm command is set"
 msgstr ""
 "如果有設定鬧鈴指令的話\n"
 "請不要顯示警告視窗"
 
-#: ../src/xfcetimer.c:1588
+#: ../src/xfcetimer.c:1577
 msgid "Selecting a timer starts it"
 msgstr ""
 
 #. Default alarm command config
-#: ../src/xfcetimer.c:1596
+#: ../src/xfcetimer.c:1585
 #, fuzzy
 msgid "Use a default alarm command"
 msgstr "重複鬧鈴指令:"
 
-#: ../src/xfcetimer.c:1603
+#: ../src/xfcetimer.c:1592
 #, fuzzy
 msgid "Default command: "
 msgstr "鬧鈴指令"
 
 #. Alarm repetitions config
-#: ../src/xfcetimer.c:1615
+#: ../src/xfcetimer.c:1604
 #, fuzzy
 msgid "Repeat the alarm command"
 msgstr "重複鬧鈴指令:"
 
-#: ../src/xfcetimer.c:1622
+#: ../src/xfcetimer.c:1611
 msgid "Number of repetitions"
 msgstr "重複次數"
 
-#: ../src/xfcetimer.c:1628
+#: ../src/xfcetimer.c:1617
 msgid "  Time interval (sec.)"
 msgstr "  時間間隔 (秒)"
 
+#: ../src/xfcetimer.c:1678
+#, fuzzy
+msgid "About xfce4-timer-plugin"
+msgstr "Xfce4 定時器選項"
+
+#: ../src/xfcetimer.c:1683
+msgid "A plugin to define countdown timers or alarms at given times."
+msgstr ""
+
+#: ../src/xfcetimer.c:1685
+msgid "Copyright (c) 2005-2013\n"
+msgstr ""
+
 #: ../src/xfce4-timer.desktop.in.in.h:1
 msgid "Xfce4 Timer"
 msgstr "Xfce4 定時器"
diff --git a/src/xfcetimer.c b/src/xfcetimer.c
index 34b4a1c..f1fc14c 100644
--- a/src/xfcetimer.c
+++ b/src/xfcetimer.c
@@ -49,7 +49,8 @@
 #include "xfcetimer.h"
 
 static void create_plugin_control (XfcePanelPlugin *plugin);
-static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer
+
+static void start_stop_selected (GtkWidget* menuitem, gpointer
                                         data);
 XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
 
@@ -70,7 +71,7 @@ static gboolean repeat_alarm (gpointer data){
         g_free(pd->timeout_command);
     pd->timeout_command=NULL;
     pd->alarm_repeating=FALSE;
-    make_menu(pd);
+    //make_menu(pd);
 
     return FALSE;
 
@@ -82,6 +83,41 @@ static gboolean repeat_alarm (gpointer data){
   return TRUE;
 }
 
+/**
+ * Fills in the pd->liststore to create the treeview
+ * in the options window. The second arguments indicates
+ * the alarm whose row will be highlighted in the
+ * treeview. If it is NULL, no action is taken.
+**/
+
+static void fill_liststore (plugin_data *pd, GList *selected) {
+	
+  GtkTreeIter iter;
+  GList *list;
+  alarm_t *alrm;
+	
+  if(pd->liststore)
+  	gtk_list_store_clear (pd->liststore);
+  	
+  list = pd->alarm_list;
+  
+  
+  while (list) {
+	
+	alrm = (alarm_t *) list->data;
+	
+	gtk_list_store_append (pd->liststore, &iter);
+	
+	gtk_list_store_set (pd->liststore, &iter, 0, list, 1, alrm->name, 2, alrm->info, 3, alrm->command,-1);
+	
+	/* We select the given row */
+	if (selected && list == selected)
+		gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree)),&iter);
+	
+	list = g_list_next (list);  
+	  
+  }
+}
 
 /**
  * This is the update function that updates the
@@ -184,7 +220,7 @@ static gboolean update_function (gpointer data){
 
   pd->timer_on=FALSE;
 
-  make_menu(pd);
+  //make_menu(pd);
 
   /* This function won't be called again */
   return FALSE;
@@ -196,23 +232,32 @@ static gboolean update_function (gpointer data){
  * is selected in the popup menu
 **/
 
-static void timer_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer data){
-
-  plugin_data *pd=(plugin_data *)data;
-  gint row_count;
-
-  row_count=0;
-
-  /* Find the index of the menuitem selected, save it in pd->selected. Not very
-     elegant, though */
-  while (GTK_MENU_ITEM(menuitem)!=g_array_index(pd->menuarray,GtkMenuItem*,row_count) )
-     row_count++;
+//static void timer_selected (GtkWidget* menuitem, GdkEventButton *event, gpointer data){
+static void timer_selected (GtkWidget* menuitem, gpointer data){
+  GList *list = (GList *) data;
+  alarm_t *alrm;
+  plugin_data *pd;
+  GtkRadioMenuItem *rmi;
+
+  rmi = (GtkRadioMenuItem *) menuitem;
+
+  // We do this to get rid of the (irrelevant) "activate" signals
+  // emitted by the first radio check button in the pop-up
+  // menu when the menu is created and also by the (deactivated)
+  // previous selection when a new selection is made. Another workaround
+  // is to listen to the button_press_event but it does not capture
+  // the Enter key press on the menuitem.  
+  if(!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(rmi)))
+  	return;
+  
+  alrm = (alarm_t *) list->data;
+  pd = (plugin_data *) alrm->pd;
 
-  pd->selected=row_count;
+  pd->selected = list;
 
   /* 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);  
+    start_stop_selected(menuitem,pd);  
 
 }
 
@@ -221,20 +266,18 @@ static void timer_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer
  * start/stop item is selected in the popup menu
 **/
 
-static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer
+static void start_stop_selected (GtkWidget* menuitem, gpointer
                                         data){
 
   plugin_data *pd=(plugin_data *)data;
-  GtkTreeIter iter;
-  gboolean valid;
   GSList *group=NULL;
-  gchar *timerinfo,*tout_command,*timername;
   gchar temp[8];
   gint row_count,cur_h,cur_m,cur_s,time;
   gint timeout_period;
   gboolean is_cd;
   GTimeVal timeval;
   struct tm *current;
+  alarm_t *alrm;
 
   /* If counting down, we stop the timer and free the resources */
   if(pd->timer_on){
@@ -245,74 +288,65 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
        g_source_remove(pd->timeout);
     if(pd->timeout_command)
        g_free(pd->timeout_command);
+    if(pd->active_timer_name)
+       g_free(pd->active_timer_name);
 
-    pd->timer=NULL;
-    pd->timeout_command=NULL;
-    pd->timeout=0;
-    pd->timer_on=FALSE;
-    pd->is_paused=FALSE;
+    pd->timer = NULL;
+    pd->timeout_command = NULL;
+    pd->active_timer_name = NULL;
+    pd->timeout = 0;
+    pd->timer_on = FALSE;
+    pd->is_paused = FALSE;
 
     /* Disable tooltips, reset pbar */
     gtk_tooltips_set_tip(pd->tip,GTK_WIDGET(pd->base),"",NULL);
     gtk_tooltips_disable(pd->tip);
     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
 
-    /* update menu*/
-    make_menu(pd);
-
     return;
 
   }
 
   /* If we're here then the timer is off, so we start it */
 
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
-  row_count=0;
-
   /* Empty timer list-> Nothing to do. pd->selected=0, though. */
-  if(!valid)
+  if(pd->selected == NULL)
     return;
 
-  /* Search the list item with the  right index */
-  while (valid && row_count!=pd->selected){
-      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);
-      row_count++;
-  }
-
-  gtk_tree_model_get    (GTK_TREE_MODEL(pd->list), &iter, 1, &timername, 2, &timerinfo, 3,
-            &tout_command, 4, &is_cd ,5, &time, -1);
-
+  alrm = (alarm_t *) pd->selected->data;
+  
   /* 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 */
-
+	
+  pd->active_timer_name = g_strdup(alrm->name); /* It's freed next time 
+  															or at exit */ 
+  if(pd->timeout_command)
+    g_free(pd->timeout_command);
+    
   /* 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) {
-
+  if (strlen(alrm->command)>0)
+	pd->timeout_command = g_strdup(alrm->command); /* It's freed next 
+															time or at exit */
+  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
+  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) {
+  if(!alrm->iscountdown) {
 
      g_get_current_time(&timeval);
      current = localtime((time_t *)&timeval.tv_sec);
      strftime(temp,7,"%H",current);
-     cur_h=atoi(temp);
+     cur_h = atoi(temp);
      strftime(temp,7,"%M",current);
-     cur_m=atoi(temp);
+     cur_m = atoi(temp);
      strftime(temp,7,"%S",current);
-     cur_s=atoi(temp);
+     cur_s = atoi(temp);
 
-     timeout_period=time*60 - ((60*cur_h + cur_m)*60 + cur_s);
+     timeout_period = (alrm->time)*60 - ((60*cur_h + cur_m)*60 + cur_s);
 
      if(timeout_period <0)
         timeout_period+= 24*60*60;
@@ -320,11 +354,11 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
      pd->is_countdown = FALSE;
 
   }
-  /* Else 'time' already gives the countdown period in seconds */
+  /* Else 'pd->selected->time' already gives the countdown period in seconds */
   else {
   
 	  pd->is_countdown = TRUE;
-      timeout_period=time;
+      timeout_period = alrm->time;
 
   }
   pd->timeout_period_in_sec=timeout_period;
@@ -333,20 +367,15 @@ static void start_stop_selected (GtkWidget* menuitem, GdkEventButton* event, gpo
   pd->timer=g_timer_new();
   pd->timer_on=TRUE;
 
-  /* update stuff */
-  make_menu(pd);
-
-  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(pd->base), timerinfo, NULL);
+  gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(pd->base), alrm->info, NULL);
   gtk_tooltips_enable(pd->tip);
-  g_free(timerinfo);
 
   g_timer_start(pd->timer);
   pd->timeout = g_timeout_add(UPDATE_INTERVAL, update_function,pd);
 
-
 }
 
-static void pause_resume_selected (GtkWidget* menuitem, GdkEventButton* event, gpointer
+static void pause_resume_selected (GtkWidget* menuitem, gpointer
                                         data){
 
   plugin_data *pd=(plugin_data *)data;
@@ -366,7 +395,7 @@ static void pause_resume_selected (GtkWidget* menuitem, GdkEventButton* event, g
   
   }
   
-  make_menu(pd);
+  //make_menu(pd);
 
 }
 
@@ -374,7 +403,7 @@ static void pause_resume_selected (GtkWidget* menuitem, GdkEventButton* event, g
  * Callback when "Stop the alarm" is selected in the popup menu
 **/
 
-static void stop_repeating_alarm (GtkWidget* menuitem, GdkEventButton* event, gpointer
+static void stop_repeating_alarm (GtkWidget* menuitem, gpointer
                                         data){
    plugin_data *pd=(plugin_data *)data;
 
@@ -387,7 +416,7 @@ static void stop_repeating_alarm (GtkWidget* menuitem, GdkEventButton* event, gp
     pd->timeout_command=NULL;
    }
 
-   make_menu(pd);
+   //make_menu(pd);
 
 }
 
@@ -398,13 +427,13 @@ static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data)
 
     plugin_data *pd=(plugin_data *)data;
 
-    if(!pd->menu){
-      g_fprintf(stderr,"\nNo menu\n");
+    make_menu(pd);
+      
+    if(!pd->menu)
       return;
-    }
 
     if(event->button==1)
-      gtk_menu_popup (GTK_MENU(pd->menu),NULL,NULL,NULL,NULL,event->button,event->time);
+      gtk_menu_popup (GTK_MENU(pd->menu),NULL,NULL,NULL,NULL,event->button,event->time);  
     else
       gtk_menu_popdown(GTK_MENU(pd->menu));
 
@@ -415,96 +444,82 @@ static void pbar_clicked (GtkWidget *pbar, GdkEventButton *event, gpointer data)
 **/
 void make_menu(plugin_data *pd){
 
-  GtkTreeIter iter;
-  gboolean valid;
-  GSList *group=NULL;
-  GtkWidget *menuitem;
-  gchar *timername,*timerinfo;
-  gchar *itemtext = NULL;
-  gint row_count;
+  GSList *group = NULL;
+  GList *list = NULL;
+  alarm_t *alrm;
+  GtkWidget *menuitem, *to_be_activated;
+  gchar *itemtext;
 
 
   /* Destroy the existing one */
   if(pd->menu)
     gtk_widget_destroy(pd->menu);
 
-  if(pd->menuarray)
-    g_array_free(pd->menuarray,TRUE);
-
   pd->menu=gtk_menu_new();
-  pd->menuarray=g_array_new(FALSE,TRUE,sizeof(menuitem));
-
+  
   /* If the alarm is paused, the only option is to resume or stop */
   if (pd->is_paused) {
       menuitem=gtk_menu_item_new_with_label(_("Resume timer"));
 
       gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"button_press_event",
+      g_signal_connect  (G_OBJECT(menuitem),"activate",
                 G_CALLBACK(pause_resume_selected),pd);
       gtk_widget_show(menuitem);
+      
       menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
 
       gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"button_press_event",
+      g_signal_connect  (G_OBJECT(menuitem),"activate",
                 G_CALLBACK(start_stop_selected),pd);
       gtk_widget_show(menuitem);      
       gtk_widget_show(pd->menu);
       return;	  
   }
 
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
-  row_count=0;
+  list = pd->alarm_list;
 
-  while (valid){
+  while (list){
 
       /* Run through the list, read name and timer period info */
 
-      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);
-      gtk_widget_show(menuitem);
-      g_free(timername);
-      g_free(timerinfo);
-      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
-      g_signal_connect  (G_OBJECT(menuitem),"button_press_event",
-            G_CALLBACK(timer_selected),pd);
+	  alrm = (alarm_t *) list->data;
+
+      itemtext = g_strdup_printf("%s (%s)",alrm->name,alrm->info);
+      menuitem=gtk_radio_menu_item_new_with_label(group,itemtext);      
+      gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
       /* The selected timer is always active */
-      if(row_count==pd->selected)
-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);
+      if(list == pd->selected)
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),TRUE);       
       /* others are disabled when timer or alarm is already running */
       else if(pd->timer_on || pd->alarm_repeating)
         gtk_widget_set_sensitive(GTK_WIDGET(menuitem),FALSE);
 
-      gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-
+      group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
+      g_signal_connect  (G_OBJECT(menuitem),"activate",
+            G_CALLBACK(timer_selected),list);
+            
       g_free(itemtext);
 
-      /* We add the address of menuitem to the array */
-      g_array_append_val(pd->menuarray,menuitem);
-
-      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);
-      row_count++;
+      list = list->next;
+ 
   }
 
   /* Horizontal line (empty item) */
   menuitem=gtk_menu_item_new();
   gtk_menu_shell_append(GTK_MENU_SHELL(pd->menu),menuitem);
-  gtk_widget_show(menuitem);
 
   /* Pause menu item */
   if(pd->timer_on && !pd->is_paused && pd->is_countdown) {
     menuitem=gtk_menu_item_new_with_label(_("Pause timer"));
 
     gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"button_press_event",
+    g_signal_connect    (G_OBJECT(menuitem),"activate",
             G_CALLBACK(pause_resume_selected),pd);
-    gtk_widget_show(menuitem);
 
-    gtk_widget_show(pd->menu);
+
   }
  
   /* Start/stop menu item */
-
   if(!pd->alarm_repeating){
       if(pd->timer_on)
         menuitem=gtk_menu_item_new_with_label(_("Stop timer"));
@@ -512,9 +527,8 @@ void make_menu(plugin_data *pd){
         menuitem=gtk_menu_item_new_with_label(_("Start timer"));
 
       gtk_menu_shell_append (GTK_MENU_SHELL(pd->menu),menuitem);
-      g_signal_connect  (G_OBJECT(menuitem),"button_press_event",
+      g_signal_connect  (G_OBJECT(menuitem),"activate",
                 G_CALLBACK(start_stop_selected),pd);
-      gtk_widget_show(menuitem);
   }
 
   /* Stop repeating alarm if so */
@@ -522,13 +536,11 @@ void make_menu(plugin_data *pd){
     menuitem=gtk_menu_item_new_with_label(_("Stop the alarm"));
 
     gtk_menu_shell_append   (GTK_MENU_SHELL(pd->menu),menuitem);
-    g_signal_connect    (G_OBJECT(menuitem),"button_press_event",
+    g_signal_connect    (G_OBJECT(menuitem),"activate",
             G_CALLBACK(stop_repeating_alarm),pd);
-    gtk_widget_show(menuitem);
-
-    gtk_widget_show(pd->menu);
   }  
 
+  gtk_widget_show_all(pd->menu);
 }
 
 
@@ -538,23 +550,33 @@ void make_menu(plugin_data *pd){
 static void ok_add(GtkButton *button, gpointer data){
 
   alarm_data *adata = (alarm_data *)data;
+  alarm_t *newalarm;
   GtkTreeIter iter;
   gint t1,t2,t3,t;
   gchar *timeinfo = NULL;
 
-  /* Add item to the list */
-  gtk_list_store_append(adata->pd->list,&iter);
+  /* Add item to the alarm list and liststore */
+
+  newalarm = g_new0(alarm_t,1);
+  newalarm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
+  newalarm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
+  newalarm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
+                                    rb1));
+  newalarm->pd = (gpointer) adata->pd;
+                                    
+  adata->pd->alarm_list = g_list_append (adata->pd->alarm_list, newalarm);
+
+  gtk_list_store_append(adata->pd->liststore,&iter);
 
-  gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,
-            0,adata->pd->count,
-            1,gtk_entry_get_text(GTK_ENTRY(adata->name)),
-            3,gtk_entry_get_text(GTK_ENTRY(adata->command)),
-            4,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1)),-1);
+  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
+            0,g_list_last(adata->pd->alarm_list),
+            1,newalarm->name,
+            3,newalarm->command,
+            -1);
   /* Item count goes up by one */
   adata->pd->count=adata->pd->count+1;
 
-  /* If the h-m-s format was chosen, convert time to seconds,
+  /* If the h-m-s format (countdown) was chosen, convert time to seconds,
      save the choice into the list */
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
 
@@ -563,7 +585,8 @@ static void ok_add(GtkButton *button, gpointer data){
     t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
     t=t1*3600+t2*60+t3;
 
-    gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,5,t,-1);
+	
+    
     if(t1>0)
        timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
     else if(t2>0)
@@ -571,46 +594,31 @@ static void ok_add(GtkButton *button, gpointer data){
     else
        timeinfo = g_strdup_printf(_("%ds"),t3);
 
-    gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,2,timeinfo,-1);
+    
   }
-  else{ /* The 24h format. Save time in minutes */
+  else{ /* The 24h format (alarm at specified time). Save time in minutes */
 
     t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
     t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
     t=t1*60+t2;
-    gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,5,t,-1);
     timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-    gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,2,timeinfo,-1);
 
   }
 
-  /* Update menu */
-  make_menu(adata->pd);
+  newalarm->time = t;
+  newalarm->info = timeinfo;
+  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
+
 
   /* Free resources */
   gtk_widget_destroy(GTK_WIDGET(adata->window));
 
   g_free(adata);
-  g_free(timeinfo);
 }
 
 
 
 /**
- * Callback for cancelling Add and Edit. Just closes the window :).
-**/
-static void cancel_add_edit(GtkButton *button, gpointer data){
-
-  alarm_data *adata=(alarm_data *)data;
-
-  gtk_widget_destroy(GTK_WIDGET(adata->window));
-
-  g_free(adata);
-
-}
-
-
-/**
  * Callback for OK button on Edit window. See ok_add for comments.
 **/
 static void ok_edit(GtkButton *button, gpointer data){
@@ -619,7 +627,8 @@ static void ok_edit(GtkButton *button, gpointer data){
   GtkTreeIter iter;
   gint t1,t2,t3,t;
   gchar *timeinfo = NULL;
-
+  GList *list;
+  alarm_t *alrm;
   GtkTreeSelection *select;
   GtkTreeModel *model;
 
@@ -627,18 +636,28 @@ static void ok_edit(GtkButton *button, gpointer data){
 
   if (gtk_tree_selection_get_selected (select, &model, &iter))
   {
-     gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,
-            1,gtk_entry_get_text(GTK_ENTRY(adata->name)),
-            3,gtk_entry_get_text(GTK_ENTRY(adata->command)),
-            4,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
-                                    rb1)),-1);
+	  
+	 gtk_tree_model_get(GTK_TREE_MODEL(adata->pd->liststore), &iter, 0, &list,-1);
+	 alrm = (alarm_t *) list->data;
+	 
+	 alrm->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->name)));
+	 alrm->command = g_strdup(gtk_entry_get_text(GTK_ENTRY(adata->command)));
+	 alrm->iscountdown = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->
+                                    rb1));
+	 /* This should be unnecessary, but do it anyway */
+	 alrm->pd = (gpointer) adata->pd;
+	 
+     gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,
+            1,alrm->name,
+            3,alrm->command ,-1);
+            
      if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(adata->rb1))){
 
         t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timeh));
         t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->timem));
         t3=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->times));
         t=t1*3600+t2*60+t3;
-        gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,5,t,-1);
+        
         if(t1>0)
            timeinfo = g_strdup_printf(_("%dh %dm %ds"),t1,t2,t3);
         else if(t2>0)
@@ -646,27 +665,42 @@ static void ok_edit(GtkButton *button, gpointer data){
         else
            timeinfo = g_strdup_printf(_("%ds"),t3);
 
-        gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,2,timeinfo,-1);
+        
       }
       else{
 
         t1=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_h));
         t2=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(adata->time_m));
         t=t1*60+t2;
-        gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,5,t,-1);
         timeinfo = g_strdup_printf(_("At %02d:%02d"),t1,t2);
-        gtk_list_store_set(GTK_LIST_STORE(adata->pd->list),&iter,2,timeinfo,-1);
-
       }
 
+	  alrm->time = t;
+	  alrm->info = timeinfo;
+	  gtk_list_store_set(GTK_LIST_STORE(adata->pd->liststore),&iter,2,timeinfo,-1);
+	  
   }
 
-  make_menu(adata->pd);
+  //make_menu(adata->pd);
+
+  gtk_widget_destroy(GTK_WIDGET(adata->window));
+
+  g_free(adata);
+}
+
+
+
+/**
+ * Callback for cancelling Add and Edit. Just closes the window :).
+**/
+static void cancel_add_edit(GtkButton *button, gpointer data){
+
+  alarm_data *adata=(alarm_data *)data;
 
   gtk_widget_destroy(GTK_WIDGET(adata->window));
 
   g_free(adata);
-  g_free(timeinfo);
+
 }
 
 /**
@@ -711,11 +745,13 @@ static void add_edit_clicked (GtkButton *buttonn, gpointer data){
   GtkSpinButton *timeh,*timem,*times,*time_h,*time_m;
   GtkRadioButton *rb1,*rb2;
   GtkWidget *hbox,*vbox,*button;
-  alarm_data *adata=g_new(alarm_data,1);
+  alarm_data *adata=g_new0(alarm_data,1);
   gchar *nc; gboolean is_cd; gint time;
   GtkTreeIter iter;
   GtkTreeSelection *select;
   GtkTreeModel *model;
+  GList *list;
+  alarm_t *alrm;
 
   window = (GtkWindow *)gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
@@ -736,7 +772,7 @@ static void add_edit_clicked (GtkButton *buttonn, gpointer data){
   gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE, WIDGET_SPACING);
 
   label = (GtkLabel *)gtk_label_new (_("Name:"));
-  name = (GtkEntry *) gtk_entry_new_with_max_length(1023);
+  name = (GtkEntry *) gtk_entry_new();
   adata->name=name;
 
   gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,0);
@@ -791,14 +827,11 @@ static void add_edit_clicked (GtkButton *buttonn, gpointer data){
 
   /****************/
 
-  hbox=gtk_hbox_new(FALSE, BORDER);
-  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(hbox),TRUE,TRUE,WIDGET_SPACING);
-
   label = (GtkLabel *)gtk_label_new (_("Command to run:"));
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
-  command = (GtkEntry *)gtk_entry_new_with_max_length(1023);
+  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(label),FALSE,FALSE,WIDGET_SPACING);
+  command = (GtkEntry *)gtk_entry_new();
   adata->command=command;
-  gtk_box_pack_start(GTK_BOX(hbox),GTK_WIDGET(command),TRUE,TRUE,WIDGET_SPACING);
+  gtk_box_pack_start(GTK_BOX(vbox),GTK_WIDGET(command),TRUE,TRUE,WIDGET_SPACING);
 
   /****************/
 
@@ -835,18 +868,16 @@ static void add_edit_clicked (GtkButton *buttonn, gpointer data){
   /*gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);*/
 
   if (gtk_tree_selection_get_selected (select, &model, &iter)){
-      gtk_tree_model_get(model,&iter,1,&nc,-1);
-      gtk_entry_set_text(GTK_ENTRY(name),nc);
-      g_free(nc);
-
-      gtk_tree_model_get(model,&iter,3,&nc,-1);
-      gtk_entry_set_text(GTK_ENTRY(command),nc);
-      g_free(nc);
-
-      gtk_tree_model_get(model,&iter,4,&is_cd,-1);
-      gtk_tree_model_get(model,&iter,5,&time,-1);
+	  
+      gtk_tree_model_get(model,&iter,0,&list,-1);
+      alrm = (alarm_t *) list->data;
+      
+      gtk_entry_set_text(GTK_ENTRY(name),alrm->name);
+      gtk_entry_set_text(GTK_ENTRY(command),alrm->command);
+      
+      time = alrm->time;
 
-      if(is_cd){
+      if(alrm->iscountdown){
 
          gtk_spin_button_set_value(GTK_SPIN_BUTTON(timeh),time/3600);
          gtk_spin_button_set_value(GTK_SPIN_BUTTON(timem),(time%3600)/60);
@@ -876,52 +907,30 @@ static void remove_clicked(GtkButton *button, gpointer data){
 
   plugin_data *pd = (plugin_data *)data;
 
-  GtkTreeIter iter,iter_remove;
-  GtkTreeSelection *select;
-  GtkTreePath *path;
+  GtkTreeIter iter;
   GtkTreeModel *model;
-  gboolean valid;
-  gint row_count;
-
+  GtkTreeSelection *select;
+  GList *list;
+  
   /* Get the selected row */
-  select=gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
-
-  row_count=0;
-
-  while (valid){
-
-     /* Re-index the other rows */
-
-     /* The selected one is removed, the corresponding menuitem array is also
-        updated */
-     if(gtk_tree_selection_iter_is_selected(select,&iter)){
-       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 */
-          pd->selected=0; /* If the selected is deleted, new selected one is the first
-                one. The first radiomenuitem gets activated anyway */
-       else if(pd->selected > row_count)
-          pd->selected=pd->selected-1;  /* Those coming after are shifted one behind */
-     }
-     else{
-       /* Save new index on the remaning ones */
-       gtk_list_store_set (pd->list, &iter, 0,row_count, -1);
-       row_count++;
-    }
+  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
+  
+  if (!select)
+  	return;
 
-    valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);
+  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
+  	return;
 
+  gtk_tree_model_get(model,&iter,0,&list,-1);
+  
+  if (pd->selected == list) {
+	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
+	  pd->selected = pd->alarm_list;
+  } else {
+	  pd->alarm_list = g_list_delete_link (pd->alarm_list, list);
   }
-
-  /* Remove the marked one */
-  gtk_list_store_remove (pd->list, &iter_remove);
-
-  /* Update item count and menu */
-  pd->count=row_count;
-
-  make_menu(pd);
+  
+  fill_liststore (pd,NULL);
 
 }
 
@@ -932,47 +941,41 @@ static void up_clicked(GtkButton *button, gpointer data){
 
   plugin_data *pd = (plugin_data *)data;
 
-  GtkTreeIter iter,iter_prev;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
   GtkTreeSelection *select;
-  gboolean valid;
-  gint row_count;
+  GList *list, *list_prev;
 
   /* Get the selected row */
-  select=gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
+  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
+  
+  if (!select)
+  	return;
 
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter_prev);
+  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
+  	return;
+
+  /* This is the item to be moved up */
+  gtk_tree_model_get(model,&iter,0,&list,-1);
   
   /* First item can't be moved up */
-  if(!valid || gtk_tree_selection_iter_is_selected(select,&iter_prev))
+  if(g_list_position(pd->alarm_list, list) <= 0)
 	return;
 
-  iter = iter_prev;
-  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);
- 
-  row_count=1;
-
-  while (valid){
-
-
-     /* The selected one is swapped with the previous one */
-     if(gtk_tree_selection_iter_is_selected(select,&iter)){
-
-	   gtk_list_store_swap(pd->list, &iter, &iter_prev);
-       if(pd->selected == row_count) /* Update the index of the selected item */
-          pd->selected = row_count-1;          
-       else if(pd->selected == row_count-1)
-          pd->selected = row_count;
-       break;
-     }
-
-	 iter_prev = iter;
-     valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);    
-     row_count++;   
-
-  }
-
-  make_menu(pd);
-
+  /* swap places */
+  list_prev = list->prev;
+  if(list_prev->prev)
+  	list_prev->prev->next = list;
+  if(list->next)
+  	list->next->prev = list_prev;
+  list_prev->next = list->next;
+  list->prev = list_prev->prev;
+  list->next = list_prev;
+  list_prev->prev = list;
+  
+  pd->alarm_list = g_list_first(list);
+  
+  fill_liststore (pd, list);
 }
 
 /**
@@ -982,48 +985,44 @@ static void down_clicked(GtkButton *button, gpointer data){
 
   plugin_data *pd = (plugin_data *)data;
 
-  GtkTreeIter iter,iter_next;
+  GtkTreeIter iter;
   GtkTreeSelection *select;
-  gboolean valid;
-  gint row_count;
+  GtkTreeModel *model;
+  GList *list,*list_next;
 
   /* Get the selected row */
-  select=gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
-
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
+  select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->tree));
+  
+  if (!select)
+  	return;
 
-  if(!valid)
-	return;
+  if (!gtk_tree_selection_get_selected (select, &model, &iter)) 
+  	return;
 
-  iter_next = iter;
-  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter_next);
+  /* This is the item to be moved down */
+  gtk_tree_model_get(model,&iter,0,&list,-1);
  
-  row_count=0;
-
-  while (valid){
-
-
-     /* The selected one is swapped with the next one */
-     if(gtk_tree_selection_iter_is_selected(select,&iter)){
-
-	   gtk_list_store_swap(pd->list, &iter, &iter_next);
-       if(pd->selected == row_count) /* Update the index of the selected item */
-          pd->selected = row_count+1;          
-       else if(pd->selected == row_count+1)
-          pd->selected = row_count - 1;
-       break;
-     }
-
-	 iter = iter_next;
-     valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter_next);    
-     row_count++;   
-
-  }
-
-  make_menu(pd);
-
+  /* Last item can't go down) */
+  if (list == g_list_last(pd->alarm_list))
+  	return;
+
+  /* swap places */
+  list_next = list->next;
+  if(list_next->next)
+  	list_next->next->prev = list;
+  if(list->prev)
+  	list->prev->next = list_next;
+  list_next->prev = list ->prev;
+  list->next = list_next->next;
+  list_next->next = list;
+  list->prev = list_next;
+  
+  pd->alarm_list = g_list_first(list_next);
+  
+  fill_liststore (pd, list);
 }
 
+
 /**
  * Adds the progressbar, taking into account the orientation.
  * pd->pbar is not destroyed, just reparented (saves fraction setting code etc.).
@@ -1097,7 +1096,8 @@ static void orient_change(XfcePanelPlugin *plugin, GtkOrientation orient, plugin
 }
 
 /**
- * Loads the list from a keyfile, then saves them in a list_store
+ * Loads the settings and alarm list from a keyfile, saves the
+ * alarm list in the linked list pd->alarm_list 
 **/
 static void load_settings(plugin_data *pd)
 {
@@ -1106,7 +1106,8 @@ static void load_settings(plugin_data *pd)
   const gchar *timerstring;
   gint groupnum,time;
   gboolean is_cd;
-  GtkTreeIter iter;
+  alarm_t *alrm;
+  
   XfceRc *rc;
 
   //if ((file=xfce_panel_plugin_lookup_rc_file (pd->base)) != NULL) {
@@ -1127,24 +1128,29 @@ static void load_settings(plugin_data *pd)
 
           while(xfce_rc_has_group(rc,groupname)){
 
-                 xfce_rc_set_group(rc,groupname);
-
-             gtk_list_store_append(pd->list,&iter);
-
+             xfce_rc_set_group(rc,groupname);
+			
+             alrm = g_new0 (alarm_t,1);
+			 pd->alarm_list = g_list_append(pd->alarm_list, alrm);
+			 
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timername","No name");
-             gtk_list_store_set(pd->list,&iter,0,groupnum,1,timerstring,-1);
-    
+    		 alrm->name = g_strdup(timerstring);
+    		 
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timercommand","");
-             gtk_list_store_set(pd->list,&iter,3,timerstring,-1);
-
+			 alrm->command = g_strdup(timerstring);
+			 
              timerstring=(gchar *)xfce_rc_read_entry(rc,"timerinfo","");
-             gtk_list_store_set(pd->list,&iter,2,timerstring,-1);
+             alrm->info = g_strdup(timerstring);
 
              is_cd=xfce_rc_read_bool_entry(rc,"is_countdown",TRUE);
+             alrm->iscountdown = is_cd;
+             
              time=xfce_rc_read_int_entry(rc,"time",0);
-
-             gtk_list_store_set(pd->list,&iter,4,is_cd,5,time,-1);
-
+			 alrm->time = time;
+			 
+			 /* Include a link to the whole data */
+			 alrm->pd = (gpointer) pd;
+			 
              groupnum++;
              g_snprintf(groupname,5,"G%d",groupnum);
 
@@ -1192,20 +1198,11 @@ static void load_settings(plugin_data *pd)
 **/
 static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
 
-  gchar *timername,*timercommand,*timerinfo;
-  gint time;
-  gboolean is_cd;
-  gchar settings[1024];
-  gchar settingsbak[1024];
-  gchar line[1024];
   gchar groupname[8];
-  GtkTreeIter iter;
-  gboolean valid;
   gint row_count;
-  gsize size;
-
+  GList *list;
+  alarm_t *alrm;
   FILE *conffile;
-
   XfceRc *rc;
   gchar *file, *contents=NULL;
 
@@ -1225,38 +1222,30 @@ static void save_settings(XfcePanelPlugin *plugin, plugin_data *pd){
   if (!rc)
     return;
 
-  valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL(pd->list), &iter);
+  list = pd->alarm_list;
 
-  row_count=0;
+  row_count = 0;
 
-  while (valid){
-
-      gtk_tree_model_get (GTK_TREE_MODEL(pd->list), &iter,
-            1, &timername,
-            2, &timerinfo,
-            3, &timercommand,
-            4, &is_cd,
-            5, &time, -1);
+  while (list){
 
       g_snprintf(groupname,7,"G%d",row_count);
+      
       xfce_rc_set_group(rc,groupname);
+      
+      alrm = (alarm_t *) list->data;
 
-      xfce_rc_write_entry(rc,"timername",timername);
-
-      xfce_rc_write_int_entry(rc,"time",time);
+      xfce_rc_write_entry(rc,"timername",alrm->name);
 
-      xfce_rc_write_entry(rc,"timercommand",timercommand);
+      xfce_rc_write_int_entry(rc,"time",alrm->time);
 
-      xfce_rc_write_entry(rc,"timerinfo",timerinfo);
+      xfce_rc_write_entry(rc,"timercommand",alrm->command);
 
-      xfce_rc_write_bool_entry(rc,"is_countdown",is_cd);
+      xfce_rc_write_entry(rc,"timerinfo",alrm->info);
 
-      g_free(timername);
-      g_free(timercommand);
-      g_free(timerinfo);
+      xfce_rc_write_bool_entry(rc,"is_countdown",alrm->iscountdown);
 
       row_count ++;
-      valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(pd->list), &iter);
+      list = list->next;
   }
 
 
@@ -1319,32 +1308,35 @@ plugin_free (XfcePanelPlugin *plugin, plugin_data *pd)
 
   if(pd->timer)
     g_timer_destroy(pd->timer);
-
+    
+  if(pd->active_timer_name)
+    g_free(pd->active_timer_name);
+        
   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);
+    
+  if(pd->liststore) {
+	gtk_list_store_clear (pd->liststore);
+    //g_free (pd->liststore);
+  }
+  
+  if(pd->alarm_list)
+    g_list_free (pd->alarm_list);  
 
+  /* destroy the tooltips */
   gtk_object_destroy(GTK_OBJECT(pd->tip));
 
-  if(pd->menuarray)
-    g_array_free(pd->menuarray,TRUE);
-
   /* destroy all widgets */
 #ifndef HAVE_XFCE48
 	gtk_widget_destroy(GTK_WIDGET(pd->eventbox));
 #endif  
 
-  /* destroy the tooltips */
-  /*gtk_object_destroy(GTK_OBJECT(pd->tip));*/
-
   /* free the plugin data structure */
   g_free(pd);
 
@@ -1445,11 +1437,9 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   GtkWidget *hbox=gtk_hbox_new(FALSE,0); /* holds the treeview and buttons */
   GtkWidget *buttonbox,*button,*sw,*tree,*spinbutton;
   GtkTreeSelection *select;
-  GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
-  GtkTreeIter iter;
-
   GtkWidget *dlg=NULL, *header=NULL;
+  GtkCellRenderer *renderer;
 
 
   xfce_panel_plugin_block_menu (plugin);
@@ -1505,14 +1495,15 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
 
   gtk_box_pack_start(GTK_BOX(hbox),sw,TRUE,TRUE,0);
 
-  tree=gtk_tree_view_new_with_model(GTK_TREE_MODEL(pd->list));
+  fill_liststore (pd,NULL);
+      
+  tree=gtk_tree_view_new_with_model(GTK_TREE_MODEL(pd->liststore));
   pd->tree=tree;
   gtk_tree_view_set_rules_hint  (GTK_TREE_VIEW (tree), TRUE);
   gtk_tree_selection_set_mode   (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree)),
                  GTK_SELECTION_SINGLE);
-
-  renderer = gtk_cell_renderer_text_new ();
-
+     
+  renderer = gtk_cell_renderer_text_new ();            
   column = gtk_tree_view_column_new_with_attributes (_("Timer name"), renderer,
                             "text", 1, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
@@ -1529,8 +1520,6 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
 
   if(tree)
      gtk_container_add(GTK_CONTAINER(sw),tree);
-  else
-     g_fprintf(stderr,"\n pd->tree is NULL\n");
 
   gtk_widget_set_size_request(GTK_WIDGET(sw),350,200);
 
@@ -1604,7 +1593,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   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(hbox),pd->glob_command_entry,FALSE,FALSE,10);
 
   gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,WIDGET_SPACING);
   gtk_widget_set_sensitive(hbox,pd->use_global_command);
@@ -1624,11 +1613,11 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
   pd->spin_repeat=spinbutton;
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repetitions);
   g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin1_changed), pd);
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
   gtk_box_pack_start(GTK_BOX(hbox),gtk_label_new(_("  Time interval (sec.)")),FALSE,FALSE,0);
   spinbutton=gtk_spin_button_new_with_range(1,600,1);
   pd->spin_interval=spinbutton;
-  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,0);
+  gtk_box_pack_start(GTK_BOX(hbox),spinbutton,FALSE,FALSE,10);
   gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbutton), pd->repeat_interval);
   g_signal_connect(G_OBJECT(spinbutton),"value-changed", G_CALLBACK(spin2_changed), pd);
 
@@ -1641,6 +1630,66 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
 
 }
 
+/**
+ * Show the "About" window
+**/
+static void show_about_window(XfcePanelPlugin *plugin, plugin_data *pd)
+{
+   GdkPixbuf *icon;
+   const gchar *author[] = { "Kemal Ilgar Eroğlu <ilgar_eroglu at yahoo.com>", NULL};
+   const gchar *translators = 
+"Mohammad Alhargan <malham1 at hotmail.com> \n\
+Marcos Antonio Alvarez Costales <marcoscostales at gmail.com> \n\
+Harald Servat <redcrash at gmail.com> \n\
+Michal Várady <miko.vaji at gmail.com>\n\
+Per Kongstad <p_kongstad at op.pl>\n\
+Simon Schneider <simon at schneiderimtal.de>\n\
+Efstathios Iosifidis <iosifidis at opensuse.org>\n\
+Jeff Bailes <thepizzaking at gmail.com>\n\
+Sergio <oigres200 at gmail.com>\n\
+Piarres Beobide <pi at beobide.net>\n\
+Maximilian Schleiss <maximilian at xfce.org>\n\
+Leandro Regueiro <leandro.regueiro at gmail.com>\n\
+Ivica Kolić <ikoli at yahoo.com>\n\
+Gabor Kelemen <kelemeng at gnome dot hu>\n\
+Andhika Padmawan <andhika.padmawan at gmail.com>\n\
+Cristian Marchi <cri.penta at gmail.com>\n\
+Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n\
+Seong-ho Cho <darkcircle.0426 at gmail.com>\n\
+Rihards Priedītis <rprieditis at inbox.lv>\n\
+Pjotr <pjotrvertaalt at gmail.com>\n\
+Piotr Sokół <piotr.sokol at 10g.pl>\n\
+Sérgio Marques <smarquespt at gmail.com>\n\
+Rafael Ferreira <rafael.f.f1 at gmail.com>\n\
+Dima Smirnov <arch at cnc-parts.info>\n\
+Tomáš Vadina <kyberdev at gmail.com>\n\
+Besnik Bleta <besnik at programeshqip.org>\n\
+Саша Петровић <salepetronije at gmail.com>\n\
+Daniel Nylander <po at danielnylander.se>\n\
+Kemal Ilgar Eroğlu <ilgar_eroglu at yahoo.com>\n\
+Gheyret T.Kenji <gheyret at gmail.com>\n\
+Dmitry Nikitin <luckas_fb at mail.ru>\n\
+Muhammad Ali Makki <makki.ma at gmail.com>\n\
+Hunt Xu <huntxu at live.cn>\n\
+Cheng-Chia Tseng <pswo10680 at gmail.com>\n";
+	   
+   icon = xfce_panel_pixbuf_from_source("xfce4-timer", NULL, 48);
+   gtk_show_about_dialog(NULL,
+   	  "title", _("About xfce4-timer-plugin"),
+      "logo", icon,
+      "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
+      "version", PACKAGE_VERSION,
+      "program-name", PACKAGE_NAME,
+      "comments", _("A plugin to define countdown timers or alarms at given times."),
+      "website", "http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin",
+      "copyright", _("Copyright (c) 2005-2013\n"),
+      "authors", author,
+      "translator-credits" , translators,
+      NULL);
+
+   if(icon)
+      g_object_unref(G_OBJECT(icon));
+}
 
 /**
  * create_sample_control
@@ -1651,8 +1700,8 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
  *
  * Returns %TRUE on success, %FALSE on failure.
  **/
-static void
-create_plugin_control (XfcePanelPlugin *plugin)
+ 
+static void create_plugin_control (XfcePanelPlugin *plugin)
 {
 
   GtkWidget *base,*menu,*socket,*menuitem,*box,*pbar2;
@@ -1662,21 +1711,17 @@ create_plugin_control (XfcePanelPlugin *plugin)
 
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
 
-  plugin_data *pd=g_new(plugin_data,1);
+  plugin_data *pd=g_new0(plugin_data,1);
 
   pd->base=plugin;
   pd->count=0;
   pd->pbar=gtk_progress_bar_new();
-  pd->list=gtk_list_store_new(6,
-         G_TYPE_INT,     /* Column 0: Index */
+  pd->liststore=gtk_list_store_new(4,
+         G_TYPE_POINTER, /* Column 0: GList alarm list node */
          G_TYPE_STRING,  /* Column 1: Name */
-         G_TYPE_STRING,  /* Column 2: Timer period/alarm time */
-         G_TYPE_STRING,  /* Command to run */
-         G_TYPE_BOOLEAN, /* TRUE= Is countdown, i.e. h-m-s format.
-                    FALSE= 24h format */
-         G_TYPE_INT);    /* Timer period in seconds if countdown.
-                    Alarm time in minutes if 24h format is used,
-                    (i.e. 60 x Hr + Min) */
+         G_TYPE_STRING,  /* Column 2: Timer period/alarm time - info string */
+         G_TYPE_STRING);  /* Command to run */
+
 #ifndef HAVE_XFCE48
   pd->eventbox = gtk_event_box_new();
 #endif  
@@ -1687,8 +1732,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
   pd->buttonedit=NULL;
   pd->buttonremove=NULL;
   pd->menu=NULL;
-  pd->menuarray=NULL;
-  pd->selected=0;
   pd->tip=gtk_tooltips_new();
   pd->timeout_command=NULL;
   pd->timer=NULL;
@@ -1708,12 +1751,14 @@ create_plugin_control (XfcePanelPlugin *plugin)
   pd->repeat_interval=10;
   pd->alarm_repeating=FALSE;
   pd->repeat_timeout=0;
-
+  pd->alarm_list = NULL;
+  pd->selected=NULL;
+  
   gtk_tooltips_set_tip(pd->tip, GTK_WIDGET(plugin), "", NULL);
   gtk_tooltips_disable(pd->tip);
 
 
-  g_object_ref(pd->list);
+  g_object_ref(pd->liststore);
 
   filename = xfce_panel_plugin_save_location (pd->base,TRUE);
   pathname = g_path_get_dirname (filename);
@@ -1722,9 +1767,8 @@ create_plugin_control (XfcePanelPlugin *plugin)
   g_free(pathname);
 
   load_settings(pd);
-
-  make_menu(pd);
-                      
+  pd->selected = pd->alarm_list;
+      
   gtk_progress_bar_set_bar_style    (GTK_PROGRESS_BAR(pd->pbar),
                     GTK_PROGRESS_CONTINUOUS);
   gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pd->pbar),0);
@@ -1737,7 +1781,7 @@ create_plugin_control (XfcePanelPlugin *plugin)
 
 #ifdef HAVE_XFCE48
   g_signal_connect  (G_OBJECT(plugin), "button_press_event",
-            G_CALLBACK(pbar_clicked), pd);      
+            G_CALLBACK(pbar_clicked), pd);   
 #else
   gtk_container_add(GTK_CONTAINER(plugin),pd->eventbox);
   g_signal_connect  (G_OBJECT(pd->eventbox), "button_press_event",
@@ -1758,6 +1802,9 @@ create_plugin_control (XfcePanelPlugin *plugin)
   xfce_panel_plugin_menu_show_configure (plugin);
   g_signal_connect (plugin, "configure-plugin",
                       G_CALLBACK (plugin_create_options), pd);
+
+  xfce_panel_plugin_menu_show_about(plugin);
+  g_signal_connect (plugin, "about", G_CALLBACK (show_about_window), pd);                      
                    
 }
 
diff --git a/src/xfcetimer.h b/src/xfcetimer.h
index 86bf0ac..9056e1f 100644
--- a/src/xfcetimer.h
+++ b/src/xfcetimer.h
@@ -16,7 +16,15 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+ 
+typedef struct {
 
+  gchar *name,*command,*info;
+  gint  time;
+  gboolean iscountdown;
+  gpointer pd;
+  
+} alarm_t;
 
 typedef struct {
   GtkWidget 	*eventbox,		/* Main container widget
@@ -36,9 +44,8 @@ typedef struct {
 								alarm settings */
 		
   XfcePanelPlugin *base;			/* The plugin widget */
-  GtkListStore *list;				/* The alarms list */
-  gint 		count,					/* Number of alarms */
-			selected,
+  GtkListStore *liststore;				/* The alarms list */
+  gint 		count,
 			timeout_period_in_sec,	/* Active countdown period */
 			repetitions,			/* Number of alarm repeats */
 			rem_repetitions,		/* Remaining repeats */
@@ -57,10 +64,6 @@ typedef struct {
 			is_paused,				/* True if the countdown is paused */
 			is_countdown;			/* True if the alarm type is contdown */
   GtkTooltips 	*tip;				/* Tooltip for panel */
-  GArray 	*menuarray;			/* Array of popup 
-								menuitems (alarms). These 
-								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 */
@@ -69,6 +72,8 @@ typedef struct {
   								config file -- this is not the
   								plugin rc file. */
   GTimer 	*timer;				/* Keeps track of the time elapsed */
+  GList		*alarm_list,		/* List of alarms */
+  			*selected;			/* Selected alarm */
 
 } plugin_data;
 
@@ -82,3 +87,4 @@ typedef struct {
   GtkWindow 	*window;				/* Add/Edit window */
   plugin_data 	*pd;					/* Plugin data */
 } alarm_data;
+


More information about the Xfce4-commits mailing list