[gnome-schedule] update-po

[Gaute Hope <gauteh src gnome org>]

commit a903f8e9aeb8abbbf641b3bea686a7e9d3b42515
Author: Gaute Hope <eg gaute vetsj com>
Date:   Fri Mar 1 17:07:18 2013 +0100

    update-po

 po/ar.po    |  368 +++++++++++++++++----------------
 po/bg.po    |  358 ++++++++++++++++----------------
 po/ca.po    |  391 ++++++++++++++++++-----------------
 po/cs.po    |  289 +++++++++++++-------------
 po/da.po    |    2 +-
 po/de.po    |  339 +++++++++++++++---------------
 po/dz.po    |  383 ++++++++++++++++++-----------------
 po/el.po    |  662 ++++++++++++++++++++++++++++++++---------------------------
 po/en_CA.po |  381 +++++++++++++++++-----------------
 po/en_GB.po |  361 +++++++++++++++++----------------
 po/es.po    |  331 +++++++++++++++---------------
 po/eu.po    |  359 ++++++++++++++++----------------
 po/fi.po    |  361 +++++++++++++++++----------------
 po/fr.po    |   47 ++---
 po/gl.po    |  282 +++++++++++++-------------
 po/gu.po    |  354 ++++++++++++++++----------------
 po/hu.po    |  384 ++++++++++++++++++-----------------
 po/it.po    |  363 +++++++++++++++++----------------
 po/lt.po    |  378 +++++++++++++++++-----------------
 po/nb.po    |  274 +++++++++++++------------
 po/ne.po    |  381 +++++++++++++++++-----------------
 po/nl.po    |  391 ++++++++++++++++++-----------------
 po/nn.po    |  379 +++++++++++++++++-----------------
 po/oc.po    |  312 ++++++++++++++--------------
 po/pa.po    |  342 ++++++++++++++++---------------
 po/pl.po    |  286 +++++++++++++-------------
 po/pt.po    |  372 +++++++++++++++++----------------
 po/pt_BR.po |    5 +-
 po/ro.po    |  367 +++++++++++++++++----------------
 po/ru.po    |  628 ++++++++++++++++++++++++++++++--------------------------
 po/rw.po    |  386 ++++++++++++++++++-----------------
 po/sl.po    |  629 ++++++++++++++++++++++++++++++--------------------------
 po/sq.po    |  368 +++++++++++++++++----------------
 po/sv.po    |  361 +++++++++++++++++----------------
 po/uk.po    |  370 +++++++++++++++++----------------
 po/vi.po    |  379 +++++++++++++++++-----------------
 po/zh_CN.po |  355 ++++++++++++++++----------------
 po/zh_HK.po |  377 +++++++++++++++++-----------------
 po/zh_TW.po |  377 +++++++++++++++++-----------------
 39 files changed, 7032 insertions(+), 6700 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index 4f939a2..623f313 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arabic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2007-04-14 18:49+0100\n"
 "Last-Translator: Djihed Afifi <djihed gmail com>\n"
 "Language-Team: Arabeyes <doc arabeyes org>\n"
@@ -18,61 +18,67 @@ msgstr ""
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
 #, fuzzy
-msgid "Manage your system tasks"
-msgstr "أدِر شهاداتك"
+msgid "Scheduled tasks"
+msgstr "أرسل واستقبل الفاكسات"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
-msgid "Scheduled tasks"
-msgstr "أرسل واستقبل الفاكسات"
+msgid "Manage your system tasks"
+msgstr "أدِر شهاداتك"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "أعِدّ جلساتك"
+msgid "Gnome schedule"
+msgstr "مُجَدْوِل الأفعال"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
-msgid "Gnome schedule"
-msgstr "مُجَدْوِل الأفعال"
+msgid "Configures your scheduled tasks"
+msgstr "أعِدّ جلساتك"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 #, fuzzy
 msgid "System tools"
 msgstr "نداءات النظام"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr ""
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 #, fuzzy
 msgid "Once"
 msgstr "واحد"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "بدون عنوان"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "الدّقيقة"
@@ -95,7 +101,7 @@ msgstr "أشهر"
 msgid "Weekday"
 msgstr "الأربعاء"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "بسيط"
 
@@ -114,58 +120,53 @@ msgstr "خمن عدداً بين %d و %d"
 msgid "%s is not a number"
 msgstr "%s ليس مجلّدا"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "بدون عنوان"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 #, fuzzy
 msgid "Recurrent"
 msgstr "تكرار"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 #, fuzzy
 msgid "minute"
 msgstr "دقائق"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 #, fuzzy
 msgid "hour"
 msgstr "ساعات"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "اليوم"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 #, fuzzy
 msgid "month"
 msgstr "أشهر"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 #, fuzzy
 msgid "weekday"
 msgstr "أسابيع"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "خمس دقائق"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "كل سنة"
@@ -185,22 +186,22 @@ msgstr "كل أسبوع"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 #, fuzzy
 msgid "Create a New Scheduled Task"
 msgstr "أنشيء تقويماً جديداً"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "قالب:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "قالب:"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr ""
 
@@ -229,11 +230,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -272,12 +273,12 @@ msgid "This is invalid. Reason: %s"
 msgstr "هذه %s، اصدارة %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "دقيقة واحدة"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "الدّقيقة"
@@ -287,7 +288,7 @@ msgstr "الدّقيقة"
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "السّاعة"
@@ -298,7 +299,7 @@ msgstr "السّاعة"
 msgid "On a day"
 msgstr "مرة في اليوم"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 #, fuzzy
 msgid "Day:"
 msgstr "اليوم"
@@ -309,7 +310,7 @@ msgstr "اليوم"
 msgid "In a month"
 msgstr "خلال شهر"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "ال_شّهر:"
@@ -320,17 +321,17 @@ msgstr "ال_شّهر:"
 msgid "On a weekday"
 msgstr "مرّة في الأسبوع"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "الأربعاء"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 #, fuzzy
 msgid "In a step width"
 msgstr "عرض الأيقونة صفر"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "دقائق"
@@ -357,8 +358,8 @@ msgstr "أيّام العمل:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
 #, fuzzy
-msgid "A_bout"
-msgstr "اجهض"
+msgid "_Manage tasks"
+msgstr "إدارة الدِسكلت"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -372,8 +373,8 @@ msgstr "مساعدة"
 
 #: ../src/gnome-schedule-applet.xml.h:4
 #, fuzzy
-msgid "_Manage tasks"
-msgstr "إدارة الدِسكلت"
+msgid "A_bout"
+msgstr "اجهض"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -404,13 +405,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -457,74 +461,86 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "حذف القالب المحدد"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "إدارة الدِسكلت"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
+#, fuzzy
+msgid "Create a new template."
+msgstr "أنشيء تقويماً جديداً"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>ا_نتقِ نوع المفتاح الذي ترغب بإنشائه</b>"
+msgid "Edit the selected template"
+msgstr "حذف القالب المحدد"
 
 #: ../src/gnome-schedule.glade.h:6
-#, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>الجهاز</b>"
+msgid "Delete the selected template"
+msgstr "حذف القالب المحدد"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
+#, fuzzy
+msgid "Task description:"
+msgstr "ال_وصف:"
 
-#: ../src/gnome-schedule.glade.h:8
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "حول راديو جينوم"
+msgid "X application"
+msgstr "حوْل هذا البرنامج"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
+#. This comes before the time and date input boxes in the One-time task editor
+#: ../src/gnome-schedule.glade.h:10
+msgid "Execute at:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:10
+#: ../src/gnome-schedule.glade.h:11
 #, fuzzy
-msgid "Add as template"
-msgstr "اضف توقفا مؤقتا"
+msgid "Date:"
+msgstr "ال_تّاريخ:"
 
-#: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "متقدم"
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
 #, fuzzy
-msgid "Change User"
-msgstr "مجموعة التغييرات"
+msgid "Task:"
+msgstr "_مهمّة"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "اضف توقفا مؤقتا"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "ينفذ الأفعال المجدولة"
 
 #: ../src/gnome-schedule.glade.h:17
-#, fuzzy
-msgid "Choose the user whose tasks you want to modify"
-msgstr "اختر مجموعة الوسوم التي تريد استعمالها"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -534,76 +550,56 @@ msgstr "الأم_ر:"
 
 #: ../src/gnome-schedule.glade.h:19
 #, fuzzy
-msgid "Configure Scheduled Tasks"
-msgstr "إعداد الدِسكلت"
+msgid "Description:"
+msgstr "ال_وصف:"
 
 #: ../src/gnome-schedule.glade.h:20
-#, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "حذف القالب المحدد"
-
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "أنشيء تقويماً جديداً"
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "ال_تّاريخ:"
+msgid "Advanced"
+msgstr "متقدم"
 
 #: ../src/gnome-schedule.glade.h:24
-#, fuzzy
-msgid "Delete a scheduled task"
-msgstr "احذف المهام المنتقاة"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "حذف القالب المحدد"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "ال_وصف:"
-
-#: ../src/gnome-schedule.glade.h:27
-#, fuzzy
-msgid "Edit a periodical task"
-msgstr "ينفذ الأفعال المجدولة"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:28
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a scheduled task"
-msgstr "ينفذ الأفعال المجدولة"
+msgid "<big>Preview</big>"
+msgstr "<b>الجهاز</b>"
 
-#: ../src/gnome-schedule.glade.h:29
+#: ../src/gnome-schedule.glade.h:32
 #, fuzzy
-msgid "Edit the selected template"
-msgstr "حذف القالب المحدد"
+msgid "Change User"
+msgstr "مجموعة التغييرات"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
+msgid "_User:"
+msgstr "_مستخدم:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
+msgid "Add a Scheduled Task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr ""
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>ا_نتقِ نوع المفتاح الذي ترغب بإنشائه</b>"
 
 #: ../src/gnome-schedule.glade.h:37
 #, fuzzy
-msgid "Execution in a range."
-msgstr "قيد التحقق..."
+msgid "Time expression help"
+msgstr "جملة غير صالحة"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -611,89 +607,99 @@ msgid "Expression:"
 msgstr "تعبير"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "إلى:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "من:"
 
-#: ../src/gnome-schedule.glade.h:41
+#: ../src/gnome-schedule.glade.h:42
 #, fuzzy
-msgid "In a range"
-msgstr "غرانج"
+msgid "Other"
+msgstr "أخ_رى"
 
 #: ../src/gnome-schedule.glade.h:43
 #, fuzzy
-msgid "Manage templates"
-msgstr "إدارة الدِسكلت"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "اعرض معلومات عن الملف الحالي"
 
-#: ../src/gnome-schedule.glade.h:47
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:46
 #, fuzzy
-msgid "Other"
-msgstr "أخ_رى"
+msgid "In a range"
+msgstr "غرانج"
 
-#: ../src/gnome-schedule.glade.h:48
+#: ../src/gnome-schedule.glade.h:47
 #, fuzzy
-msgid "Run selected task"
-msgstr "من فضلك اختر رمز دال:"
+msgid "Execution in a range."
+msgstr "قيد التحقق..."
 
 #: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+msgid "Execution at every minute, hour, day, weekday or month."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:50
-#, fuzzy
-msgid "Scheduled and active tasks"
-msgstr "أرسل واستقبل الفاكسات"
-
 #: ../src/gnome-schedule.glade.h:51
-#, fuzzy
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "اعرض معلومات عن الملف الحالي"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:52
 #, fuzzy
-msgid "Show help"
-msgstr "إظهار المساعدة"
+msgid "Configure Scheduled Tasks"
+msgstr "إعداد الدِسكلت"
 
 #: ../src/gnome-schedule.glade.h:53
 #, fuzzy
-msgid "Task description:"
-msgstr "ال_وصف:"
+msgid "Edit a scheduled task"
+msgstr "ينفذ الأفعال المجدولة"
 
 #: ../src/gnome-schedule.glade.h:54
 #, fuzzy
-msgid "Task:"
-msgstr "_مهمّة"
+msgid "Delete a scheduled task"
+msgstr "احذف المهام المنتقاة"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "قالب:"
+msgid "Run selected task"
+msgstr "من فضلك اختر رمز دال:"
 
 #: ../src/gnome-schedule.glade.h:56
-#, fuzzy
-msgid "Time expression help"
-msgstr "جملة غير صالحة"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "قالب:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "إلى:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
+#: ../src/gnome-schedule.glade.h:59
 #, fuzzy
-msgid "X application"
-msgstr "حوْل هذا البرنامج"
+msgid "Choose the user whose tasks you want to modify"
+msgstr "اختر مجموعة الوسوم التي تريد استعمالها"
+
+#: ../src/gnome-schedule.glade.h:60
+#, fuzzy
+msgid "Show help"
+msgstr "إظهار المساعدة"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_مستخدم:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "حول راديو جينوم"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+#, fuzzy
+msgid "Scheduled and active tasks"
+msgstr "أرسل واستقبل الفاكسات"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1158,25 +1164,25 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, fuzzy, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr ""
 "هذا ليس ملف لوحة مفاتيح سليم:\n"
 "%s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/bg.po b/po/bg.po
index 0ece356..3a59a80 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule gnome 2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2010-08-17 15:03+0200\n"
 "Last-Translator: Svetoslav Stefanov <lfu project gmail com>\n"
 "Language-Team: Bulgarian\n"
@@ -22,26 +22,26 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Управление на вашите системни задачи"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Задачи по разписание"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Настройва вашите задачи по разписание"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Управление на вашите системни задачи"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome Schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Настройва вашите задачи по разписание"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Системни инструменти"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -49,7 +49,7 @@ msgstr ""
 "Неуспех при създаване на папката с данни! Уверете се, че имате права за "
 "запис в папките ~/.gnome и ~/.gnome/gnome-schedule."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -58,24 +58,30 @@ msgstr ""
 "Неуспех при създаване на папката с данни: %s. Уверете се, че имате права за "
 "запис в папките ~/.gnome и ~/.gnome/gnome-schedule."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "На %(date)s в %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Веднъж"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Без заглавие"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Минута"
@@ -96,7 +102,7 @@ msgstr "Месец"
 msgid "Weekday"
 msgstr "Седмичен ден"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Основни"
 
@@ -115,52 +121,47 @@ msgstr "Трябва да бъде между %(min)s и %(max)s"
 msgid "%s is not a number"
 msgstr "%s не е число"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Без заглавие"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Периодична"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "При рестартиране"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "минута"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "час"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "ден"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "месец"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "ден от седмицата"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Всяка минута"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Всеки час"
 
@@ -178,19 +179,19 @@ msgstr "Всяка седмица"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Създаване на нова задача по разписание"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Редактиране на шаблон"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Нов шаблон"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Редактиране на задача по разписание"
 
@@ -224,11 +225,11 @@ msgstr ""
 "\n"
 "Периодичните задачи ще се изпълняват от домашната папка."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "Да не се показва отново"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Внимание: Работна папка на изпълнимите задачи"
 
@@ -262,11 +263,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Това е неточно. Причината е: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "На точно определена минута"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Минута:"
 
@@ -275,7 +276,7 @@ msgstr "Минута:"
 msgid "At an exact hour"
 msgstr "В определен час"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Час:"
 
@@ -284,7 +285,7 @@ msgstr "Час:"
 msgid "On a day"
 msgstr "На определен ден"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Ден:"
 
@@ -293,7 +294,7 @@ msgstr "Ден:"
 msgid "In a month"
 msgstr "През месец"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Месец:"
 
@@ -302,15 +303,15 @@ msgstr "Месец:"
 msgid "On a weekday"
 msgstr "На ден от седмицата"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Ден от седмицата:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "С определена стъпка"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Минути:"
 
@@ -331,8 +332,8 @@ msgid "Weekdays:"
 msgstr "Дни от седмицата:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "&Относно"
+msgid "_Manage tasks"
+msgstr "_Управление на задачите"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -343,8 +344,8 @@ msgid "_Help"
 msgstr "Помо_щ"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Управление на задачите"
+msgid "A_bout"
+msgstr "&Относно"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -375,13 +376,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -428,68 +432,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Изберете шаблон"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Създаване на нова задача от избрания шаблон"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Управление на шаблоните"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Изберете потребител, чиито задачи желаете да промените</b>"
+msgid "Create a new template."
+msgstr "Създаване на нов шаблон."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Изберете тип на задачата по разписание</b>"
+msgid "Edit the selected template"
+msgstr "Редактиране на избрания шаблон"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Предварителен преглед</big>"
+msgid "Delete the selected template"
+msgstr "Изтриване на избрания шаблон"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Час &amp; Дата</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Относно Gnome-schedule"
+msgid "Task description:"
+msgstr "Описание на задачата:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Добавяне на задача по разписание"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Приложение Х"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Добавяне като шаблон"
+msgid "Execute at:"
+msgstr "Изпълнение на:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Допълнителни"
+msgid "Date:"
+msgstr "Дата:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Време:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Промяна на потребител"
+msgid "Task:"
+msgstr "Задача:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Промяна на режим на редактиране"
+msgid "Add as template"
+msgstr "Добавяне като шаблон"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Изберете шаблон"
+msgid "Edit a periodical task"
+msgstr "Редактиране на периодична задача"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Изберете потребител, чиито задачи желаете да промените"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -497,146 +509,140 @@ msgid "Command:"
 msgstr "Команда:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Настройване на задачи по разписание"
+msgid "Description:"
+msgstr "Описание:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Създаване на нова задача от избрания шаблон"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Създаване на нов шаблон."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Час &amp; Дата</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Дата:"
+msgid "Advanced"
+msgstr "Допълнителни"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Изтриване на програмирана задача"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Изтриване на избрания шаблон"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Описание:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Редактиране на периодична задача"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Редактиране на програмирана задача"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Предварителен преглед</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Редактиране на избрания шаблон"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Промяна на потребител"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Изпълнение на:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Изберете потребител, чиито задачи желаете да промените</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Изпълнение в определена минута, час, ден, делничен ден или месец."
+msgid "_User:"
+msgstr "_Потребител:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Изпълнение с определена стъпка. Например на всеки пет минути, часа, дни, "
-"делнични дни или месеца."
+msgid "Add a Scheduled Task"
+msgstr "Добавяне на задача по разписание"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Изпълнение на всяка минута, час, ден, делничен ден или месец."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Изберете тип на задачата по разписание</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Изпълнение в определена граница."
+msgid "Time expression help"
+msgstr "Потърсете помощ"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Условие:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "До:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "В определена граница"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Други"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Управление на шаблоните"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Вижте \"man 5 crontab\" за информация относно формата на crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Други"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Изпълнение в определена минута, час, ден, делничен ден или месец."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Изпълнение на избраната задача"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "В определена граница"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Изпълнение на задачата"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Изпълнение в определена граница."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Програмирани и активни задачи"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Изпълнение на всяка минута, час, ден, делничен ден или месец."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Вижте \"man 5 crontab\" за информация относно формата на crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Изпълнение с определена стъпка. Например на всеки пет минути, часа, дни, "
+"делнични дни или месеца."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Показване на помощ"
+msgid "Configure Scheduled Tasks"
+msgstr "Настройване на задачи по разписание"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Описание на задачата:"
+msgid "Edit a scheduled task"
+msgstr "Редактиране на програмирана задача"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Задача:"
+msgid "Delete a scheduled task"
+msgstr "Изтриване на програмирана задача"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Шаблони"
+msgid "Run selected task"
+msgstr "Изпълнение на избраната задача"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Потърсете помощ"
+msgid "Run task"
+msgstr "Изпълнение на задачата"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Време:"
+msgid "Templates"
+msgstr "Шаблони"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "До:"
+msgid "Change edit mode"
+msgstr "Промяна на режим на редактиране"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Приложение Х"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Изберете потребител, чиито задачи желаете да промените"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Показване на помощ"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Потребител:"
+msgid "About Gnome-schedule"
+msgstr "Относно Gnome-schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Програмирани и активни задачи"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1126,11 +1132,11 @@ msgstr "Задача, изпълняваща се еднократно"
 msgid "A task from a predefined template"
 msgstr "Задача от съществуващ шаблон"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1139,12 +1145,12 @@ msgstr ""
 "В едното или в двете полета за час и минута е въведена буква, или число "
 "извън обхвата. Спомнете си, че часът има 60 минути, а денят само 24 часа."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Това е невалиден запис! Проблемът може да е: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/ca.po b/po/ca.po
index 4cc370f..9dbed4c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-12-28 19:42+0200\n"
 "Last-Translator: Xavier Conde Rueda <xavi conde gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -17,57 +17,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Gestioneu les tasques del vostre sistema"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Afegeix una tasca planificada"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configureu les vostres tasques planificades"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Gestioneu les tasques del vostre sistema"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Planificador del Gnome"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configureu les vostres tasques planificades"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Eines del sistema"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "El %(date)s a les %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Una vegada"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Avís: no s'ha pogut analitzar una línia de la sortida de l'atq"
 
+# Netscape_4.7->String:MNRC32.DLL
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Sense nom"
+
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 4
 # Projecte_Open_Office_1.1 [sc.po]
 #: ../src/crontab.py:87
@@ -95,7 +103,7 @@ msgid "Weekday"
 msgstr "Dia laborable"
 
 # Mozilla 1.3->searchModeBasic.label
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "BÃ sic"
 
@@ -114,61 +122,55 @@ msgstr "Ha d'estar entre %(min)s i %(max)s"
 msgid "%s is not a number"
 msgstr "%s no és un nombre"
 
-# Netscape_4.7->String:MNRC32.DLL
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Sense nom"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Periòdic"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 4
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minut"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 2
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "hora"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE 6
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dia"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE 4
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "mes"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "dia laborable"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Cada minut"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Cada hora"
 
@@ -190,21 +192,21 @@ msgstr "Cada setmana"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Crea una nova tasca planificada"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Plantilla:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Afegeix una tasca"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Edita una tasca planificada"
 
@@ -235,11 +237,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -281,13 +283,13 @@ msgid "This is invalid. Reason: %s"
 msgstr "Això no és và lid. Raó: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "En el minut exacte"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 4
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minut:"
 
@@ -298,7 +300,7 @@ msgstr "En una hora exacta"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 2
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hora:"
 
@@ -307,7 +309,7 @@ msgstr "Hora:"
 msgid "On a day"
 msgstr "En un dia"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dia:"
 
@@ -320,7 +322,7 @@ msgstr "En un mes"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE 4
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mes:"
 
@@ -329,17 +331,17 @@ msgstr "Mes:"
 msgid "On a weekday"
 msgstr "Un dia laborable"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Dia laborable:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Espaiat"
 
 # source\ui\src\scfuncs.src string RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME 4
 # Projecte_Open_Office_1.1 [sc.po]
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuts:"
 
@@ -364,8 +366,8 @@ msgid "Weekdays:"
 msgstr "Dies laborables:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Quant a"
+msgid "_Manage tasks"
+msgstr "Gestiona les tasques"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -376,8 +378,8 @@ msgid "_Help"
 msgstr "A_juda"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "Gestiona les tasques"
+msgid "A_bout"
+msgstr "_Quant a"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -408,13 +410,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -461,74 +466,89 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Suprimeix la plantilla seleccionada"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "Gestiona les tasques"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Escolliu de quin usuari se'n modificaran les tasques</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Afegeix una tasca"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Seleccioneu el tipus de tasca planificada</b>"
+msgid "Edit the selected template"
+msgstr "Suprimeix la plantilla seleccionada"
 
-# Gnome_2.6_Desktop [gok.HEAD.ca.po]
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Previsualització</b>"
+msgid "Delete the selected template"
+msgstr "Suprimeix la plantilla seleccionada"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Quant al Planificador del Gnome"
+msgid "Task description:"
+msgstr "Desc_ripció:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Afegeix una tasca planificada"
+# Gnome_2.6_Desktop [gpdf.HEAD.ca.po]
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Quant a aquesta aplicació"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "_Afegeix una tasca"
+msgid "Execute at:"
+msgstr ""
 
-# Winrar 2.9->Dialog Caption:rarlng.dll
+# Projecte_Fedora [redhat-logviewer.ca.po]
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avançat"
+#, fuzzy
+msgid "Date:"
+msgstr "_Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Canvia l'usuari"
+#, fuzzy
+msgid "Task:"
+msgstr "_Tasca"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Afegeix una tasca"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Edita una tasca planificada"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Escolliu de quin usuari se'n modificaran les tasques"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -537,162 +557,149 @@ msgid "Command:"
 msgstr "_Ordre:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configura les tasques planificades"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Suprimeix la plantilla seleccionada"
+msgid "Description:"
+msgstr "Desc_ripció:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Afegeix una tasca"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
-# Projecte_Fedora [redhat-logviewer.ca.po]
+# Winrar 2.9->Dialog Caption:rarlng.dll
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Data:"
+msgid "Advanced"
+msgstr "Avançat"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Suprimeix una tasca planificada"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Suprimeix la plantilla seleccionada"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Desc_ripció:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+# Gnome_2.6_Desktop [gok.HEAD.ca.po]
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Edita una tasca planificada"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Edita una tasca planificada"
+msgid "<big>Preview</big>"
+msgstr "<b>Previsualització</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Suprimeix la plantilla seleccionada"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Canvia l'usuari"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Escolliu de quin usuari se'n modificaran les tasques</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "S'executa en un minut, hora, dia, dia laborable o mes específic."
+msgid "_User:"
+msgstr "_Usuari:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Succeix cada 'x'. Per exemple cada cinc minuts, hores, dies, dia laborable o "
-"mes."
+msgid "Add a Scheduled Task"
+msgstr "Afegeix una tasca planificada"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "S'executa cada minut, hora, dia, dia laborable o mes."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Seleccioneu el tipus de tasca planificada</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Execució en un rang."
+msgid "Time expression help"
+msgstr "Ajuda quant a l'expressió de temps"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expressió:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "A:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Des de:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "En un rang"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Un altre"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "Gestiona les tasques"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Vegeu «man 5 crontab» per obtenir informació quant al format del crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Un altre"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "S'executa en un minut, hora, dia, dia laborable o mes específic."
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Seleccioneu una tasca"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "En un rang"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Execució en un rang."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Tasques planificades i actives"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "S'executa cada minut, hora, dia, dia laborable o mes."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Vegeu «man 5 crontab» per obtenir informació quant al format del crontab."
+"Succeix cada 'x'. Per exemple cada cinc minuts, hores, dies, dia laborable o "
+"mes."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Mostra l'ajuda"
+msgid "Configure Scheduled Tasks"
+msgstr "Configura les tasques planificades"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "Desc_ripció:"
+msgid "Edit a scheduled task"
+msgstr "Edita una tasca planificada"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Tasca"
+msgid "Delete a scheduled task"
+msgstr "Suprimeix una tasca planificada"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Plantilla:"
+msgid "Run selected task"
+msgstr "Seleccioneu una tasca"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Ajuda quant a l'expressió de temps"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "_Plantilla:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "A:"
+msgid "Change edit mode"
+msgstr ""
 
-# Gnome_2.6_Desktop [gpdf.HEAD.ca.po]
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Quant a aquesta aplicació"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Escolliu de quin usuari se'n modificaran les tasques"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Mostra l'ajuda"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Usuari:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Quant al Planificador del Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Tasques planificades i actives"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1165,23 +1172,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Aquest registre no és và lid. El motiu pot ser: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/cs.po b/po/cs.po
index f388e05..88845b6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,34 +10,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"schedule&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-02 19:10+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-03 20:15+0100\n"
 "Last-Translator: Marek Černocký <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Spravovat vaše systémové úlohy"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Naplánované úlohy"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Nastavit plánované úlohy"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Spravovat vaše systémové úlohy"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome Schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Nastavit plánované úlohy"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Systémové nástroje"
@@ -103,7 +102,7 @@ msgstr "Měsíc"
 msgid "Weekday"
 msgstr "Den v týdnu"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Základní"
 
@@ -158,12 +157,12 @@ msgstr ""
 "Chyba při analýze pole dne v měsíci, pravděpodobně kvůli chybě v crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Každou minutu"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Každou hodinu"
 
@@ -271,11 +270,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Toto není platné. Důvod: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "V přesnou minutu"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuta:"
 
@@ -284,7 +283,7 @@ msgstr "Minuta:"
 msgid "At an exact hour"
 msgstr "V přesnou hodinu"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hodina:"
 
@@ -293,7 +292,7 @@ msgstr "Hodina:"
 msgid "On a day"
 msgstr "Ve dni"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Den:"
 
@@ -302,7 +301,7 @@ msgstr "Den:"
 msgid "In a month"
 msgstr "V měsíci"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Měsíc:"
 
@@ -311,15 +310,15 @@ msgstr "Měsíc:"
 msgid "On a weekday"
 msgstr "Ve dni v týdnu"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Den v týdnu:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "V krocích o délce"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuty:"
 
@@ -340,8 +339,8 @@ msgid "Weekdays:"
 msgstr "Dny v týdnu:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "O _aplikaci"
+msgid "_Manage tasks"
+msgstr "_Spravovat úlohy"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -352,8 +351,8 @@ msgid "_Help"
 msgstr "_Nápověda"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Spravovat úlohy"
+msgid "A_bout"
+msgstr "O _aplikaci"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -446,64 +445,70 @@ msgstr[1] "Dokončeno, naimportováno: celkem %d úlohy."
 msgstr[2] "Dokončeno, naimportováno: celkem %d úloh."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Vybrat Å¡ablonu"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Vytvořit novou úlohu ze zvolené šablony"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Spravovat Å¡ablony"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Zvolte uživatele, jehož úlohy chcete upravit</b>"
+msgid "Create a new template."
+msgstr "Vytvořit novou šablonu."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Zvolte typ plánované úlohy:</b>"
+msgid "Edit the selected template"
+msgstr "Upravit zvolenou Å¡ablonu"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Náhled</big>"
+msgid "Delete the selected template"
+msgstr "Odstranit zvolenou Å¡ablonu"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>ÄŒas a datum</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "O Gnome Schedule"
+msgid "Task description:"
+msgstr "Popis úlohy:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Přidání plánované úlohy"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Aplikace pro X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Přidat jako šablonu"
+msgid "Execute at:"
+msgstr "Spustit v:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Pokročilé"
+msgid "Date:"
+msgstr "Datum:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "ÄŒas:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Změnit uživatele"
+msgid "Task:"
+msgstr "Úloha:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Změnit režim úprav"
+msgid "Add as template"
+msgstr "Přidat jako šablonu"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Vybrat Å¡ablonu"
+msgid "Edit a periodical task"
+msgstr "Upravit opakující se úlohu"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Zvolte uživatele, jehož úlohy chcete upravit"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -511,146 +516,140 @@ msgid "Command:"
 msgstr "Příkaz:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Nastavit plánované úlohy"
+msgid "Description:"
+msgstr "Popis:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Vytvořit novou úlohu ze zvolené šablony"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Vytvořit novou šablonu."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>ÄŒas a datum</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Datum:"
+msgid "Advanced"
+msgstr "Pokročilé"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Odstranit plánovanou úlohu"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Odstranit zvolenou Å¡ablonu"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Popis:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Upravit opakující se úlohu"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Upravit plánovanou úlohu"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Náhled</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Upravit zvolenou Å¡ablonu"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Změnit uživatele"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Spustit v:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Zvolte uživatele, jehož úlohy chcete upravit</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Spouštění v určitou minutu, hodinu, den, den v týdnu nebo měsíc."
+msgid "_User:"
+msgstr "_Uživatel:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Spouštění s pravidelným intervalem. Například každých pět minut, hodin, dnů, "
-"dnů v týdnu nebo měsíců."
+msgid "Add a Scheduled Task"
+msgstr "Přidání plánované úlohy"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Spouštění každou minutu, hodinu, den, den v týdnu nebo měsíc."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Zvolte typ plánované úlohy:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Spouštění v rozsahu."
+msgid "Time expression help"
+msgstr "Nápověda o výrazech času"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Výraz:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Do:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "V rozsahu"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Jiné"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Spravovat Å¡ablony"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Více informací o formátu crontab naleznete v „man 5 crontab“."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Jiné"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Spouštění v určitou minutu, hodinu, den, den v týdnu nebo měsíc."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Spustit zvolenou úlohu"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "V rozsahu"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Spustit úlohu"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Spouštění v rozsahu."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Plánované a aktiní úlohy"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Spouštění každou minutu, hodinu, den, den v týdnu nebo měsíc."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Více informací o formátu crontab naleznete v „man 5 crontab“."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Spouštění s pravidelným intervalem. Například každých pět minut, hodin, dnů, "
+"dnů v týdnu nebo měsíců."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Zobrazit nápovědu"
+msgid "Configure Scheduled Tasks"
+msgstr "Nastavit plánované úlohy"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Popis úlohy:"
+msgid "Edit a scheduled task"
+msgstr "Upravit plánovanou úlohu"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Úloha:"
+msgid "Delete a scheduled task"
+msgstr "Odstranit plánovanou úlohu"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Å ablony"
+msgid "Run selected task"
+msgstr "Spustit zvolenou úlohu"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Nápověda o výrazech času"
+msgid "Run task"
+msgstr "Spustit úlohu"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "ÄŒas:"
+msgid "Templates"
+msgstr "Å ablony"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Do:"
+msgid "Change edit mode"
+msgstr "Změnit režim úprav"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Aplikace pro X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Zvolte uživatele, jehož úlohy chcete upravit"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Zobrazit nápovědu"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Uživatel:"
+msgid "About Gnome-schedule"
+msgstr "O Gnome Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Plánované a aktiní úlohy"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1236,4 +1235,4 @@ msgstr "Nebudu nikdy zobrazena."
 
 #: ../src/xwrapper.py:158
 msgid "xwrapper.py: completed"
-msgstr "xwrapper.py: dokončeno"
\ No newline at end of file
+msgstr "xwrapper.py: dokončeno"
diff --git a/po/da.po b/po/da.po
index 87d22cd..7cdf6c7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-21 10:18+0100\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2012-01-14 15:50+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk klid dk>\n"
diff --git a/po/de.po b/po/de.po
index 4dd4e96..988d650 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,44 +8,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"schedule&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-02 19:10+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-06 21:30+0100\n"
 "Last-Translator: Mario Blättermann <mario blaettermann gmail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Zeitgesteuerte Systemaufgaben verwalten"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Geplante Aufgaben"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Bearbeiten zeitgesteuerter Systemaufgaben"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Zeitgesteuerte Systemaufgaben verwalten"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "GNOME Schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Bearbeiten zeitgesteuerter Systemaufgaben"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Systemwerkzeuge"
 
 #: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
-"Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule are "
-"writable."
+"Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
+"are writable."
 msgstr ""
 "Datenordner konnte nicht erstellt werden: Stellen Sie sicher, dass Sie über "
 "Schreibrechte in ~/.gnome und ~/.gnome/gnome-schedule verfügen."
@@ -53,8 +52,8 @@ msgstr ""
 #: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
-"Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-schedule "
-"are writable."
+"Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
+"schedule are writable."
 msgstr ""
 "Datenordner konnte nicht erstellt werden: %s. Stellen Sie sicher, dass Sie "
 "über Schreibrechte in ~/.gnome und ~/.gnome/gnome-schedule verfügen."
@@ -104,7 +103,7 @@ msgstr "Monat"
 msgid "Weekday"
 msgstr "Wochentag"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Grundlegend"
 
@@ -156,16 +155,16 @@ msgstr "Wochentag"
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
-"Die Felder für Tag und Monat konnten nicht verarbeitet werden. Möglicherweise "
-"ist crontab fehlerhaft."
+"Die Felder für Tag und Monat konnten nicht verarbeitet werden. "
+"Möglicherweise ist crontab fehlerhaft."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Jede Minute"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Jede Stunde"
 
@@ -219,13 +218,13 @@ msgid ""
 "more information about the % character. If you don not want to use it for "
 "redirection it must be properly escaped with the \\ letter."
 msgstr ""
-"Ihr Befehl enthält ein oder mehrere %-Zeichen. Diese werden speziell für cron "
-"gedacht und können nicht mit GNOME-Schedule verwendet werden, weil sie für "
-"das Speichern zusätzlicher Daten in der crontab-Zeile verwendet werden. Bitte "
-"verwenden Sie das »|«-Zeichen, um zusätzliche Funktionalität hinzuzufügen. "
-"Ziehen sie das crontab-Handbuch zu Rate, um Informationen über die Verwendung "
-"des %-Zeichens zu erhalten. Falls Sie es nicht für Ersetzungen verwenden, "
-"muss es sauber mit einem \\-Zeichen maskiert werden."
+"Ihr Befehl enthält ein oder mehrere %-Zeichen. Diese werden speziell für "
+"cron gedacht und können nicht mit GNOME-Schedule verwendet werden, weil sie "
+"für das Speichern zusätzlicher Daten in der crontab-Zeile verwendet werden. "
+"Bitte verwenden Sie das »|«-Zeichen, um zusätzliche Funktionalität "
+"hinzuzufügen. Ziehen sie das crontab-Handbuch zu Rate, um Informationen über "
+"die Verwendung des %-Zeichens zu erhalten. Falls Sie es nicht für "
+"Ersetzungen verwenden, muss es sauber mit einem \\-Zeichen maskiert werden."
 
 #: ../src/crontabEditor.py:456
 msgid ""
@@ -275,11 +274,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Ungültige Angaben. Grund: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Zu einer bestimmten Minute"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minute:"
 
@@ -288,7 +287,7 @@ msgstr "Minute:"
 msgid "At an exact hour"
 msgstr "Zu einer bestimmten Stunde"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Stunde:"
 
@@ -297,7 +296,7 @@ msgstr "Stunde:"
 msgid "On a day"
 msgstr "Zu einem bestimmten Tag"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Tag:"
 
@@ -306,7 +305,7 @@ msgstr "Tag:"
 msgid "In a month"
 msgstr "In einem bestimmten Monat"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Monat:"
 
@@ -315,15 +314,15 @@ msgstr "Monat:"
 msgid "On a weekday"
 msgstr "An einem bestimmten Wochentag"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Wochentag:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "In einer Schrittweite"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuten:"
 
@@ -344,8 +343,8 @@ msgid "Weekdays:"
 msgstr "Wochentage:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Info"
+msgid "_Manage tasks"
+msgstr "Systemaufgaben _verwalten"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -356,8 +355,8 @@ msgid "_Help"
 msgstr "_Hilfe"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "Systemaufgaben _verwalten"
+msgid "A_bout"
+msgstr "_Info"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -448,64 +447,70 @@ msgstr[0] "Abgeschlossen, insgesamt %d Aufgabe wurde importiert."
 msgstr[1] "Abgeschlossen, insgesamt %d Aufgaben wurden importiert."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Vorlage wählen"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Eine neue Augabe aus der ausgewählten Vorlage erstellen"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Vorlagen verwalten"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Auswahl des Besitzers der zu bearbeitenden Systemaufgaben</b>"
+msgid "Create a new template."
+msgstr "Eine neue Vorlage erstellen."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Art der geplanten Aufgabe auswählen:</b>"
+msgid "Edit the selected template"
+msgstr "Ausgewählte Vorlage bearbeiten"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<b>Vorschau</b>"
+msgid "Delete the selected template"
+msgstr "Die ausgewählte Vorlage löschen"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Zeit und Datum</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Info zu GNOME Schedule"
+msgid "Task description:"
+msgstr "Beschreibung:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Eine Aufgabe hinzufügen"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X-Anwendung"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Als Vorlage hinzufügen"
+msgid "Execute at:"
+msgstr "Ausführungszeitpunkt:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Erweitert"
+msgid "Date:"
+msgstr "Datum:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Zeit:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Benutzer wechseln"
+msgid "Task:"
+msgstr "Aufgabe:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Bearbeitungsmodus wählen"
+msgid "Add as template"
+msgstr "Als Vorlage hinzufügen"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Vorlage wählen"
+msgid "Edit a periodical task"
+msgstr "Eine wiederkehrende Aufgabe bearbeiten"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Auswahl des Besitzers der zu bearbeitenden Systemaufgaben"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -513,150 +518,144 @@ msgid "Command:"
 msgstr "Befehl:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Zeitgesteuerte Systemaufgaben bearbeiten"
+msgid "Description:"
+msgstr "Beschreibung:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Eine neue Augabe aus der ausgewählten Vorlage erstellen"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Eine neue Vorlage erstellen."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Zeit und Datum</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Datum:"
+msgid "Advanced"
+msgstr "Erweitert"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Eine Aufgabe löschen"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Die ausgewählte Vorlage löschen"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Beschreibung:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Eine wiederkehrende Aufgabe bearbeiten"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Eine Aufgabe bearbeiten"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<b>Vorschau</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Ausgewählte Vorlage bearbeiten"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Benutzer wechseln"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Ausführungszeitpunkt:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Auswahl des Besitzers der zu bearbeitenden Systemaufgaben</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"Ausführung zu genau einer Minute, einer Stunde, einem Tag, einem Wochentag "
-"oder einem Monat."
+msgid "_User:"
+msgstr "_Benutzer:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Ausführung in bestimmten Abständen. Zum Beispiel alle fünf Minuten, Stunden, "
-"Tage, Wochentage oder Monate."
+msgid "Add a Scheduled Task"
+msgstr "Eine Aufgabe hinzufügen"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr ""
-"Ausführung zu jeder Minute, jeder Stunde, jedem Tag, jedem Wochentag oder "
-"jedem Monat."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Art der geplanten Aufgabe auswählen:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Ausführung zu jedem Ereignis zwischen den beiden Angaben."
+msgid "Time expression help"
+msgstr "Hilfe zum Zeitausdruck"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Ausdruck:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Endend mit:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Beginnend bei:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "In einer Spanne"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Anderer Ausdruck"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Vorlagen verwalten"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Siehe »man 5 crontab« für nähere Informationen zum Crontab-Format."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Anderer Ausdruck"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+"Ausführung zu genau einer Minute, einer Stunde, einem Tag, einem Wochentag "
+"oder einem Monat."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Ausgewählte Aufgabe ausführen"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "In einer Spanne"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Auufgabe ausführen"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Ausführung zu jedem Ereignis zwischen den beiden Angaben."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Geplante und aktivierte Aufgaben"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr ""
+"Ausführung zu jeder Minute, jeder Stunde, jedem Tag, jedem Wochentag oder "
+"jedem Monat."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Siehe »man 5 crontab« für nähere Informationen zum Crontab-Format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Ausführung in bestimmten Abständen. Zum Beispiel alle fünf Minuten, Stunden, "
+"Tage, Wochentage oder Monate."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Hilfe anzeigen"
+msgid "Configure Scheduled Tasks"
+msgstr "Zeitgesteuerte Systemaufgaben bearbeiten"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Beschreibung:"
+msgid "Edit a scheduled task"
+msgstr "Eine Aufgabe bearbeiten"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Aufgabe:"
+msgid "Delete a scheduled task"
+msgstr "Eine Aufgabe löschen"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Vorlagen"
+msgid "Run selected task"
+msgstr "Ausgewählte Aufgabe ausführen"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Hilfe zum Zeitausdruck"
+msgid "Run task"
+msgstr "Auufgabe ausführen"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Zeit:"
+msgid "Templates"
+msgstr "Vorlagen"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Endend mit:"
+msgid "Change edit mode"
+msgstr "Bearbeitungsmodus wählen"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X-Anwendung"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Auswahl des Besitzers der zu bearbeitenden Systemaufgaben"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Hilfe anzeigen"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Benutzer:"
+msgid "About Gnome-schedule"
+msgstr "Info zu GNOME Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Geplante und aktivierte Aufgaben"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -881,7 +880,8 @@ msgstr "An jedem Wochentag. %(weekday)s im %(month)s zu jeder Minute"
 msgid ""
 "On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
 msgstr ""
-"An jedem Wochentag. %(weekday)s im %(month)s zu Minute %(minute)s jeder Stunde"
+"An jedem Wochentag. %(weekday)s im %(month)s zu Minute %(minute)s jeder "
+"Stunde"
 
 #: ../src/lang.py:267
 #, python-format
@@ -1148,13 +1148,13 @@ msgstr "Kalender"
 
 #: ../src/atEditor.py:515
 msgid ""
-"In one or both of the fields hour and minute there was entered a letter, or a "
-"number out of range. Remember an hour only has 60 minutes and a day only 24 "
-"hours."
+"In one or both of the fields hour and minute there was entered a letter, or "
+"a number out of range. Remember an hour only has 60 minutes and a day only "
+"24 hours."
 msgstr ""
-"In einem oder beiden Feldern für Stunde und Minute wurden Werte außerhalb des "
-"möglichen Bereichs eingegeben. Beachten Sie, dass eine Stunde 60 Minuten hat "
-"und ein Tag 24 Stunden."
+"In einem oder beiden Feldern für Stunde und Minute wurden Werte außerhalb "
+"des möglichen Bereichs eingegeben. Beachten Sie, dass eine Stunde 60 Minuten "
+"hat und ein Tag 24 Stunden."
 
 #: ../src/atEditor.py:576
 #, python-format
@@ -1200,7 +1200,8 @@ msgstr "Falsche Anzahl von Argumenten."
 #: ../src/xwrapper.py:73 ../src/xwrapper.py:81
 msgid ""
 "Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for "
-"applications to be run from crontab or at under X. Use through gnome-schedule."
+"applications to be run from crontab or at under X. Use through gnome-"
+"schedule."
 msgstr ""
 "Wrapper-Skript für Gnome-schedule (http://gnome-schedule.sf.net) zur "
 "Anwendungsausführung in der crontab oder unter X. Wird von gnome-schedule "
diff --git a/po/dz.po b/po/dz.po
index 7d46ff2..d118467 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule.HEAD.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2007-06-22 11:26+0530\n"
 "Last-Translator: yumkee lhamo <yumkeyl08 hotmail com>\n"
 "Language-Team: Dzongkha <pgeyleg dit gov bt>\n"
@@ -21,57 +21,64 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "ཁྱོད་རའི་ལས་ཀ་ཚུ་ འཛིན་སྐྱོང་འཐབ་"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཁ་སྐོང་རྐྱབས་"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཚུ་ རིམ་སྒྲིག་འབདཝ་ཨིན་"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "ཁྱོད་རའི་ལས་ཀ་ཚུ་ འཛིན་སྐྱོང་འཐབ་"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "ཇི་ནོམ་འཆར་རིམ་"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཚུ་ རིམ་སྒྲིག་འབདཝ་ཨིན་"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "རིམ་ལུགས་ལག་ཆས་"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "%(time)s ལུ་ %(date)s གུ་"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "ཚར་ཅིག་"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "ཉེན་བརྡ་: ཨེ་ཊི་ཀིའུ་ཨའུཊི་པུཊི་ནང་གི་གྲལ་ཐིག་ཅིག་ མིང་དཔྱད་མ་འབད་བས་"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "མགོ་མིང་མ་བཏགསཔ་"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "སྐར་མ་"
@@ -92,7 +99,7 @@ msgstr "ཟླ་"
 msgid "Weekday"
 msgstr "བདུན་ཕྲག་ཉིནམ་"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "གཞི་རིམ་"
 
@@ -111,52 +118,47 @@ msgstr "%(min)s དང་ %(max)s གཉིས་ཀྱི་སྦུག་ན
 msgid "%s is not a number"
 msgstr "%s འདི་ ཨང་གྲངས་མེན་"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "མགོ་མིང་མ་བཏགསཔ་"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "ལོག་འབྱུང་བའི་"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "རི་བུཊི་ལུ་"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "སྐར་མ་"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "ཆུ་ཚོད་"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "ཉིནམ་"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "ཟླ་"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "བདུན་ཕྲག་ཉིནམ་"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "སྐར་མ་རེ་རེ་ནང་"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "ཆུ་ཚོད་རེ་རེ་ནང་"
 
@@ -174,21 +176,21 @@ msgstr "བདུན་ཕྲག་ཨ་རྟག་ར་"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ གསར་བསྐྲུན་འབད་"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "ཊེམ་པེལེཊི་:(_T)"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "ལས་ཀ་ ཁ་སྐོང་རྐྱབས་(_A)"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཞུན་དག་འབད་"
 
@@ -226,11 +228,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -268,11 +270,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "འདི་ནུས་མེད་ཨིན། རྒྱུ་མཚན་: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "དཀར་མ་ཏག་ཏ་ལུ་"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "དཀར་མ་:"
 
@@ -281,7 +283,7 @@ msgstr "དཀར་མ་:"
 msgid "At an exact hour"
 msgstr "ཆུ་ཚོད་ཏག་ཏ་ལུ་ "
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "ཆུ་ཚོད་:"
 
@@ -290,7 +292,7 @@ msgstr "ཆུ་ཚོད་:"
 msgid "On a day"
 msgstr "ཉིནམ་ལུ་ "
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "ཉིནམ་:"
 
@@ -299,7 +301,7 @@ msgstr "ཉིནམ་:"
 msgid "In a month"
 msgstr "ཟླཝ་ཅིག་ནང་ "
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "ཟླ་:"
 
@@ -308,15 +310,15 @@ msgstr "ཟླ་:"
 msgid "On a weekday"
 msgstr "བདུན་ཕྲག་ཉིནམ་ལུ་"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "བདུན་ཕྲག་ཉིནམ་:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "གོ་རིམ་རྒྱ་ཚད་ཅིག་ནང་"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "དཀར་མ་ཚུ་:"
 
@@ -337,8 +339,8 @@ msgid "Weekdays:"
 msgstr "བདུན་ཕྲག་ཉིནམ་ཚུ་:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "སྐོར་ལས་(_b)"
+msgid "_Manage tasks"
+msgstr "ལས་ཀ་ འཛིན་སྐྱོང་འཐབ་(_M)"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -349,8 +351,8 @@ msgid "_Help"
 msgstr "གྲོགས་རམ་(_H)"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "ལས་ཀ་ འཛིན་སྐྱོང་འཐབ་(_M)"
+msgid "A_bout"
+msgstr "སྐོར་ལས་(_b)"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -381,13 +383,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -434,72 +439,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "ལས་ཀ་ འཛིན་སྐྱོང་འཐབ་(_M)"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>ཁྱོད་ཀྱིས་ ག་གི་ལས་ཀ་ལེགས་བཅོས་འབད་ནི་ཨིན་ན་ ལག་ལེན་པ་གདམ་ཁ་རྐྱབས་</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "ལས་ཀ་ ཁ་སྐོང་རྐྱབས་(_A)"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>འཆར་རིམ་ཅན་གྱི་ལས་ཀའི་དབྱེ་བ་ སེལ་འཐུ་འབད་</b>"
+msgid "Edit the selected template"
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>སྔོན་ལྟ་</b>"
+msgid "Delete the selected template"
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "ཇི་ནོམ་འཆར་རིམ་གྱི་སྐོར་ལས་"
+msgid "Task description:"
+msgstr "འགྲེལ་བཤད་:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཁ་སྐོང་རྐྱབས་"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "གློག་རིམ་འདི་གི་སྐོར་ལས་"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "ལས་ཀ་ ཁ་སྐོང་རྐྱབས་(_A)"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "མཐོ་རིམ་ཅན་"
+#, fuzzy
+msgid "Date:"
+msgstr "ཚེས་གྲངས་:(_D)"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "ལག་ལེན་པ་ བསྒྱུར་བཅོས་འབད་"
+#, fuzzy
+msgid "Task:"
+msgstr "ལས་ཀ་(_T)"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "ལས་ཀ་ ཁ་སྐོང་རྐྱབས་(_A)"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཞུན་དག་འབད་"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "ཁྱོད་ཀྱིས་ ག་གི་ལས་ཀ་ཚུ་ལེགས་བཅོས་འབད་ནི་ཨིན་ན་ གདམ་ཁ་རྐྱབས་"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -508,160 +528,147 @@ msgid "Command:"
 msgstr "བརྡ་བཀོད་:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཚུ་ རིམ་སྒྲིག་འབད་"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
+msgid "Description:"
+msgstr "འགྲེལ་བཤད་:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "ལས་ཀ་ ཁ་སྐོང་རྐྱབས་(_A)"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "ཚེས་གྲངས་:(_D)"
+msgid "Advanced"
+msgstr "མཐོ་རིམ་ཅན་"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ བཏོན་གཏང་"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "འགྲེལ་བཤད་:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཞུན་དག་འབད་"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཞུན་དག་འབད་"
+msgid "<big>Preview</big>"
+msgstr "<b>སྔོན་ལྟ་</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་ཊེམ་པེལེཊི་ བཏོན་གཏང་"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "ལག་ལེན་པ་ བསྒྱུར་བཅོས་འབད་"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>ཁྱོད་ཀྱིས་ ག་གི་ལས་ཀ་ལེགས་བཅོས་འབད་ནི་ཨིན་ན་ ལག་ལེན་པ་གདམ་ཁ་རྐྱབས་</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"དམིགས་བསལ་དཀར་ཆ་དང་ཆུ་ཚོད་ དེ་ལས་ཉིན་མ་དང་བདུན་ཕྲག་ནང་ ཡང་ན་ ཟླཝ་ནང་ལུ་ལག་ལེན་འཐབ་ནི།"
+msgid "_User:"
+msgstr "ལག་ལེན་པ་:(_U)"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"གོ་རིམ་རྒྱ་ཚད་ལུ་ ལག་ལེན་འཐབ་ནི། དཔེར་ན་ དཀར་མ་རེ་རེ་ནང་ དེ་ལས་ཆུ་ཚོད་དང་ཉིནམ་ བདུན་ཕྲག་ "
-"ཡངན་ ཟླཝ་རེ་རེ་ནང་བཞིན།"
+msgid "Add a Scheduled Task"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཁ་སྐོང་རྐྱབས་"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "དཀར་མ་དང་ཆུ་ཚོད་ དེ་ལས་ཉིནམ་དང་བདུན་ཕྲག་རེ་རེ་བཞིན་ ཡངན་ ཟླཝ་ལྟ་བུ་ར་ལག་ལེན་འཐབ་པ།"
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>འཆར་རིམ་ཅན་གྱི་ལས་ཀའི་དབྱེ་བ་ སེལ་འཐུ་འབད་</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "ཁྱབ་ཚད་ནང་གི་ལག་ལེན་"
+msgid "Time expression help"
+msgstr "ཆུ་ཚོད་གསལ་བརྗོད་གྲོགས་རམ་"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "ཨེབ་བཙུགས་:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "ལུ་:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "ལས་:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "ཁྱབ་ཚད་ནང་"
-
-#: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "ལས་ཀ་ འཛིན་སྐྱོང་འཐབ་(_M)"
-
-#: ../src/gnome-schedule.glade.h:47
+#: ../src/gnome-schedule.glade.h:42
 msgid "Other"
 msgstr "གཞན་"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "ལས་ཀ་ཅིག་ སེལ་འཐུ་འབད་"
+#: ../src/gnome-schedule.glade.h:43
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "ཀོརོན་ཊེབ་རྩ་སྒྲིག་སྐོར་ལས་ བརྡ་དོན་གྱི་དོན་ལུ་ \"man 5 crontab\" ལུ་བལྟ།"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
 msgstr ""
+"དམིགས་བསལ་དཀར་ཆ་དང་ཆུ་ཚོད་ དེ་ལས་ཉིན་མ་དང་བདུན་ཕྲག་ནང་ ཡང་ན་ ཟླཝ་ནང་ལུ་ལག་ལེན་འཐབ་ནི།"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "འཆར་རིམ་ཅན་དང་ཤུགས་ལྡན་ལས་ཀ་ཚུ་"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "ཁྱབ་ཚད་ནང་"
+
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "ཁྱབ་ཚད་ནང་གི་ལག་ལེན་"
+
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "དཀར་མ་དང་ཆུ་ཚོད་ དེ་ལས་ཉིནམ་དང་བདུན་ཕྲག་རེ་རེ་བཞིན་ ཡངན་ ཟླཝ་ལྟ་བུ་ར་ལག་ལེན་འཐབ་པ།"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "ཀོརོན་ཊེབ་རྩ་སྒྲིག་སྐོར་ལས་ བརྡ་དོན་གྱི་དོན་ལུ་ \"man 5 crontab\" ལུ་བལྟ།"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"གོ་རིམ་རྒྱ་ཚད་ལུ་ ལག་ལེན་འཐབ་ནི། དཔེར་ན་ དཀར་མ་རེ་རེ་ནང་ དེ་ལས་ཆུ་ཚོད་དང་ཉིནམ་ བདུན་ཕྲག་ "
+"ཡངན་ ཟླཝ་རེ་རེ་ནང་བཞིན།"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "གྲོགས་རམ་སྟོན་"
+msgid "Configure Scheduled Tasks"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཚུ་ རིམ་སྒྲིག་འབད་"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "འགྲེལ་བཤད་:"
+msgid "Edit a scheduled task"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ ཞུན་དག་འབད་"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "ལས་ཀ་(_T)"
+msgid "Delete a scheduled task"
+msgstr "འཆར་རིམ་ཅན་གྱི་ལས་ཀ་ཅིག་ བཏོན་གཏང་"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "ཊེམ་པེལེཊི་:(_T)"
+msgid "Run selected task"
+msgstr "ལས་ཀ་ཅིག་ སེལ་འཐུ་འབད་"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "ཆུ་ཚོད་གསལ་བརྗོད་གྲོགས་རམ་"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "ཊེམ་པེལེཊི་:(_T)"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "ལུ་:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "གློག་རིམ་འདི་གི་སྐོར་ལས་"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "ཁྱོད་ཀྱིས་ ག་གི་ལས་ཀ་ཚུ་ལེགས་བཅོས་འབད་ནི་ཨིན་ན་ གདམ་ཁ་རྐྱབས་"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "གྲོགས་རམ་སྟོན་"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "ལག་ལེན་པ་:(_U)"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "ཇི་ནོམ་འཆར་རིམ་གྱི་སྐོར་ལས་"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "འཆར་རིམ་ཅན་དང་ཤུགས་ལྡན་ལས་ཀ་ཚུ་"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1130,11 +1137,11 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 #, fuzzy
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
@@ -1145,12 +1152,12 @@ msgstr ""
 "བཀོད་དེ་འདུགཉིམ་གཅིག་ནང་ཆུ་ཚོད་ ༢༤ རྐྱངམ་ཅིག་དང་ཚུ་ཚོད་ཅིག་ནང་སྐར་མ་ ༦༠ རྐྱངམ་ཅིག་ཡོདཔ་ཨིནམ་སེམས་"
 "ཁར་བཞག"
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "འ་ནི་འདི་ནུས་མེད་ཀྱི་དྲན་ཐོ་ཨིན་! དཀའ་ངལ་འདི་ཡང་ : %s ཨིན་དགོ"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/el.po b/po/el.po
index b280c37..f0e27e5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,48 +8,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-schedule&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-11-02 19:10+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2012-07-26 12:38+0200\n"
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: Greek <nls tux hellug gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.3.1\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Διαχείριση του εργασιών συστήματος"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Προγραμματισμένες εργασίες"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Ρύθμιση των προγραμματισμένων εργασιών"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Διαχείριση του εργασιών συστήματος"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Ρύθμιση των προγραμματισμένων εργασιών"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Εργαλεία συστήματος"
 
-#: ../src/at.py:112
-#: ../src/crontab.py:62
-msgid "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Αδυναμία δημιουργίας καταλόγου! Βεβαιωθείτε ότι έχετε δικαιώματα εγγραφής στα ~/.gnome και 
~/.gnome/gnome-schedule"
+#: ../src/at.py:112 ../src/crontab.py:62
+msgid ""
+"Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
+"are writable."
+msgstr ""
+"Αδυναμία δημιουργίας καταλόγου! Βεβαιωθείτε ότι έχετε δικαιώματα εγγραφής "
+"στα ~/.gnome και ~/.gnome/gnome-schedule"
 
-#: ../src/at.py:145
-#: ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
-msgid "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Αδυναμία δημιουργίας καταλόγου: %s. Βεβαιωθείτε ότι έχετε δικαιώματα εγγραφής στα ~/.gnome και 
~/.gnome/gnome-schedule"
+msgid ""
+"Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
+"schedule are writable."
+msgstr ""
+"Αδυναμία δημιουργίας καταλόγου: %s. Βεβαιωθείτε ότι έχετε δικαιώματα "
+"εγγραφής στα ~/.gnome και ~/.gnome/gnome-schedule"
 
 #: ../src/at.py:547
 #, python-format
@@ -61,22 +67,17 @@ msgstr "Προειδοποίηση! Άγνωστη εργασία: %(preview)s"
 msgid "On %(timestring)s"
 msgstr "Στις %(timestring)s"
 
-#: ../src/at.py:560
-#: ../src/at.py:565
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Μία φορά"
 
 #: ../src/at.py:569
-#| msgid "Warning: a line in atq's output didn't parse"
 msgid "Warning: a line in atq's output didn't parse:"
-msgstr "Προειδοποίηση: μια γραμμή στην έξοδο του atq δεν ήταν δυνατό να διαβαστεί:"
-
-#: ../src/at.py:624
-#: ../src/crontab.py:288
-#: ../src/crontab.py:334
-#: ../src/crontabEditor.py:275
-#: ../src/atEditor.py:127
-#: ../src/atEditor.py:523
+msgstr ""
+"Προειδοποίηση: μια γραμμή στην έξοδο του atq δεν ήταν δυνατό να διαβαστεί:"
+
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
 #: ../src/atEditor.py:549
 msgid "Untitled"
 msgstr "Ανώνυμο"
@@ -101,8 +102,7 @@ msgstr "Μήνας"
 msgid "Weekday"
 msgstr "Εργάσιμη ημέρα"
 
-#: ../src/crontab.py:192
-#: ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Βασικές"
 
@@ -111,9 +111,7 @@ msgstr "Βασικές"
 msgid "This is not a valid special record: %(record)s"
 msgstr "Μη έγκυρη εγγραφή: %(record)s"
 
-#: ../src/crontab.py:220
-#: ../src/crontab.py:225
-#: ../src/crontab.py:229
+#: ../src/crontab.py:220 ../src/crontab.py:225 ../src/crontab.py:229
 #, python-format
 msgid "Must be between %(min)s and %(max)s"
 msgstr "Πρέπει να είναι ανάμεσα σε %(min)s και %(max)s"
@@ -123,16 +121,12 @@ msgstr "Πρέπει να είναι ανάμεσα σε %(min)s και %(max)s"
 msgid "%s is not a number"
 msgstr "το %s δεν είναι αριθμός"
 
-#: ../src/crontab.py:455
-#: ../src/crontab.py:457
-#: ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Επαναλαμβανόμενο"
 
-#: ../src/crontab.py:455
-#: ../src/crontabEditor.py:74
-#: ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Στην επανεκκίνηση"
 
@@ -157,28 +151,27 @@ msgid "weekday"
 msgstr "εργάσιμη ημέρα"
 
 #: ../src/crontab.py:576
-msgid "Failed to parse the Day of Month field, possibly due to a bug in crontab."
-msgstr "Αποτυχία εισαγωγής του πεδίου της Ημέρας του Μήνα, πιθανόν λόγω προβλήματος στο crontab."
+msgid ""
+"Failed to parse the Day of Month field, possibly due to a bug in crontab."
+msgstr ""
+"Αποτυχία εισαγωγής του πεδίου της Ημέρας του Μήνα, πιθανόν λόγω προβλήματος "
+"στο crontab."
 
-#: ../src/crontabEditor.py:69
-#: ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Κάθε λεπτό"
 
-#: ../src/crontabEditor.py:70
-#: ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Κάθε ώρα"
 
-#: ../src/crontabEditor.py:71
-#: ../src/crontabEditorHelper.py:99
+#: ../src/crontabEditor.py:71 ../src/crontabEditorHelper.py:99
 msgid "Every day"
 msgstr "Κάθε ημέρα"
 
-#: ../src/crontabEditor.py:72
-#: ../src/crontabEditorHelper.py:105
+#: ../src/crontabEditor.py:72 ../src/crontabEditorHelper.py:105
 msgid "Every month"
 msgstr "Κάθε μήνα"
 
@@ -187,38 +180,50 @@ msgid "Every week"
 msgstr "Κάθε εβδομάδα"
 
 #. add new task
-#: ../src/crontabEditor.py:131
-#: ../src/crontabEditor.py:142
-#: ../src/atEditor.py:129
-#: ../src/atEditor.py:148
+#: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Δημιουργία μιας νέας προγραμματισμένης εργασίας"
 
-#: ../src/crontabEditor.py:198
-#: ../src/atEditor.py:166
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Επεξεργασία προτύπου"
 
-#: ../src/crontabEditor.py:223
-#: ../src/atEditor.py:188
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Νέο πρότυπο"
 
-#: ../src/crontabEditor.py:249
-#: ../src/atEditor.py:230
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Επεξεργασία μιας προγραμματισμένης εργασίας"
 
-#: ../src/crontabEditor.py:302
-#: ../src/crontabEditor.py:578
+#: ../src/crontabEditor.py:302 ../src/crontabEditor.py:578
 #: ../src/crontabEditor.py:618
 #, python-format
-msgid "This is an invalid record! The problem could be in the %(field)s field. Reason: %(reason)s"
-msgstr "Αυτή δεν είναι μια έγκυρη εγγραφή! Το πρόβλημα πιθανόν να βρίσκεται στο πεδίο %(field)s. Λόγος: 
%(reason)s"
+msgid ""
+"This is an invalid record! The problem could be in the %(field)s field. "
+"Reason: %(reason)s"
+msgstr ""
+"Αυτή δεν είναι μια έγκυρη εγγραφή! Το πρόβλημα πιθανόν να βρίσκεται στο "
+"πεδίο %(field)s. Λόγος: %(reason)s"
 
 #: ../src/crontabEditor.py:307
-msgid "Your command contains one or more of the character %, this is special for cron and cannot be used 
with Gnome-schedule because of the format it uses to store extra information on the crontab line. Please use 
the | redirector character to achieve the same functionality. Refer to the crontab manual for more 
information about the % character. If you don not want to use it for redirection it must be properly escaped 
with the \\ letter."
-msgstr "Η εντολή περιλαμβάνει το χαρακτήρα % μία ή περισσότερες φορές, ο οποίος χρησιμοποιείται από το cron 
και δεν μπορεί να χρησιμοποιηθεί από το Gnome-schedule λόγω της μορφοποίησης που χρησιμοποιεί για την 
αποθήκευση περαιτέρω πληροφοριών στη γραμμή του crontab. Παρακαλούμε χρησιμοποιείστε το χαρακτήρα 
ανακατεύθυνσης | για να επιτύχετε τη ίδια λειτουργικότητα. Δείτε το εγχειρίδιο χρήσης του crontab για 
περισσότερες πληροφορίες σχετικά με τον χαρακτήρα %. Αν δεν επιθυμείτε να τον χρησιμοποιήσετε για 
ανακατεύθυνση θα πρέπει να προτάσσοντας του το \\."
+msgid ""
+"Your command contains one or more of the character %, this is special for "
+"cron and cannot be used with Gnome-schedule because of the format it uses to "
+"store extra information on the crontab line. Please use the | redirector "
+"character to achieve the same functionality. Refer to the crontab manual for "
+"more information about the % character. If you don not want to use it for "
+"redirection it must be properly escaped with the \\ letter."
+msgstr ""
+"Η εντολή περιλαμβάνει το χαρακτήρα % μία ή περισσότερες φορές, ο οποίος "
+"χρησιμοποιείται από το cron και δεν μπορεί να χρησιμοποιηθεί από το Gnome-"
+"schedule λόγω της μορφοποίησης που χρησιμοποιεί για την αποθήκευση περαιτέρω "
+"πληροφοριών στη γραμμή του crontab. Παρακαλούμε χρησιμοποιείστε το χαρακτήρα "
+"ανακατεύθυνσης | για να επιτύχετε τη ίδια λειτουργικότητα. Δείτε το "
+"εγχειρίδιο χρήσης του crontab για περισσότερες πληροφορίες σχετικά με τον "
+"χαρακτήρα %. Αν δεν επιθυμείτε να τον χρησιμοποιήσετε για ανακατεύθυνση θα "
+"πρέπει να προτάσσοντας του το \\."
 
 #: ../src/crontabEditor.py:456
 msgid ""
@@ -228,17 +233,14 @@ msgid ""
 msgstr ""
 "Σημείωση σχετικά με τον κατάλογο εργασίας των εκτελούμενων εργασιών:\n"
 "\n"
-"Οι επαναλαμβανόμενες εργασίες θα εκτελεστούν από τον αρχικό κατάλογο του χρήστη."
+"Οι επαναλαμβανόμενες εργασίες θα εκτελεστούν από τον αρχικό κατάλογο του "
+"χρήστη."
 
-#: ../src/crontabEditor.py:457
-#: ../src/mainWindow.py:666
-#: ../src/atEditor.py:597
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Χωρίς επανεμφάνιση"
 
-#: ../src/crontabEditor.py:458
-#: ../src/mainWindow.py:667
-#: ../src/atEditor.py:598
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Προειδοποίηση: Κατάλογος εργασίας των εκτελούμενων εργασιών"
 
@@ -272,13 +274,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Αυτό δεν είναι έγκυρο. Λόγος: %s "
 
 #. minute
-#: ../src/crontabEditorHelper.py:231
-#: ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Σε κάποιο λεπτό ακριβώς"
 
-#: ../src/crontabEditorHelper.py:232
-#: ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Λεπτό:"
 
@@ -287,8 +287,7 @@ msgstr "Λεπτό:"
 msgid "At an exact hour"
 msgstr "Σε ώρα ακριβώς"
 
-#: ../src/crontabEditorHelper.py:236
-#: ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ώρα: "
 
@@ -297,8 +296,7 @@ msgstr "Ώρα: "
 msgid "On a day"
 msgstr "Σε ημέρα"
 
-#: ../src/crontabEditorHelper.py:240
-#: ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Ημέρα:"
 
@@ -307,8 +305,7 @@ msgstr "Ημέρα:"
 msgid "In a month"
 msgstr "Το μήνα"
 
-#: ../src/crontabEditorHelper.py:244
-#: ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Μήνας:"
 
@@ -317,18 +314,15 @@ msgstr "Μήνας:"
 msgid "On a weekday"
 msgstr "Την εργάσιμη ημέρα"
 
-#: ../src/crontabEditorHelper.py:248
-#: ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Εργάσιμη ημέρα:"
 
-#: ../src/crontabEditorHelper.py:253
-#: ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Με πλάτος βήματος"
 
-#: ../src/crontabEditorHelper.py:255
-#: ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Λεπτά:"
 
@@ -349,8 +343,8 @@ msgid "Weekdays:"
 msgstr "Εργάσιμες ημέρες:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Περί"
+msgid "_Manage tasks"
+msgstr "Διαχείριση των εργασιών"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -361,8 +355,8 @@ msgid "_Help"
 msgstr "_Βοήθεια"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "Διαχείριση των εργασιών"
+msgid "A_bout"
+msgstr "_Περί"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -453,212 +447,217 @@ msgstr[0] "Τελείωσε, εισήχθη: %d εργασία συνολικά.
 msgstr[1] "Τελείωσε, εισήχθησαν: %d εργασίες συνολικά."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Επιλογή προτύπου"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Δημιουργία νέας εργασίας από το επιλεγμένο πρότυπο"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Διαχείριση προτύπων"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Επιλέξτε το χρήστη του οποίου τις εργασίες επιθυμείτε να επεξεργαστείτε</b>"
+msgid "Create a new template."
+msgstr "Δημιουργία νέου προτύπου."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Επιλέξτε το είδος της προγραμματισμένης εργασίας:</b>"
+msgid "Edit the selected template"
+msgstr "Επεξεργασία του επιλεγμένου προτύπου"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<b>Προεπισκόπηση</b>"
+msgid "Delete the selected template"
+msgstr "Διαγραφή του επιλεγμένου προτύπου"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Ώρα και Ημερομηνία</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Περί του Gnome Schedule"
+msgid "Task description:"
+msgstr "Περιγραφή εργασίας:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Προσθήκη μιας προγραμματισμένης εργασίας"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Εφαρμογή γραφικού περιβάλλοντος"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Προσθήκη ως πρότυπο"
+msgid "Execute at:"
+msgstr "Εκτέλεση:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Για προχωρημένους"
+msgid "Date:"
+msgstr "Ημερομηνία:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Ώρα:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Αλλαγή χρήστη"
+msgid "Task:"
+msgstr "Εργασία:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Αλλαγή τρόπου επεξεργασίας"
+msgid "Add as template"
+msgstr "Προσθήκη ως πρότυπο"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Επιλογή προτύπου"
+msgid "Edit a periodical task"
+msgstr "Επεξεργασία μιας περιοδικής εργασίας"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Επιλέξτε το χρήστη του οποίου τις εργασίες επιθυμείτε να επεξεργαστείτε"
+msgid "ls -l"
+msgstr "ls -l"
 
-#: ../src/gnome-schedule.glade.h:18
-#: ../src/template.py:198
+#: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
 msgid "Command:"
 msgstr "Εντολή:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Ρύθμιση προγραμματισμένων εργασιών"
+msgid "Description:"
+msgstr "Περιγραφή:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Δημιουργία νέας εργασίας από το επιλεγμένο πρότυπο"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Δημιουργία νέου προτύπου."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Ώρα και Ημερομηνία</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Ημερομηνία:"
+msgid "Advanced"
+msgstr "Για προχωρημένους"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Διαγραφή μιας προγραμματισμένης εργασίας"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Διαγραφή του επιλεγμένου προτύπου"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Περιγραφή:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Επεξεργασία μιας περιοδικής εργασίας"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Επεξεργασία μιας προγραμματισμένης εργασίας"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<b>Προεπισκόπηση</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Επεξεργασία του επιλεγμένου προτύπου"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Αλλαγή χρήστη"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Εκτέλεση:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr ""
+"<b>Επιλέξτε το χρήστη του οποίου τις εργασίες επιθυμείτε να επεξεργαστείτε</"
+"b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Εκτέλεση σε ένα συγκεκριμένο λεπτό, ώρα, ημέρα, εργάσιμη ημέρα ή μήνα."
+msgid "_User:"
+msgstr "_Χρήστης:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid "Execution at a step width. For example every five minutes, hours, days, weekdays or months."
-msgstr "Εκτέλεση με βήμα. Για παράδειγμα κάθε πέντε λεπτά, ώρες, ημέρες, εργάσιμες ημέρες ή μήνες."
+msgid "Add a Scheduled Task"
+msgstr "Προσθήκη μιας προγραμματισμένης εργασίας"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Εκτέλεσε σε κάθε λεπτό, ώρα, ημέρα, εργάσιμη ημέρα ή μήνα."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Επιλέξτε το είδος της προγραμματισμένης εργασίας:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Εκτέλεση σε ένα εύρος."
+msgid "Time expression help"
+msgstr "Βοήθεια χρονικής έκφρασης"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Έκφραση:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Προς:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Από"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Με εύρος"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Άλλο"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Διαχείριση προτύπων"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Δείτε το \"man 5 crontab\" για πληροφορίες σχετικά με τη μορφή του crontab"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Άλλο"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Εκτέλεση σε ένα συγκεκριμένο λεπτό, ώρα, ημέρα, εργάσιμη ημέρα ή μήνα."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Εκτέλεση προγραμματισμένης εργασίας"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Με εύρος"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Εκτέλεση εργασίας"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Εκτέλεση σε ένα εύρος."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Προγραμματισμένες και ενεργές εργασίες"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Εκτέλεσε σε κάθε λεπτό, ώρα, ημέρα, εργάσιμη ημέρα ή μήνα."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Δείτε το \"man 5 crontab\" για πληροφορίες σχετικά με τη μορφή του crontab"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Εκτέλεση με βήμα. Για παράδειγμα κάθε πέντε λεπτά, ώρες, ημέρες, εργάσιμες "
+"ημέρες ή μήνες."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Εμφάνιση βοήθειας"
+msgid "Configure Scheduled Tasks"
+msgstr "Ρύθμιση προγραμματισμένων εργασιών"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Περιγραφή εργασίας:"
+msgid "Edit a scheduled task"
+msgstr "Επεξεργασία μιας προγραμματισμένης εργασίας"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Εργασία:"
+msgid "Delete a scheduled task"
+msgstr "Διαγραφή μιας προγραμματισμένης εργασίας"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Πρότυπα"
+msgid "Run selected task"
+msgstr "Εκτέλεση προγραμματισμένης εργασίας"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Βοήθεια χρονικής έκφρασης"
+msgid "Run task"
+msgstr "Εκτέλεση εργασίας"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Ώρα:"
+msgid "Templates"
+msgstr "Πρότυπα"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Προς:"
+msgid "Change edit mode"
+msgstr "Αλλαγή τρόπου επεξεργασίας"
+
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+"Επιλέξτε το χρήστη του οποίου τις εργασίες επιθυμείτε να επεξεργαστείτε"
 
 #: ../src/gnome-schedule.glade.h:60
-#: ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Εφαρμογή γραφικού περιβάλλοντος"
+msgid "Show help"
+msgstr "Εμφάνιση βοήθειας"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Χρήστης:"
+msgid "About Gnome-schedule"
+msgstr "Περί του Gnome Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Προγραμματισμένες και ενεργές εργασίες"
 
-#: ../src/gnome-schedule.py:66
-#: ../src/scheduleapplet.py:67
+#: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
 msgid ""
 "You need to install pyGTK or GTKv2,\n"
@@ -727,8 +726,12 @@ msgstr "Την ημέρα %(monthday)s κάθε μήνα, στο λεπτό %(mi
 
 #: ../src/lang.py:202
 #, python-format
-msgid "On day %(monthday)s of every month at every minute between %(time_from)s and %(time_to)s"
-msgstr "Την ημέρα %(monthday)s κάθε μήνα, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
+msgid ""
+"On day %(monthday)s of every month at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Την ημέρα %(monthday)s κάθε μήνα, κάθε λεπτό μεταξύ %(time_from)s και "
+"%(time_to)s"
 
 #: ../src/lang.py:204
 #, python-format
@@ -752,8 +755,12 @@ msgstr "Κάθε ημέρα του μήνα %(month)s, στο λεπτό %(minut
 
 #: ../src/lang.py:215
 #, python-format
-msgid "On every day in %(month)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Κάθε ημέρα του μήνα %(month)s, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
+msgid ""
+"On every day in %(month)s at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Κάθε ημέρα του μήνα %(month)s, κάθε λεπτό μεταξύ %(time_from)s και "
+"%(time_to)s"
 
 #: ../src/lang.py:217
 #, python-format
@@ -777,8 +784,10 @@ msgstr "Κάθε έτος στις %(date)s, στο λεπτό %(minute)s κάθ
 
 #: ../src/lang.py:228
 #, python-format
-msgid "Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Κάθε έτος στις %(date)s, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
+msgid ""
+"Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Κάθε έτος στις %(date)s, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
 
 #: ../src/lang.py:230
 #, python-format
@@ -802,8 +811,12 @@ msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s, στο λεπτ
 
 #: ../src/lang.py:241
 #, python-format
-msgid "On every weekday: %(weekday)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s, κάθε λεπτό μεταξύ %(time_from)s και "
+"%(time_to)s"
 
 #: ../src/lang.py:243
 #, python-format
@@ -812,33 +825,53 @@ msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s, στις %(time)
 
 #: ../src/lang.py:248
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every full hour"
-msgstr "Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s κάθε ώρα ακριβώς"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"full hour"
+msgstr ""
+"Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s κάθε "
+"ώρα ακριβώς"
 
 #: ../src/lang.py:250
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute"
-msgstr "Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, κάθε λεπτό"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute"
+msgstr ""
+"Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, κάθε "
+"λεπτό"
 
 #: ../src/lang.py:252
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at minute %(minute)s of every hour"
-msgstr "Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, στο λεπτό %(minute)s κάθε 
ώρας"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at minute "
+"%(minute)s of every hour"
+msgstr ""
+"Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, στο "
+"λεπτό %(minute)s κάθε ώρας"
 
 #: ../src/lang.py:254
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, κάθε λεπτό μεταξύ 
%(time_from)s και %(time_to)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, κάθε "
+"λεπτό μεταξύ %(time_from)s και %(time_to)s"
 
 #: ../src/lang.py:256
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
-msgstr "Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, στις %(time)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
+msgstr ""
+"Κάθε ημέρα %(monthday)s κάθε μήνα και κάθε εργάσιμη ημέρα: %(weekday)s, στις "
+"%(time)s"
 
 #: ../src/lang.py:261
 #, python-format
 msgid "On every weekday: %(weekday)s in %(month)s at every full hour"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, κάθε ώρα ακριβώς"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, κάθε ώρα ακριβώς"
 
 #: ../src/lang.py:263
 #, python-format
@@ -847,13 +880,20 @@ msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %
 
 #: ../src/lang.py:265
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, στο λεπτό %(minute)s κάθε ώρας"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, στο λεπτό %(minute)s "
+"κάθε ώρας"
 
 #: ../src/lang.py:267
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, κάθε λεπτό μεταξύ %(time_from)s και 
%(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at every minute between "
+"%(time_from)s and %(time_to)s"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s, κάθε λεπτό μεταξύ "
+"%(time_from)s και %(time_to)s"
 
 #: ../src/lang.py:269
 #, python-format
@@ -862,28 +902,48 @@ msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %
 
 #: ../src/lang.py:274
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every full hour"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s κάθε έτους, κάθε ώρα 
ακριβώς"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every full hour"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s "
+"κάθε έτους, κάθε ώρα ακριβώς"
 
 #: ../src/lang.py:276
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s κάθε έτους, κάθε λεπτό"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s "
+"κάθε έτους, κάθε λεπτό"
 
 #: ../src/lang.py:278
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at minute %(minute)s of every 
hour"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s κάθε έτους, στο λεπτό 
%(minute)s κάθε ώρας"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"minute %(minute)s of every hour"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s "
+"κάθε έτους, στο λεπτό %(minute)s κάθε ώρας"
 
 #: ../src/lang.py:280
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s κάθε έτους, κάθε λεπτό 
μεταξύ %(time_from)s και %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s "
+"κάθε έτους, κάθε λεπτό μεταξύ %(time_from)s και %(time_to)s"
 
 #: ../src/lang.py:282
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at %(time)s"
-msgstr "Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s κάθε έτους, στις %(time)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"%(time)s"
+msgstr ""
+"Σε κάθε εργάσιμη ημέρα: %(weekday)s του μήνα %(month)s και στις %(date)s "
+"κάθε έτους, στις %(time)s"
 
 #: ../src/lang.py:290
 msgid "every minute"
@@ -936,18 +996,15 @@ msgstr "εργάσιμη ημέρα: %s"
 msgid "At %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 msgstr "Στις %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 
-#: ../src/mainWindow.py:71
-#: ../src/examples/dump.py:55
+#: ../src/mainWindow.py:71 ../src/examples/dump.py:55
 msgid "Default behaviour"
 msgstr "Προεπιλεγμένη συμπεριφορά"
 
-#: ../src/mainWindow.py:72
-#: ../src/examples/dump.py:56
+#: ../src/mainWindow.py:72 ../src/examples/dump.py:56
 msgid "Suppress output"
 msgstr "Καταστολή μηνυμάτων εξόδου"
 
-#: ../src/mainWindow.py:74
-#: ../src/examples/dump.py:58
+#: ../src/mainWindow.py:74 ../src/examples/dump.py:58
 msgid "X application: suppress output"
 msgstr "Εφαρμογή γραφικού περιβάλλοντος: καταστολή μηνυμάτων εξόδου"
 
@@ -967,52 +1024,41 @@ msgstr "Από πρότυπο"
 msgid "Add a new task"
 msgstr "Προσ_θήκη εργασίας"
 
-#: ../src/mainWindow.py:286
-#: ../src/mainWindow.py:416
+#: ../src/mainWindow.py:286 ../src/mainWindow.py:416
 #, python-format
 msgid "Editing user: %s"
 msgstr "Επεξεργασία χρήστη: %s"
 
-#: ../src/mainWindow.py:333
-#: ../src/mainWindow.py:344
-#: ../src/mainWindow.py:355
-#: ../src/mainWindow.py:370
-#: ../src/mainWindow.py:381
+#: ../src/mainWindow.py:333 ../src/mainWindow.py:344 ../src/mainWindow.py:355
+#: ../src/mainWindow.py:370 ../src/mainWindow.py:381
 #: ../src/scheduleapplet.py:122
 msgid "ERROR: Could not load icon"
 msgstr "ΣΦΑΛΜΑ: Δεν ήταν δυνατό το άνοιγμα του εικονιδίου"
 
-#: ../src/mainWindow.py:390
-#: ../src/mainWindow.py:396
+#: ../src/mainWindow.py:390 ../src/mainWindow.py:396
 msgid "ERROR: Could not load glade file"
 msgstr "ΣΦΑΛΜΑ: Δεν ήταν δυνατό το άνοιγμα του αρχείου glade"
 
-#: ../src/mainWindow.py:451
-#: ../src/template_chooser.py:69
+#: ../src/mainWindow.py:451 ../src/template_chooser.py:69
 #: ../src/template_manager.py:72
 msgid "Task"
 msgstr "Εργασία"
 
-#: ../src/mainWindow.py:464
-#: ../src/mainWindow.py:490
-#: ../src/template_chooser.py:78
-#: ../src/template_manager.py:81
+#: ../src/mainWindow.py:464 ../src/mainWindow.py:490
+#: ../src/template_chooser.py:78 ../src/template_manager.py:81
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../src/mainWindow.py:468
-#: ../src/mainWindow.py:481
+#: ../src/mainWindow.py:468 ../src/mainWindow.py:481
 msgid "Date and Time"
 msgstr "Ημερομηνία και ώρα"
 
-#: ../src/mainWindow.py:472
-#: ../src/mainWindow.py:485
+#: ../src/mainWindow.py:472 ../src/mainWindow.py:485
 msgid "Command preview"
 msgstr "Προεπισκόπιση εντολής"
 
 #. print ex
-#: ../src/mainWindow.py:544
-#: ../src/mainWindow.py:607
+#: ../src/mainWindow.py:544 ../src/mainWindow.py:607
 msgid "Please select a task"
 msgstr "Παρακαλούμε επιλέξτε εργασία"
 
@@ -1024,11 +1070,14 @@ msgstr "Επιθυμείτε να διαγράψετε αυτή την εργα
 msgid ""
 "Are you sure you want to run this task now?\n"
 "\n"
-"This is used to preview the task and initiates a one-time run, this does not affect the normal scheduled 
run times."
+"This is used to preview the task and initiates a one-time run, this does not "
+"affect the normal scheduled run times."
 msgstr ""
 "Είστε βέβαιοι ότι επιθυμείτε να εκτελέσετε αυτή την εργασία τώρα;\n"
 "\n"
-"Αυτό χρησιμοποιείται για την προεπισκόπιση της εργασίας και εκκινεί την εργασία μία και μόνο φορά, δεν 
επηρεάζει τους χρόνους των προγραμματισμένων εργασιών"
+"Αυτό χρησιμοποιείται για την προεπισκόπιση της εργασίας και εκκινεί την "
+"εργασία μία και μόνο φορά, δεν επηρεάζει τους χρόνους των προγραμματισμένων "
+"εργασιών"
 
 #: ../src/mainWindow.py:656
 msgid "Are you sure you want to run this task?"
@@ -1038,11 +1087,15 @@ msgstr "Είστε βέβαιοι ότι επιθυμείτε να εκτελέ
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"Recurrent tasks will be run from the home directory, one-time tasks from the directory where Gnome schedule 
was run from at the time of task creation (normally the home directory)."
+"Recurrent tasks will be run from the home directory, one-time tasks from the "
+"directory where Gnome schedule was run from at the time of task creation "
+"(normally the home directory)."
 msgstr ""
 "Σημείωση σχετικά με τον κατάλογο εργασίας των εκτελούμενων εργασιών:\n"
 "\n"
-"Επαναλαμβανόμενες εργασίες θα εκτελούνται από τον αρχικό κατάλογο του χρήστη, μη επαναλαμβανόμενες εργασίες 
από τον κατάλογο εκκίνησης του Gnome schedule όταν έγινε ο ορισμός της εργασίας (συνήθως ο αρχικός κατάλογος)"
+"Επαναλαμβανόμενες εργασίες θα εκτελούνται από τον αρχικό κατάλογο του "
+"χρήστη, μη επαναλαμβανόμενες εργασίες από τον κατάλογο εκκίνησης του Gnome "
+"schedule όταν έγινε ο ορισμός της εργασίας (συνήθως ο αρχικός κατάλογος)"
 
 #: ../src/mainWindow.py:727
 msgid "Please select a task!"
@@ -1096,8 +1149,14 @@ msgid "Calendar"
 msgstr "Ημερολόγιο"
 
 #: ../src/atEditor.py:515
-msgid "In one or both of the fields hour and minute there was entered a letter, or a number out of range. 
Remember an hour only has 60 minutes and a day only 24 hours."
-msgstr "Σε ένα ή και τα δύο από τα πεδία ώρας και λεπτών, έγινε εισαγωγή ενός γράμματος, ή ενός αριθμού 
εκτός ορίων. Θυμηθείτε ότι μία ώρα έχει 60 λεπτά και μία ημέρα 24 ώρες."
+msgid ""
+"In one or both of the fields hour and minute there was entered a letter, or "
+"a number out of range. Remember an hour only has 60 minutes and a day only "
+"24 hours."
+msgstr ""
+"Σε ένα ή και τα δύο από τα πεδία ώρας και λεπτών, έγινε εισαγωγή ενός "
+"γράμματος, ή ενός αριθμού εκτός ορίων. Θυμηθείτε ότι μία ώρα έχει 60 λεπτά "
+"και μία ημέρα 24 ώρες."
 
 #: ../src/atEditor.py:576
 #, python-format
@@ -1108,14 +1167,15 @@ msgstr "Μη έγκυρη εγγραφή!, Το πρόβλημα μπορεί ν
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"One-time tasks will be run from the directory where Gnome schedule is run from (normally the home 
directory)."
+"One-time tasks will be run from the directory where Gnome schedule is run "
+"from (normally the home directory)."
 msgstr ""
 "Σημείωση σχετικά με τον κατάλογο εργασίας των εκτελούμενων εργασιών:\n"
 "\n"
-"Μη επαναλαμβανόμενες εργασίες θα εκτελούνται από τον κατάλογο εκκίνησης του Gnome schedule (συνήθως τον 
αρχικό κατάλογο του χρήστη)."
+"Μη επαναλαμβανόμενες εργασίες θα εκτελούνται από τον κατάλογο εκκίνησης του "
+"Gnome schedule (συνήθως τον αρχικό κατάλογο του χρήστη)."
 
-#: ../src/template.py:198
-#: ../src/template.py:212
+#: ../src/template.py:198 ../src/template.py:212
 msgid "Title:"
 msgstr "Τίτλος:"
 
@@ -1123,13 +1183,11 @@ msgstr "Τίτλος:"
 msgid "Run:"
 msgstr "Εκτέλεση:"
 
-#: ../src/template_chooser.py:40
-#: ../src/template_manager.py:37
+#: ../src/template_chooser.py:40 ../src/template_manager.py:37
 msgid "Use template"
 msgstr "Χρήση προτύπου"
 
-#: ../src/template_chooser.py:97
-#: ../src/template_manager.py:102
+#: ../src/template_chooser.py:97 ../src/template_manager.py:102
 msgid "One-time"
 msgstr "Μη επαναλαμβανόμενη"
 
@@ -1137,32 +1195,40 @@ msgstr "Μη επαναλαμβανόμενη"
 msgid "Could not open a connection to X!"
 msgstr "Αδυναμία ανοίγματος σύνδεσης στο X!"
 
-#: ../src/xwrapper.py:71
-#: ../src/xwrapper.py:79
+#: ../src/xwrapper.py:71 ../src/xwrapper.py:79
 msgid "Wrong number of arguments."
 msgstr "Λάθος αριθμός παραμέτρων."
 
-#: ../src/xwrapper.py:73
-#: ../src/xwrapper.py:81
-msgid "Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for applications to be run from 
crontab or at under X. Use through gnome-schedule."
-msgstr "Wrapper script για το Gnome-schedule (http://gnome-schedule.sf.net) για εφαρμογές που θα εκτελούνται 
από το crontab ή μέσω X. Χρήση μέσω του gnome-schedule."
+#: ../src/xwrapper.py:73 ../src/xwrapper.py:81
+msgid ""
+"Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for "
+"applications to be run from crontab or at under X. Use through gnome-"
+"schedule."
+msgstr ""
+"Wrapper script για το Gnome-schedule (http://gnome-schedule.sf.net) για "
+"εφαρμογές που θα εκτελούνται από το crontab ή μέσω X. Χρήση μέσω του gnome-"
+"schedule."
 
 #: ../src/xwrapper.py:87
 msgid "Unknown type of job."
 msgstr "Άγνωστος τύπος εργασίας."
 
-#: ../src/xwrapper.py:106
-#: ../src/xwrapper.py:110
+#: ../src/xwrapper.py:106 ../src/xwrapper.py:110
 msgid "Invalid job id."
 msgstr "Μη έγκυρη ταυτότητα εργασίας"
 
 #: ../src/xwrapper.py:117
-msgid "Could not get job data, the task might have been created with an old version - try recreating the 
task."
-msgstr "Δεν ήταν δυνατή η λήψη των δεδομένων της εργασίας, η εργασία πιθανόν να δημιουργήθηκε με κάποια 
παλιά έκδοση - δοκιμάστε να την δημιουργήσετε πάλι."
+msgid ""
+"Could not get job data, the task might have been created with an old version "
+"- try recreating the task."
+msgstr ""
+"Δεν ήταν δυνατή η λήψη των δεδομένων της εργασίας, η εργασία πιθανόν να "
+"δημιουργήθηκε με κάποια παλιά έκδοση - δοκιμάστε να την δημιουργήσετε πάλι."
 
 #: ../src/xwrapper.py:121
 msgid "Data file too old. Recreate task."
-msgstr "Το αρχείο δεδομένων είναι πολύ παλιό. Δημιουργήστε την εργασία από την αρχή."
+msgstr ""
+"Το αρχείο δεδομένων είναι πολύ παλιό. Δημιουργήστε την εργασία από την αρχή."
 
 #: ../src/xwrapper.py:125
 #, python-format
diff --git a/po/en_CA.po b/po/en_CA.po
index e331447..ee66bab 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-08-27 17:03-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
@@ -18,57 +18,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Manage your system tasks"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Add a Scheduled Task"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configures your scheduled tasks"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Manage your system tasks"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "GNOME schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configures your scheduled tasks"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "System tools"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "On %(date)s at %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Once"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Warning: a line in atq's output didn't parse"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Untitled"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minute"
@@ -89,7 +96,7 @@ msgstr "Month"
 msgid "Weekday"
 msgstr "Weekday"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Basic"
 
@@ -108,52 +115,47 @@ msgstr "Must be between %(min)s and %(max)s"
 msgid "%s is not a number"
 msgstr "%s is not a number"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Untitled"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Recurrent"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minute"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "hour"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "day"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "month"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "weekday"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Every minute"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Every hour"
 
@@ -171,21 +173,21 @@ msgstr "Every week"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Create a New Scheduled Task"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Template:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Add a task"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Edit a Scheduled Task"
 
@@ -216,11 +218,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -258,11 +260,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "This is invalid. Reason: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "At an exact minute"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minute:"
 
@@ -271,7 +273,7 @@ msgstr "Minute:"
 msgid "At an exact hour"
 msgstr "At an exact hour"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hour:"
 
@@ -280,7 +282,7 @@ msgstr "Hour:"
 msgid "On a day"
 msgstr "On a day"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Day:"
 
@@ -289,7 +291,7 @@ msgstr "Day:"
 msgid "In a month"
 msgstr "In a month"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Month:"
 
@@ -298,15 +300,15 @@ msgstr "Month:"
 msgid "On a weekday"
 msgstr "On a weekday"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Weekday:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "In a step width"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutes:"
 
@@ -327,8 +329,8 @@ msgid "Weekdays:"
 msgstr "Weekdays:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "A_bout"
+msgid "_Manage tasks"
+msgstr "_Manage tasks"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -339,8 +341,8 @@ msgid "_Help"
 msgstr "_Help"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Manage tasks"
+msgid "A_bout"
+msgstr "A_bout"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -371,13 +373,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -424,72 +429,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Delete the selected template"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "_Manage tasks"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Choose the user whose tasks you want to modify</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Add a task"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Select the type of the scheduled task</b>"
+msgid "Edit the selected template"
+msgstr "Delete the selected template"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Preview</b>"
+msgid "Delete the selected template"
+msgstr "Delete the selected template"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "About GNOME Schedule"
+msgid "Task description:"
+msgstr "Desc_ription:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Add a Scheduled Task"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "About this application"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "_Add a task"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Advanced"
+#, fuzzy
+msgid "Date:"
+msgstr "_Date:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Change User"
+#, fuzzy
+msgid "Task:"
+msgstr "_Task"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Add a task"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Edit a scheduled task"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Choose the user whose tasks you want to modify"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -498,159 +518,146 @@ msgid "Command:"
 msgstr "Co_mmand:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configure Scheduled Tasks"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Delete the selected template"
+msgid "Description:"
+msgstr "Desc_ription:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Add a task"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Date:"
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Delete a scheduled task"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Delete the selected template"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Desc_ription:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Edit a scheduled task"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Edit a scheduled task"
+msgid "<big>Preview</big>"
+msgstr "<b>Preview</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Delete the selected template"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Change User"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Choose the user whose tasks you want to modify</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Execution at a specific minute, hour, day, weekday or month."
+msgid "_User:"
+msgstr "_User:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
+msgid "Add a Scheduled Task"
+msgstr "Add a Scheduled Task"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Execution at every minute, hour, day, weekday or month."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Select the type of the scheduled task</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Execution in a range."
+msgid "Time expression help"
+msgstr "Time expression help"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expression:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "To:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "From:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Other"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "_Manage tasks"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "See \"man 5 crontab\" for information about the crontab format."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Execution at a specific minute, hour, day, weekday or month."
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Please select a task"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "In a range"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Execution in a range."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Scheduled and active tasks"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Execution at every minute, hour, day, weekday or month."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Show help"
+msgid "Configure Scheduled Tasks"
+msgstr "Configure Scheduled Tasks"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "Desc_ription:"
+msgid "Edit a scheduled task"
+msgstr "Edit a scheduled task"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Task"
+msgid "Delete a scheduled task"
+msgstr "Delete a scheduled task"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Template:"
+msgid "Run selected task"
+msgstr "Please select a task"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Time expression help"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "_Template:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "To:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "About this application"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Choose the user whose tasks you want to modify"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Show help"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_User:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "About GNOME Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Scheduled and active tasks"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1124,23 +1131,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "This is an invalid record! The problem could be: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 77786d4..a2c3b36 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2008-03-09 17:47+0000\n"
 "Last-Translator: David Lodge <dave cirt net>\n"
 "Language-Team: English/GB <en li org>\n"
@@ -18,56 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Manage your system tasks"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Scheduled tasks"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configures your scheduled tasks"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Manage your system tasks"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configures your scheduled tasks"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "System tools"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "On %(date)s at %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Once"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Warning: a line in atq's output didn't parse"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Untitled"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minute"
@@ -88,7 +95,7 @@ msgstr "Month"
 msgid "Weekday"
 msgstr "Weekday"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Basic"
 
@@ -107,53 +114,48 @@ msgstr "Must be between %(min)s and %(max)s"
 msgid "%s is not a number"
 msgstr "%s is not a number"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Untitled"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Recurrent"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "At reboot"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minute"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "hour"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "day"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "month"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "weekday"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Every minute"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Every hour"
 
@@ -171,19 +173,19 @@ msgstr "Every week"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Create a New Scheduled Task"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Edit template"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "New template"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Edit a Scheduled Task"
 
@@ -224,11 +226,11 @@ msgstr ""
 "\n"
 "Recurrent tasks will be run from the home directory."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Don't show again"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Warning: Working directory of executed tasks"
 
@@ -262,11 +264,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "This is invalid. Reason: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "At an exact minute"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minute:"
 
@@ -275,7 +277,7 @@ msgstr "Minute:"
 msgid "At an exact hour"
 msgstr "At an exact hour"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hour:"
 
@@ -284,7 +286,7 @@ msgstr "Hour:"
 msgid "On a day"
 msgstr "On a day"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Day:"
 
@@ -293,7 +295,7 @@ msgstr "Day:"
 msgid "In a month"
 msgstr "In a month"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Month:"
 
@@ -302,15 +304,15 @@ msgstr "Month:"
 msgid "On a weekday"
 msgstr "On a weekday"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Weekday:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "In a step width"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutes:"
 
@@ -331,8 +333,8 @@ msgid "Weekdays:"
 msgstr "Weekdays:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "A_bout"
+msgid "_Manage tasks"
+msgstr "_Manage tasks"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -343,8 +345,8 @@ msgid "_Help"
 msgstr "_Help"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Manage tasks"
+msgid "A_bout"
+msgstr "A_bout"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -375,13 +377,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -428,68 +433,77 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Choose template"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Create a new task from the selected template"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Manage templates"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Choose the user whose tasks you want to modify</b>"
+msgid "Create a new template."
+msgstr "Create a new template."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Select the type of the scheduled task:</b>"
+msgid "Edit the selected template"
+msgstr "Edit the selected template"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Preview</big>"
+msgid "Delete the selected template"
+msgstr "Delete the selected template"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Time &amp; Date</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "About GNOME Schedule"
+msgid "Task description:"
+msgstr "Task description:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Add a Scheduled Task"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "About this application"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Add as template"
+msgid "Execute at:"
+msgstr "Execute at:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Advanced"
+msgid "Date:"
+msgstr "Date:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Time:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Change User"
+msgid "Task:"
+msgstr "Task:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Change edit mode"
+msgid "Add as template"
+msgstr "Add as template"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Choose template"
+msgid "Edit a periodical task"
+msgstr "Edit a periodical task"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Choose the user whose tasks you want to modify"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -497,147 +511,140 @@ msgid "Command:"
 msgstr "Command:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configure Scheduled Tasks"
+msgid "Description:"
+msgstr "Description:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Create a new task from the selected template"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Create a new template."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Time &amp; Date</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Date:"
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Delete a scheduled task"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Delete the selected template"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Description:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Edit a periodical task"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Edit a scheduled task"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Preview</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Edit the selected template"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Change User"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Choose the user whose tasks you want to modify</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Execution at a specific minute, hour, day, weekday or month."
+msgid "_User:"
+msgstr "_User:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
+msgid "Add a Scheduled Task"
+msgstr "Add a Scheduled Task"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Execution at every minute, hour, day, weekday or month."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Select the type of the scheduled task:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Execution in a range."
+msgid "Time expression help"
+msgstr "Time expression help"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expression:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "To:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "From:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Other"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Manage templates"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "See \"man 5 crontab\" for information about the crontab format."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Execution at a specific minute, hour, day, weekday or month."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Run selected task"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "In a range"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Run task"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Execution in a range."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Scheduled and active tasks"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Execution at every minute, hour, day, weekday or month."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Show help"
+msgid "Configure Scheduled Tasks"
+msgstr "Configure Scheduled Tasks"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Task description:"
+msgid "Edit a scheduled task"
+msgstr "Edit a scheduled task"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Task:"
+msgid "Delete a scheduled task"
+msgstr "Delete a scheduled task"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Templates"
+msgid "Run selected task"
+msgstr "Run selected task"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Time expression help"
+msgid "Run task"
+msgstr "Run task"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Time:"
+msgid "Templates"
+msgstr "Templates"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "To:"
+msgid "Change edit mode"
+msgstr "Change edit mode"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "About this application"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Choose the user whose tasks you want to modify"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Show help"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_User:"
+msgid "About Gnome-schedule"
+msgstr "About GNOME Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Scheduled and active tasks"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1120,11 +1127,11 @@ msgstr "A task that launches one time"
 msgid "A task from a predefined template"
 msgstr "A task from a predefined template"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1134,12 +1141,12 @@ msgstr ""
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "This is an invalid record! The problem could be: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/es.po b/po/es.po
index e4fe403..2fd4c08 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,35 +13,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"schedule&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-08 11:33+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-08 12:27+0100\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Administrar sus tareas del sistema"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Tareas programadas"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configura sus tareas planificadas"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Administrar sus tareas del sistema"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Planificador de Gnome"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configura sus tareas planificadas"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Herramientas del sistema"
@@ -107,7 +106,7 @@ msgstr "Mes"
 msgid "Weekday"
 msgstr "Día de la semana"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Básico"
 
@@ -163,12 +162,12 @@ msgstr ""
 "error en crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Cada minuto"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Cada hora"
 
@@ -209,8 +208,8 @@ msgid ""
 "This is an invalid record! The problem could be in the %(field)s field. "
 "Reason: %(reason)s"
 msgstr ""
-"¡Este no es un registro válido! El problema podría estar en el campo %(field)"
-"s. Razón: %(reason)s"
+"¡Este no es un registro válido! El problema podría estar en el campo "
+"%(field)s. Razón: %(reason)s"
 
 #: ../src/crontabEditor.py:307
 msgid ""
@@ -277,11 +276,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Esto no es válido. Razón: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "En un minuto exacto"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuto:"
 
@@ -290,7 +289,7 @@ msgstr "Minuto:"
 msgid "At an exact hour"
 msgstr "En una hora exacta"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hora:"
 
@@ -299,7 +298,7 @@ msgstr "Hora:"
 msgid "On a day"
 msgstr "En un día"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Día:"
 
@@ -308,7 +307,7 @@ msgstr "Día:"
 msgid "In a month"
 msgstr "En un mes"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mes:"
 
@@ -317,15 +316,15 @@ msgstr "Mes:"
 msgid "On a weekday"
 msgstr "En un día de la semana"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Día de la semana:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Cada cierto tiempo"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutos:"
 
@@ -346,8 +345,8 @@ msgid "Weekdays:"
 msgstr "Días de la semana:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "A_cerca de"
+msgid "_Manage tasks"
+msgstr "A_dministrar tareas"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -358,8 +357,8 @@ msgid "_Help"
 msgstr "Ay_uda"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "A_dministrar tareas"
+msgid "A_bout"
+msgstr "A_cerca de"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -450,64 +449,70 @@ msgstr[0] "Importación terminada: %d tarea en total."
 msgstr[1] "Importación terminada: %d tareas en total."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Elegir plantilla"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Crear una tarea nueva a partir de la plantilla seleccionada"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Administrar plantillas"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Elija el usuario cuyas tareas quiere modificar</b>"
+msgid "Create a new template."
+msgstr "Crear una plantilla nueva."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Seleccione el tipo de la tarea programada:</b>"
+msgid "Edit the selected template"
+msgstr "Editar la plantilla seleccionada"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Vista previa</big>"
+msgid "Delete the selected template"
+msgstr "Eliminar la plantilla seleccionada"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Hora y fecha</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Acerca del Planificador de GNOME"
+msgid "Task description:"
+msgstr "Descripción de la tarea:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Añadir una tarea programada"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Aplicación X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Añadir como plantilla"
+msgid "Execute at:"
+msgstr "Ejecutar en:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avanzado"
+msgid "Date:"
+msgstr "Fecha:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Tiempo:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Cambiar de usuario"
+msgid "Task:"
+msgstr "Tarea:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Cambiar modo de edición"
+msgid "Add as template"
+msgstr "Añadir como plantilla"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Elegir plantilla"
+msgid "Edit a periodical task"
+msgstr "Editar una tarea periódica"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Elegir el usuario cuyas tareas quiere modificar"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -515,147 +520,141 @@ msgid "Command:"
 msgstr "Comando:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configurar las tareas programadas"
+msgid "Description:"
+msgstr "Descripción:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Crear una tarea nueva a partir de la plantilla seleccionada"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Crear una plantilla nueva."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Hora y fecha</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Fecha:"
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Eliminar una tarea programada"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Eliminar la plantilla seleccionada"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Descripción:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Editar una tarea periódica"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Editar una tarea programada"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Vista previa</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Editar la plantilla seleccionada"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Cambiar de usuario"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Ejecutar en:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Elija el usuario cuyas tareas quiere modificar</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Se ejecuta en un minuto, hora, día, día de la semana o mes específico."
+msgid "_User:"
+msgstr "_Usuario:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Se ejecuta cada cierto tiempo. Por ejemplo cada cinco minutos, horas, días, "
-"días de la semana o meses."
+msgid "Add a Scheduled Task"
+msgstr "Añadir una tarea programada"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Se ejecuta cada minuto, hora, día, día de la semana o mes."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Seleccione el tipo de la tarea programada:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Se ejecuta en un rango."
+msgid "Time expression help"
+msgstr "Ayuda de la expresión del tiempo"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expresión:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Hasta:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Desde:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "En un rango"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Otra"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Administrar plantillas"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Vea «man 5 crontab» para obtener información acerca del formato de crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Otra"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Se ejecuta en un minuto, hora, día, día de la semana o mes específico."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Ejectar la tarea seleccionada"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "En un rango"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Ejecutar tarea"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Se ejecuta en un rango."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Tareas programadas y activas"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Se ejecuta cada minuto, hora, día, día de la semana o mes."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Vea «man 5 crontab» para obtener información acerca del formato de crontab."
+"Se ejecuta cada cierto tiempo. Por ejemplo cada cinco minutos, horas, días, "
+"días de la semana o meses."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Mostrar ayuda"
+msgid "Configure Scheduled Tasks"
+msgstr "Configurar las tareas programadas"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Descripción de la tarea:"
+msgid "Edit a scheduled task"
+msgstr "Editar una tarea programada"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Tarea:"
+msgid "Delete a scheduled task"
+msgstr "Eliminar una tarea programada"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Plantillas"
+msgid "Run selected task"
+msgstr "Ejectar la tarea seleccionada"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Ayuda de la expresión del tiempo"
+msgid "Run task"
+msgstr "Ejecutar tarea"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Tiempo:"
+msgid "Templates"
+msgstr "Plantillas"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Hasta:"
+msgid "Change edit mode"
+msgstr "Cambiar modo de edición"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Aplicación X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Elegir el usuario cuyas tareas quiere modificar"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Mostrar ayuda"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Usuario:"
+msgid "About Gnome-schedule"
+msgstr "Acerca del Planificador de GNOME"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Tareas programadas y activas"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -730,8 +729,8 @@ msgid ""
 "On day %(monthday)s of every month at every minute between %(time_from)s and "
 "%(time_to)s"
 msgstr ""
-"El día %(monthday)s de cada mes a cada minuto entre las %(time_from)s y las %"
-"(time_to)s"
+"El día %(monthday)s de cada mes a cada minuto entre las %(time_from)s y las "
+"%(time_to)s"
 
 #: ../src/lang.py:204
 #, python-format
@@ -756,11 +755,11 @@ msgstr "Cada día de %(month)s en el minuto %(minute)s de cada hora"
 #: ../src/lang.py:215
 #, python-format
 msgid ""
-"On every day in %(month)s at every minute between %(time_from)s and %"
-"(time_to)s"
+"On every day in %(month)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr ""
-"Cada día de %(month)s a cada minuto entre las %(time_from)s y las %(time_to)"
-"s horas"
+"Cada día de %(month)s a cada minuto entre las %(time_from)s y las "
+"%(time_to)s horas"
 
 #: ../src/lang.py:217
 #, python-format
@@ -812,8 +811,8 @@ msgstr "Cada %(weekday)s en el minuto %(minute)s de cada hora"
 #: ../src/lang.py:241
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s at every minute between %(time_from)s and %"
-"(time_to)s"
+"On every weekday: %(weekday)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr ""
 "Cada %(weekday)s a cada minuto entre las %(time_from)s y las %(time_to)s"
 
@@ -840,8 +839,8 @@ msgstr "El día %(monthday)s de cada mes y cada %(weekday)s a cada minuto"
 #: ../src/lang.py:252
 #, python-format
 msgid ""
-"On day %(monthday)s of every month and every weekday: %(weekday)s at minute %"
-"(minute)s of every hour"
+"On day %(monthday)s of every month and every weekday: %(weekday)s at minute "
+"%(minute)s of every hour"
 msgstr ""
 "El día %(monthday)s de cada mes y cada %(weekday)s en el minuto %(minute)s "
 "de cada hora"
@@ -852,8 +851,8 @@ msgid ""
 "On day %(monthday)s of every month and every weekday: %(weekday)s at every "
 "minute between %(time_from)s and %(time_to)s"
 msgstr ""
-"El día %(monthday)s de cada mes y cada %(weekday)s a cada minuto entre las  %"
-"(time_from)s y las %(time_to)s"
+"El día %(monthday)s de cada mes y cada %(weekday)s a cada minuto entre las  "
+"%(time_from)s y las %(time_to)s"
 
 #: ../src/lang.py:256
 #, python-format
@@ -880,11 +879,11 @@ msgstr "Cada %(weekday)s de %(month)s en el minuto %(minute)s de cada hora"
 #: ../src/lang.py:267
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s in %(month)s at every minute between %"
-"(time_from)s and %(time_to)s"
+"On every weekday: %(weekday)s in %(month)s at every minute between "
+"%(time_from)s and %(time_to)s"
 msgstr ""
-"Cada %(weekday)s de %(month)s a cada minuto entre las %(time_from)s y las %"
-"(time_to)s"
+"Cada %(weekday)s de %(month)s a cada minuto entre las %(time_from)s y las "
+"%(time_to)s"
 
 #: ../src/lang.py:269
 #, python-format
@@ -930,11 +929,11 @@ msgstr ""
 #: ../src/lang.py:282
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at %"
-"(time)s"
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"%(time)s"
 msgstr ""
-"Cada %(weekday)s del mes de %(month)s y el día %(date)s de cada año a las %"
-"(time)s"
+"Cada %(weekday)s del mes de %(month)s y el día %(date)s de cada año a las "
+"%(time)s"
 
 #: ../src/lang.py:290
 msgid "every minute"
diff --git a/po/eu.po b/po/eu.po
index 5f20934..2d15f1c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-06-21 12:32+0200\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc kde org>\n"
@@ -18,26 +18,26 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Kudeatu sistemako zereginak"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Programatutako zereginak"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Zure programatutako zereginak konfiguratzen ditu"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Kudeatu sistemako zereginak"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Zure programatutako zereginak konfiguratzen ditu"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Sistemaren tresnak"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -45,7 +45,7 @@ msgstr ""
 "Huts egin du datuen direktorioa sortzean. Ziurtatu zaitez ~/.gnome eta ~/."
 "gnome/gnome-schedule idazgarria izateaz."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -54,24 +54,31 @@ msgstr ""
 "Huts egin du datuen direktorioa sortzean: %s. Ziurtatu zaitez ~/.gnome eta "
 "~/.gnome/gnome-schedule idazgarria izateaz."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr "Abisua. Zeregin ezezaguna:  %(preview)s"
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "Noiz: %(timestring)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Behin"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Abisua: atq-ren irteerako lerro bat ez da analizatu"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Izengabea"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minutua"
@@ -92,7 +99,7 @@ msgstr "Hilabetea"
 msgid "Weekday"
 msgstr "Asteko eguna"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
@@ -111,41 +118,36 @@ msgstr "%(min)s eta %(max)s artean egon behar du"
 msgid "%s is not a number"
 msgstr "%s ez da zenbaki bat"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Izengabea"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Errepikatua"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Berrabiaraztean"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minutua"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "ordua"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "eguna"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "hilabetea"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "asteko eguna"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -153,12 +155,12 @@ msgstr ""
 "akats bat izatea."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Minuturo"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Orduro"
 
@@ -176,19 +178,19 @@ msgstr "Astero"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Sortu programatutako zeregin berria"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Editatu txantiloia"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Txantiloi berria"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Editatu programatutako zeregin bat"
 
@@ -229,11 +231,11 @@ msgstr ""
 "\n"
 "Zeregin errepikatuak etxeko direktoriotik (karpeta nagusia) exekuta daiteke."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Ez erakutsi berriro"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Abisua: exekutatutako zereginen laneko direktorioa"
 
@@ -267,11 +269,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Baliogabea da. Zergatia: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Minutu zehatz batean"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minutua:"
 
@@ -280,7 +282,7 @@ msgstr "Minutua:"
 msgid "At an exact hour"
 msgstr "Ordu zehatz batean"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ordua:"
 
@@ -289,7 +291,7 @@ msgstr "Ordua:"
 msgid "On a day"
 msgstr "Egun batean"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Eguna:"
 
@@ -298,7 +300,7 @@ msgstr "Eguna:"
 msgid "In a month"
 msgstr "Hilabetean"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Hilabetea:"
 
@@ -307,15 +309,15 @@ msgstr "Hilabetea:"
 msgid "On a weekday"
 msgstr "Astegunean"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Asteguna"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Aldiro"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutuak:"
 
@@ -336,8 +338,8 @@ msgid "Weekdays:"
 msgstr "Astegunak:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "Honi _buruz"
+msgid "_Manage tasks"
+msgstr "_Kudeatu zereginak"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -348,8 +350,8 @@ msgid "_Help"
 msgstr "_Laguntza"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Kudeatu zereginak"
+msgid "A_bout"
+msgstr "Honi _buruz"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -380,13 +382,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -433,68 +438,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Aukeratu txantiloia"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Sortu zeregin berria hautatutako txantiloitik"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Kudeatu txantiloiak"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Aukeratu erabiltzailea (haren zereginak aldatzeko)</b>"
+msgid "Create a new template."
+msgstr "Sortu txantiloi berria"
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Hautatu programatutako zeregin mota:</b>"
+msgid "Edit the selected template"
+msgstr "Editatu hautatutako txantiloia"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Aurrebista</big>"
+msgid "Delete the selected template"
+msgstr "Ezabatu hautatutako txantiloia"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Ordua eta data</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Gnome-schedule buruz"
+msgid "Task description:"
+msgstr "Zereginaren azalpena:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Gehitu programatutako zeregin bat"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X aplikazioa"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Gehitu txantiloi gisa"
+msgid "Execute at:"
+msgstr "Exekutatu:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Aurreratua"
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Ordua:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Aldatu erabiltzailez"
+msgid "Task:"
+msgstr "Zeregina:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Aldatu edizio-modua"
+msgid "Add as template"
+msgstr "Gehitu txantiloi gisa"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Aukeratu txantiloia"
+msgid "Edit a periodical task"
+msgstr "Editatu maiztasun bateko zeregina"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Aukeratu erabiltzailea (haren zereginak aldatzea nahi dituzuna)"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -502,147 +515,141 @@ msgid "Command:"
 msgstr "Komandoa:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Konfiguratu programatutako zereginak"
+msgid "Description:"
+msgstr "Azalpena:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Sortu zeregin berria hautatutako txantiloitik"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Sortu txantiloi berria"
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Ordua eta data</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data:"
+msgid "Advanced"
+msgstr "Aurreratua"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Ezabatu programatutako zeregin bat"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Ezabatu hautatutako txantiloia"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Azalpena:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Editatu maiztasun bateko zeregina"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Editatu programatutako zeregina"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Aurrebista</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Editatu hautatutako txantiloia"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Aldatu erabiltzailez"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Exekutatu:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Aukeratu erabiltzailea (haren zereginak aldatzeko)</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Minutu, ordu, egun, astegun edo hilabete zehatz bateko exekuzioa"
+msgid "_User:"
+msgstr "_Erabiltzailea:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Aldiroko exekuzioa. Adibidez, bost minuturo, orduro, egunero, astegunero edo "
-"hilabetero."
+msgid "Add a Scheduled Task"
+msgstr "Gehitu programatutako zeregin bat"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Minutu, ordu, egun, astegun edo hilabete bakoitzeroko exekuzioa."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Hautatu programatutako zeregin mota:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Exekuzioa barruti batean."
+msgid "Time expression help"
+msgstr "Orduaren adierazpenaren laguntza"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Adierazpena:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Noiz arte:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Noiztik:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Barrutian"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Bestelakoa"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Kudeatu txantiloiak"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Irakurri \"man 5 crontab\" crontab-en formatuaren informazioa jakiteko."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Bestelakoa"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Minutu, ordu, egun, astegun edo hilabete zehatz bateko exekuzioa"
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Exekutatu hautatutako zeregina"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Barrutian"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Exekutatu zeregina"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Exekuzioa barruti batean."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Programatutako zeregin aktiboak"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Minutu, ordu, egun, astegun edo hilabete bakoitzeroko exekuzioa."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Irakurri \"man 5 crontab\" crontab-en formatuaren informazioa jakiteko."
+"Aldiroko exekuzioa. Adibidez, bost minuturo, orduro, egunero, astegunero edo "
+"hilabetero."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Erakutsi laguntza"
+msgid "Configure Scheduled Tasks"
+msgstr "Konfiguratu programatutako zereginak"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Zereginaren azalpena:"
+msgid "Edit a scheduled task"
+msgstr "Editatu programatutako zeregina"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Zeregina:"
+msgid "Delete a scheduled task"
+msgstr "Ezabatu programatutako zeregin bat"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Txantiloiak"
+msgid "Run selected task"
+msgstr "Exekutatu hautatutako zeregina"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Orduaren adierazpenaren laguntza"
+msgid "Run task"
+msgstr "Exekutatu zeregina"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Ordua:"
+msgid "Templates"
+msgstr "Txantiloiak"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Noiz arte:"
+msgid "Change edit mode"
+msgstr "Aldatu edizio-modua"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X aplikazioa"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Aukeratu erabiltzailea (haren zereginak aldatzea nahi dituzuna)"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Erakutsi laguntza"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Erabiltzailea:"
+msgid "About Gnome-schedule"
+msgstr "Gnome-schedule buruz"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Programatutako zeregin aktiboak"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1116,11 +1123,11 @@ msgstr "Behin abiarazten den zeregin bat"
 msgid "A task from a predefined template"
 msgstr "Zeregin bat aurrez definitutako txantiloitik"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1130,12 +1137,12 @@ msgstr ""
 "barrutitik kanpo dagoen zenbakia sartu da. Gogoratu ordu batek 60 minutu "
 "dituela soilik, eta egun batek 24 ordu."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Baliogabeko erregistroa. Arazoa hau izan daiteke: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/fi.po b/po/fi.po
index 1499aff..a50c80b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2008-09-18 15:30+0300\n"
 "Last-Translator: Ilkka Tuohela <hile iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
@@ -19,26 +19,26 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Hallitse järjestelmäsi tehtäviä"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Ajastetut tehtävät"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Muokkaa ajastettuja tehtäviä"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Hallitse järjestelmäsi tehtäviä"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome-ajastus"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Muokkaa ajastettuja tehtäviä"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Järjestelmätyökalut"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -46,7 +46,7 @@ msgstr ""
 "Datakansiota ei voitu luoda. Varmista, että kansiot ~/.gnome ja ~/.gnome/"
 "gnome-schedule ovat kirjoitettavissa."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -55,24 +55,31 @@ msgstr ""
 "Datakansiota ei voitu luoda: %s. Varmista, että kansiot ~/.gnome ja ~/.gnome/"
 "gnome-schedule ovat kirjoitettavissa."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "%(date)s kello %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Kerran"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Varoitus: riviä atq:n tulosteessa ei voi tulkita"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Nimetön"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minuutti"
@@ -93,7 +100,7 @@ msgstr "Kuukausi"
 msgid "Weekday"
 msgstr "Viikonpäivä"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Perus"
 
@@ -112,41 +119,36 @@ msgstr "Täytyy olla väliltä %(min)s ja %(max)s"
 msgid "%s is not a number"
 msgstr "%s ei ole numero"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Nimetön"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Toistuva"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Käynnistettäessä"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minuutti"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "tunti"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "päivä"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "kuukausi"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "viikonpäivä"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -154,12 +156,12 @@ msgstr ""
 "crontabissa."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Joka minuutti"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Joka tunti"
 
@@ -177,19 +179,19 @@ msgstr "Joka viikko"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Luo uusi ajastettu tehtävä"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Muokkaa mallia"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Uusi malli"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Muokkaa ajastettua tehtävää"
 
@@ -229,11 +231,11 @@ msgstr ""
 "\n"
 "Toistuvat tehtävät suoritetaan kotihakemistosta."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "Ä_lä näytä uudestaan"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Varoitus: suoritettujen tehtävien työkansio"
 
@@ -267,11 +269,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Tämä on virheellinen. Syy: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Tiettynä minuuttina"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuutti:"
 
@@ -280,7 +282,7 @@ msgstr "Minuutti:"
 msgid "At an exact hour"
 msgstr "Tiettynä tuntina"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Tunti:"
 
@@ -289,7 +291,7 @@ msgstr "Tunti:"
 msgid "On a day"
 msgstr "Päivänä"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Päivä:"
 
@@ -298,7 +300,7 @@ msgstr "Päivä:"
 msgid "In a month"
 msgstr "Kuukadessa"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Kuukausi:"
 
@@ -307,15 +309,15 @@ msgstr "Kuukausi:"
 msgid "On a weekday"
 msgstr "viikonpäivinä"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Viikonpäivä:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Askelvälillä"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuuttia:"
 
@@ -336,8 +338,8 @@ msgid "Weekdays:"
 msgstr "Viikonpäiviä:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Tietoja"
+msgid "_Manage tasks"
+msgstr "_Hallitse tehtäviä"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -348,8 +350,8 @@ msgid "_Help"
 msgstr "O_hje"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Hallitse tehtäviä"
+msgid "A_bout"
+msgstr "_Tietoja"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -380,13 +382,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -433,68 +438,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Valitse malli"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Luo uusi tehtävä valitun mallin avulla"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Hallitse malleja"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Valitse käyttäjä, jonka tehtviä haluat muokata</b>"
+msgid "Create a new template."
+msgstr "Luo uusi malli"
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Valitse ajastetun tehtävän tyyppi:</b>"
+msgid "Edit the selected template"
+msgstr "Muokkaa valittua malli"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Esikatselu</big>"
+msgid "Delete the selected template"
+msgstr "Poista valittu malli"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Päiväys ja aika</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Tietoja Gnomen ajastuksesta"
+msgid "Task description:"
+msgstr "Tehtävän kuvaus:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Lisää ajastettu tehtävä"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr ""
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Lisää malliksi"
+msgid "Execute at:"
+msgstr "Suorita kello:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Lisäasetukset"
+msgid "Date:"
+msgstr "Päiväys:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Aika:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Vaihda käyttäjää"
+msgid "Task:"
+msgstr "Tehtävä:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Vaihda muokkaustilaa"
+msgid "Add as template"
+msgstr "Lisää malliksi"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Valitse malli"
+msgid "Edit a periodical task"
+msgstr "Muokkaa toistuvaa tehtävää"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Valitse käyttäjä, jonka tehtäviä haluat muokata"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -502,147 +515,141 @@ msgid "Command:"
 msgstr "Komento:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Muokkaa ajastettuja tehtäviä"
+msgid "Description:"
+msgstr "Kuvaus:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Luo uusi tehtävä valitun mallin avulla"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Luo uusi malli"
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Päiväys ja aika</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Päiväys:"
+msgid "Advanced"
+msgstr "Lisäasetukset"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Poista ajastettu tehtävä"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Poista valittu malli"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Muokkaa toistuvaa tehtävää"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Muokkaa ajastettua tehtävää"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Esikatselu</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Muokkaa valittua malli"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Vaihda käyttäjää"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Suorita kello:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Valitse käyttäjä, jonka tehtviä haluat muokata</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"Suoritus tiettynä minuuttina, tuntina, päivänä, viikonpäivänä tai kuukautena."
+msgid "_User:"
+msgstr "_Käyttäjä:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Suoritus tietyllä askelvälillä, kuten joka viides minuutti, joka toinen "
-"päivä ja niin edelleen."
+msgid "Add a Scheduled Task"
+msgstr "Lisää ajastettu tehtävä"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Suoritetaan joka minuutti, tunti, äivä, viikonpäivä tai kuukausi."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Valitse ajastetun tehtävän tyyppi:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Suoritetaan tietyllä välillä."
+msgid "Time expression help"
+msgstr "Aikailmaisun ohje"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Ilmaisu:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Saakka:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Alkaen:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Välillä"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Muu"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Hallitse malleja"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Katso lisätietoa crontab-muotoilusta komennolla \"man 5 crontab\"."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Muu"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+"Suoritus tiettynä minuuttina, tuntina, päivänä, viikonpäivänä tai kuukautena."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Suorita valittu tehtävä"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Välillä"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Suorita tehtävä"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Suoritetaan tietyllä välillä."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Ajastetut ja suorituksessa olevat tehtävät"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Suoritetaan joka minuutti, tunti, äivä, viikonpäivä tai kuukausi."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Katso lisätietoa crontab-muotoilusta komennolla \"man 5 crontab\"."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Suoritus tietyllä askelvälillä, kuten joka viides minuutti, joka toinen "
+"päivä ja niin edelleen."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Näytä ohje"
+msgid "Configure Scheduled Tasks"
+msgstr "Muokkaa ajastettuja tehtäviä"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Tehtävän kuvaus:"
+msgid "Edit a scheduled task"
+msgstr "Muokkaa ajastettua tehtävää"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Tehtävä:"
+msgid "Delete a scheduled task"
+msgstr "Poista ajastettu tehtävä"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Mallit"
+msgid "Run selected task"
+msgstr "Suorita valittu tehtävä"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Aikailmaisun ohje"
+msgid "Run task"
+msgstr "Suorita tehtävä"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Aika:"
+msgid "Templates"
+msgstr "Mallit"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Saakka:"
+msgid "Change edit mode"
+msgstr "Vaihda muokkaustilaa"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Valitse käyttäjä, jonka tehtäviä haluat muokata"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Näytä ohje"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Käyttäjä:"
+msgid "About Gnome-schedule"
+msgstr "Tietoja Gnomen ajastuksesta"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Ajastetut ja suorituksessa olevat tehtävät"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1132,11 +1139,11 @@ msgstr "Kerran käynnistyvä tehtävä"
 msgid "A task from a predefined template"
 msgstr "Ennaltamääriteltyyn pohjaan perustuva tehtävä"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1146,12 +1153,12 @@ msgstr ""
 "ei ole sallittu. Muistathan että tunnissa on vain 60 minuuttia ja päivässä "
 "24 tuntia."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Virheellinen tietue! Mahdollinen ongelma: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index 5d0490a..516cf6b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,17 +12,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"schedule&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-21 09:18+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2012-04-21 18:03+0200\n"
 "Last-Translator:  Pierre Henry <pierrehenry73 yahoo fr>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Language: fr\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
 msgid "Scheduled tasks"
@@ -765,11 +764,11 @@ msgstr ""
 #: ../src/lang.py:215
 #, python-format
 msgid ""
-"On every day in %(month)s at every minute between %(time_from)s and %"
-"(time_to)s"
+"On every day in %(month)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr ""
-"À chaque minute entre %(time_from)s et %(time_to)s de chaque jour de %(month)"
-"s"
+"À chaque minute entre %(time_from)s et %(time_to)s de chaque jour de "
+"%(month)s"
 
 #: ../src/lang.py:217
 #, python-format
@@ -823,8 +822,8 @@ msgstr "À la minute %(minute)s de toutes les heures de chaque %(weekday)s"
 #: ../src/lang.py:241
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s at every minute between %(time_from)s and %"
-"(time_to)s"
+"On every weekday: %(weekday)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr ""
 "À chaque minute entre %(time_from)s et %(time_to)s de chaque %(weekday)s"
 
@@ -848,14 +847,14 @@ msgid ""
 "On day %(monthday)s of every month and every weekday: %(weekday)s at every "
 "minute"
 msgstr ""
-"À toutes les minutes du jour %(monthday)s de chaque mois et de chaque %"
-"(weekday)s"
+"À toutes les minutes du jour %(monthday)s de chaque mois et de chaque "
+"%(weekday)s"
 
 #: ../src/lang.py:252
 #, python-format
 msgid ""
-"On day %(monthday)s of every month and every weekday: %(weekday)s at minute %"
-"(minute)s of every hour"
+"On day %(monthday)s of every month and every weekday: %(weekday)s at minute "
+"%(minute)s of every hour"
 msgstr ""
 "À la minute %(minute)s de chaque heure du jour %(monthday)s de chaque mois "
 "et de chaque %(weekday)s"
@@ -896,11 +895,11 @@ msgstr ""
 #: ../src/lang.py:267
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s in %(month)s at every minute between %"
-"(time_from)s and %(time_to)s"
+"On every weekday: %(weekday)s in %(month)s at every minute between "
+"%(time_from)s and %(time_to)s"
 msgstr ""
-"Chaque minute entre %(time_from)s et %(time_to)s de chaque %(weekday)s de %"
-"(month)s"
+"Chaque minute entre %(time_from)s et %(time_to)s de chaque %(weekday)s de "
+"%(month)s"
 
 #: ../src/lang.py:269
 #, python-format
@@ -931,8 +930,8 @@ msgid ""
 "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
 "minute %(minute)s of every hour"
 msgstr ""
-"À la minute %(minute)s de toutes les heures de chaque %(weekday)s de %(month)"
-"s et le %(date)s de chaque année"
+"À la minute %(minute)s de toutes les heures de chaque %(weekday)s de "
+"%(month)s et le %(date)s de chaque année"
 
 #: ../src/lang.py:280
 #, python-format
@@ -940,14 +939,14 @@ msgid ""
 "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
 "every minute between %(time_from)s and %(time_to)s"
 msgstr ""
-"Chaque minute entre %(time_from)s et %(time_to)s de chaque %(weekday)s de %"
-"(month)s et le %(date)s de chaque année"
+"Chaque minute entre %(time_from)s et %(time_to)s de chaque %(weekday)s de "
+"%(month)s et le %(date)s de chaque année"
 
 #: ../src/lang.py:282
 #, python-format
 msgid ""
-"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at %"
-"(time)s"
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"%(time)s"
 msgstr ""
 "Chaque %(weekday)s de %(month)s et le %(date)s de chaque année, à %(time)s"
 
diff --git a/po/gl.po b/po/gl.po
index b89291c..1eac93a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-13 17:44+0100\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-13 17:45+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
@@ -20,21 +20,21 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Xestiona as túas tarefas de sistema"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Tarefas planificadas"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configura as súas tarefas planificadas"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Xestiona as túas tarefas de sistema"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Planificador de GNOME"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configura as súas tarefas planificadas"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Ferramentas do sistema"
@@ -100,7 +100,7 @@ msgstr "Mes"
 msgid "Weekday"
 msgstr "Día da semana"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Básico"
 
@@ -156,12 +156,12 @@ msgstr ""
 "a un erro en crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Cada minuto"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Cada hora"
 
@@ -269,11 +269,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Isto non é válido. Razón: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "No minuto exacto"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuto:"
 
@@ -282,7 +282,7 @@ msgstr "Minuto:"
 msgid "At an exact hour"
 msgstr "Nunha hora exacta"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Hora:"
 
@@ -291,7 +291,7 @@ msgstr "Hora:"
 msgid "On a day"
 msgstr "Un ao día"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Día:"
 
@@ -300,7 +300,7 @@ msgstr "Día:"
 msgid "In a month"
 msgstr "Nun mes"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mes:"
 
@@ -309,15 +309,15 @@ msgstr "Mes:"
 msgid "On a weekday"
 msgstr "Nun día da semana"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Día da semana"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Cunha duración de"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutos:"
 
@@ -338,8 +338,8 @@ msgid "Weekdays:"
 msgstr "Días da semana:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "S_obre"
+msgid "_Manage tasks"
+msgstr "_Xestionar tarefas "
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -350,8 +350,8 @@ msgid "_Help"
 msgstr "_Axuda"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Xestionar tarefas "
+msgid "A_bout"
+msgstr "S_obre"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -443,64 +443,70 @@ msgstr[0] "Rematado, importouse %d tarefa en total:"
 msgstr[1] "Rematado, importáronse %d tarefas en total:"
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Seleccione o modelo"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Crear unha nova tarefa dende o modelo seleccionado"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Xestionar modelos"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Seleccione o usuario ao que lle quere modificar as tarefas</b>"
+msgid "Create a new template."
+msgstr "Crear un novo modelo."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Seleccione o tipo de tarefa planificada:</b>"
+msgid "Edit the selected template"
+msgstr "Editar o modelo seleccionado"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Previsualización</big>"
+msgid "Delete the selected template"
+msgstr "Eliminar o modelo seleccionado"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Hora e Data</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Sobre Gnome-schedule"
+msgid "Task description:"
+msgstr "Descrición da tarefa:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Engadir unha tarefa planificada"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Aplicativo X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Engadir como modelo"
+msgid "Execute at:"
+msgstr "Executar o:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avanzado"
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Hora:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Cambiar usuario"
+msgid "Task:"
+msgstr "Tarefa:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Cambiar ao modo de edición"
+msgid "Add as template"
+msgstr "Engadir como modelo"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Seleccione o modelo"
+msgid "Edit a periodical task"
+msgstr "Editar unha tarefa peridioca"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Seleccione o usuario ao que quere modificarlle as tarefas"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -508,147 +514,141 @@ msgid "Command:"
 msgstr "Orde:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configurar as tarefas planificadas "
+msgid "Description:"
+msgstr "Descrición:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Crear unha nova tarefa dende o modelo seleccionado"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Crear un novo modelo."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Hora e Data</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data:"
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Eliminar a tarefa seleccionada"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Eliminar o modelo seleccionado"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Descrición:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Editar unha tarefa peridioca"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Editar unha tarefa planificada"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Previsualización</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Editar o modelo seleccionado"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Cambiar usuario"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Executar o:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Seleccione o usuario ao que lle quere modificar as tarefas</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Execútase nun minuto, hora, día, día da semana ou mes específico."
+msgid "_User:"
+msgstr "_Usuario:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Execución cada certo tempo. Por exemplo: cada cinco minutos, horas, días, "
-"semanas ou meses."
+msgid "Add a Scheduled Task"
+msgstr "Engadir unha tarefa planificada"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Execútase cada minuto, hora, día, día da semana ou mes."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Seleccione o tipo de tarefa planificada:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Execución nun rango."
+msgid "Time expression help"
+msgstr "Axuda para a expresión de hora"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expresión:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Até:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Desde:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Nun rango"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Outro"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Xestionar modelos"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Vexa «man 5 crontab» para obter máis información sobre o formato de crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Outro"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Execútase nun minuto, hora, día, día da semana ou mes específico."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Executar a tarefa seleccionada"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Nun rango"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Executar tarefa"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Execución nun rango."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Tarefas planificadas e activas"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Execútase cada minuto, hora, día, día da semana ou mes."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Vexa «man 5 crontab» para obter máis información sobre o formato de crontab."
+"Execución cada certo tempo. Por exemplo: cada cinco minutos, horas, días, "
+"semanas ou meses."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Mostrar axuda"
+msgid "Configure Scheduled Tasks"
+msgstr "Configurar as tarefas planificadas "
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Descrición da tarefa:"
+msgid "Edit a scheduled task"
+msgstr "Editar unha tarefa planificada"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Tarefa:"
+msgid "Delete a scheduled task"
+msgstr "Eliminar a tarefa seleccionada"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Modelos"
+msgid "Run selected task"
+msgstr "Executar a tarefa seleccionada"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Axuda para a expresión de hora"
+msgid "Run task"
+msgstr "Executar tarefa"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Hora:"
+msgid "Templates"
+msgstr "Modelos"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Até:"
+msgid "Change edit mode"
+msgstr "Cambiar ao modo de edición"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Aplicativo X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Seleccione o usuario ao que quere modificarlle as tarefas"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Mostrar axuda"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Usuario:"
+msgid "About Gnome-schedule"
+msgstr "Sobre Gnome-schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Tarefas planificadas e activas"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
diff --git a/po/gu.po b/po/gu.po
index 8904ae8..195c697 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2009-05-18 12:29+0530\n"
 "Last-Translator: Sweta Kothari <swkothar redhat com>\n"
 "Language-Team: Gujarati\n"
@@ -19,56 +19,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "તમારા સિસ્ટમ કાર્યોને સંચાલિત કરો"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "સુનિશ્ચિત થયેલ કાર્યો"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "તમારા સુનિશ્ચિત કામોને રૂપરેખાંકિત કરો"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "તમારા સિસ્ટમ કાર્યોને સંચાલિત કરો"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome સુનિશ્ચિત"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "તમારા સુનિશ્ચિત કામોને રૂપરેખાંકિત કરો"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "સિસ્ટમ સાધનો"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "%(timestring)s પર"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "એકવાર"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "શિર્ષક ન થયેલ"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "મિનિટ"
@@ -89,7 +95,7 @@ msgstr "મહિનો"
 msgid "Weekday"
 msgstr "અઠવાડિયાનાં દિવસ"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "મૂળભૂત"
 
@@ -108,52 +114,47 @@ msgstr "%(min)s અને %(max)s વચ્ચે હોવુ જ જોઇએ"
 msgid "%s is not a number"
 msgstr "%s એ નંબર નથી"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "શિર્ષક ન થયેલ"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "પુન:બુટ પર"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "મિનિટ"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "કલાક"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "દિવસ"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "મહિનો"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "અઠવાડિયાનાં દિવસ"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "દરેક સમયે"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "દરેક કલાકે"
 
@@ -171,19 +172,19 @@ msgstr "દરેક અઠવાડિયે"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "નવું સુનિશ્ચિત થયેલ કાર્ય ને બનાવો"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "ટેમ્પલ્ટમાં ફેરફાર કરો"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "નવું ટેમ્પલેટ"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "સુનિશ્ચિત થયેલ કાર્યમાં ફેરફાર કરો"
 
@@ -212,11 +213,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "ફરીથા બતાવો નહિં (_D)"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "ચેતવણી: ચલાવેલ કાર્યોની કામ કરતી ડિરેક્ટરી"
 
@@ -250,11 +251,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "આ અયોગ્ય છે. કારણ: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "ચોક્કસ મિનિટે"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "મિનિટ:"
 
@@ -263,7 +264,7 @@ msgstr "મિનિટ:"
 msgid "At an exact hour"
 msgstr "ચોક્કસ કલાકે"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "કલાક:"
 
@@ -272,7 +273,7 @@ msgstr "કલાક:"
 msgid "On a day"
 msgstr "દિવસ પર"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "દિવસ:"
 
@@ -281,7 +282,7 @@ msgstr "દિવસ:"
 msgid "In a month"
 msgstr "મહિનામાં"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "મહિનો:"
 
@@ -290,15 +291,15 @@ msgstr "મહિનો:"
 msgid "On a weekday"
 msgstr "અઠવાડિયાનાં દિવસ પર"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "અઠવાડિયાનાં દિવસ:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "પગલાંની પહોળાઇમાં"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "મિનિટો:"
 
@@ -319,8 +320,8 @@ msgid "Weekdays:"
 msgstr "અઠવાડિયાનાં દિવસો:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "વિશે (_b)"
+msgid "_Manage tasks"
+msgstr "કાર્યોને સંચાલિત કરો (_M)"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -331,8 +332,8 @@ msgid "_Help"
 msgstr "મદદ (_H)"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "કાર્યોને સંચાલિત કરો (_M)"
+msgid "A_bout"
+msgstr "વિશે (_b)"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -363,13 +364,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -416,68 +420,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "ટેમ્પલેટને પસંદ કરો"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "પસંદ થયેલ ટેમ્પલેટ માંથી નવા કાર્યને બનાવો"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "ટેમ્પલેટોને સંચાલિત કરો"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>વપરાશકર્તાને પસંદ કરો જેનાં કાર્યો તમે બદલવા માંગો છો</b>"
+msgid "Create a new template."
+msgstr "નવા ટેમ્પલેટને બનાવો."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>સુનિશ્ચિત થયેલ કાર્યનાં પ્રકારને પસંદ કરો:</b>"
+msgid "Edit the selected template"
+msgstr "પસંદ થયેલ ટેમ્પલેટમાં ફેરફાર કરો"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>પૂર્વદર્શન</big>"
+msgid "Delete the selected template"
+msgstr "પસંદ થયેલ ટેમ્પલેટને કાઢી નાંખો"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>સમય &amp; તારીખ</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Gnome-schedule વિશે"
+msgid "Task description:"
+msgstr "કાર્ય વર્ણન:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "સુનિશ્ચિત કાર્યને ઉમેરો"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X કાર્યક્રમ"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "ટેમ્પલેટને ઉમેરો"
+msgid "Execute at:"
+msgstr "પર ચલાવો:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "ઉન્નત થયેલ"
+msgid "Date:"
+msgstr "તારીખ:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "સમય:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "વપરાશકર્તાને બદલો"
+msgid "Task:"
+msgstr "કાર્ય:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "ફેરફાર સ્થિતિને બદલો"
+msgid "Add as template"
+msgstr "ટેમ્પલેટને ઉમેરો"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "ટેમ્પલેટને પસંદ કરો"
+msgid "Edit a periodical task"
+msgstr "નિયતકાલિક કાર્યમાં ફેરફાર કરો"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "વપરાશકર્તાને પસંદ કરો કે જેનાં કાર્યો તમે બદલવા માંગો છો"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -485,144 +497,138 @@ msgid "Command:"
 msgstr "આદેશ:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "સુનિશ્ચિત કાર્યોને રૂપરેખાંકિત કરો"
+msgid "Description:"
+msgstr "વર્ણન:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "પસંદ થયેલ ટેમ્પલેટ માંથી નવા કાર્યને બનાવો"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "નવા ટેમ્પલેટને બનાવો."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>સમય &amp; તારીખ</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "તારીખ:"
+msgid "Advanced"
+msgstr "ઉન્નત થયેલ"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "સુનિશ્ચિત થયેલ કાર્ય ને કાઢી નાંખો"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "પસંદ થયેલ ટેમ્પલેટને કાઢી નાંખો"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "વર્ણન:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "નિયતકાલિક કાર્યમાં ફેરફાર કરો"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "સુનિશ્ચિત થયેલ કાર્યમાં ફેરફાર કરો"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>પૂર્વદર્શન</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "પસંદ થયેલ ટેમ્પલેટમાં ફેરફાર કરો"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "વપરાશકર્તાને બદલો"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "પર ચલાવો:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>વપરાશકર્તાને પસંદ કરો જેનાં કાર્યો તમે બદલવા માંગો છો</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "ચોક્કસ મિનિટ, કલાક, દિવસ, અઠવાડિયાનાં દિવસ અથવા મહિના પર ચલાવો."
+msgid "_User:"
+msgstr "વપરાશકર્તા (_U):"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
+msgid "Add a Scheduled Task"
+msgstr "સુનિશ્ચિત કાર્યને ઉમેરો"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr ""
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>સુનિશ્ચિત થયેલ કાર્યનાં પ્રકારને પસંદ કરો:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "સીમામાં ચલાવો."
+msgid "Time expression help"
+msgstr "સમયને વ્યક્ત કરવા માટે મદદ"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "વ્યક્ત કરવુ:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "થી:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "માંથી:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "સીમા માં"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "બીજા"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "ટેમ્પલેટોને સંચાલિત કરો"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "ક્રોનટેબ બંધારણ વિશે વધારે જાણકારી માટે \"man 5 crontab\" જુઓ."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "બીજા"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "ચોક્કસ મિનિટ, કલાક, દિવસ, અઠવાડિયાનાં દિવસ અથવા મહિના પર ચલાવો."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "પસંદ થયેલ કાર્યને ચલાવો"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "સીમા માં"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "કાર્યને ચલાવો"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "સીમામાં ચલાવો."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "કાર્યોને સક્રિય અને સુનિશ્ચિત કરો"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "ક્રોનટેબ બંધારણ વિશે વધારે જાણકારી માટે \"man 5 crontab\" જુઓ."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "મદદ બતાવો"
+msgid "Configure Scheduled Tasks"
+msgstr "સુનિશ્ચિત કાર્યોને રૂપરેખાંકિત કરો"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "કાર્ય વર્ણન:"
+msgid "Edit a scheduled task"
+msgstr "સુનિશ્ચિત થયેલ કાર્યમાં ફેરફાર કરો"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "કાર્ય:"
+msgid "Delete a scheduled task"
+msgstr "સુનિશ્ચિત થયેલ કાર્ય ને કાઢી નાંખો"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "ટેમ્પલેટો"
+msgid "Run selected task"
+msgstr "પસંદ થયેલ કાર્યને ચલાવો"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "સમયને વ્યક્ત કરવા માટે મદદ"
+msgid "Run task"
+msgstr "કાર્યને ચલાવો"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "સમય:"
+msgid "Templates"
+msgstr "ટેમ્પલેટો"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "થી:"
+msgid "Change edit mode"
+msgstr "ફેરફાર સ્થિતિને બદલો"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X કાર્યક્રમ"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "વપરાશકર્તાને પસંદ કરો કે જેનાં કાર્યો તમે બદલવા માંગો છો"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "મદદ બતાવો"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "વપરાશકર્તા (_U):"
+msgid "About Gnome-schedule"
+msgstr "Gnome-schedule વિશે"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "કાર્યોને સક્રિય અને સુનિશ્ચિત કરો"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1064,23 +1070,23 @@ msgstr "કાર્ય કે જે એકજ સમયે શરૂ કરે
 msgid "A task from a predefined template"
 msgstr "પહેલેથી થયેલ ટેમ્પલેટ માંથી કાર્ય"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "કેલેન્ડર"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "આ અયોગ્ય અહેવાલ છે! સમસ્યા આ હોઇ શકે છે: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/hu.po b/po/hu.po
index cadf1f9..940f048 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule.HEAD.hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-01-06 18:37+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng gnome hu>\n"
 "Language-Team: Hungarian <gnome gnome hu>\n"
@@ -19,57 +19,63 @@ msgstr ""
 "Plural-Forms:   nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Rendszerfeladatok kezelése"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Ütemezett feladat hozzáadása"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Ütemezett feladatok beállítása"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Rendszerfeladatok kezelése"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome ütemező"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Ütemezett feladatok beállítása"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Rendszereszközök"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "%(date)s napon %(time)s-kor"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Egyszer"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Névtelen"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Perc"
@@ -90,7 +96,7 @@ msgstr "Hónap"
 msgid "Weekday"
 msgstr "Hétköznap"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Alap"
 
@@ -109,52 +115,47 @@ msgstr "%(min)s és %(max)s között kell lennie"
 msgid "%s is not a number"
 msgstr "%s nem egy szám"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Névtelen"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Ismétlődő"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "perc"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "óra"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "nap"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "hónap"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "hétköznap"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Minden percben"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Minden órában"
 
@@ -172,21 +173,21 @@ msgstr "Minden héten"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Új ütemezett feladat létrehozása"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "Sa_blon:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "Feladat _hozzáadása"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Ütemezett feladat szerkesztése"
 
@@ -217,11 +218,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -259,11 +260,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Ez érvénytelen. Ok: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Egy adott percben"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Perc:"
 
@@ -272,7 +273,7 @@ msgstr "Perc:"
 msgid "At an exact hour"
 msgstr "Egy adott órában"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Óra:"
 
@@ -281,7 +282,7 @@ msgstr "Óra:"
 msgid "On a day"
 msgstr "Egy napon"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Nap:"
 
@@ -290,7 +291,7 @@ msgstr "Nap:"
 msgid "In a month"
 msgstr "Egy hónapban"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Hónap:"
 
@@ -299,16 +300,16 @@ msgstr "Hónap:"
 msgid "On a weekday"
 msgstr "Egy hétköznapon"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Hétköznap:"
 
 # fixme megnézni miez, jóez?
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Egy lépés szélességben"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Perc:"
 
@@ -329,8 +330,8 @@ msgid "Weekdays:"
 msgstr "Hétköznap:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Névjegy"
+msgid "_Manage tasks"
+msgstr "_Feladatok kezelése"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -341,8 +342,8 @@ msgid "_Help"
 msgstr "_Súgó"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Feladatok kezelése"
+msgid "A_bout"
+msgstr "_Névjegy"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -373,13 +374,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -426,74 +430,88 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "A kijelölt sablon eltávolítása"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "_Feladatok kezelése"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
-"<b>Válassza ki a felhasználót, akinek a feladatait módosítani kívánja</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "Feladat _hozzáadása"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Válassza ki az ütemezett feladat típusát</b>"
+msgid "Edit the selected template"
+msgstr "A kijelölt sablon eltávolítása"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Előnézet</b>"
+msgid "Delete the selected template"
+msgstr "A kijelölt sablon eltávolítása"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "A Gnome ütemező névjegye"
+msgid "Task description:"
+msgstr "_Leírás:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Ütemezett feladat hozzáadása"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Az alkalmazás névjegye"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "Feladat _hozzáadása"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Haladó"
+#, fuzzy
+msgid "Date:"
+msgstr "_Dátum:"
+
+#: ../src/gnome-schedule.glade.h:12
+#, fuzzy
+msgid "Time:"
+msgstr "Cím"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Felhasználó váltása"
+#, fuzzy
+msgid "Task:"
+msgstr "_Feladat"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "Feladat _hozzáadása"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Ütemezett feladat szerkesztése"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
-"Válassza ki a felhasználót, akinek az ütemezett feladatait módosítani kívánja"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -502,163 +520,151 @@ msgid "Command:"
 msgstr "_Parancs:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Ütemezett feladatok beállítása"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "A kijelölt sablon eltávolítása"
+msgid "Description:"
+msgstr "_Leírás:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "Feladat _hozzáadása"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Dátum:"
+msgid "Advanced"
+msgstr "Haladó"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Ütemezett feladat törlése"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "A kijelölt sablon eltávolítása"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "_Leírás:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Ütemezett feladat szerkesztése"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Ütemezett feladat szerkesztése"
+msgid "<big>Preview</big>"
+msgstr "<b>Előnézet</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "A kijelölt sablon eltávolítása"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Felhasználó váltása"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
+"<b>Válassza ki a felhasználót, akinek a feladatait módosítani kívánja</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"Végrehajtás egy adott percben, órában, napon, hétköznapon vagy hónapban."
+msgid "_User:"
+msgstr "_Felhasználó:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Végrehajtás megadott lépésközzel. Például, minden ötödik percben, órában, "
-"napon, hétköznapon vagy hónapban."
+msgid "Add a Scheduled Task"
+msgstr "Ütemezett feladat hozzáadása"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Végrehajtás minden percben, órában, napon, hétköznapon vagy hónapban."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Válassza ki az ütemezett feladat típusát</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Végrehajtás egy időközben."
+msgid "Time expression help"
+msgstr "Súgó az időkifejezéshez"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Kifejezés:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Eddig:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Ettől:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Egy tartományban"
-
-#: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "_Feladatok kezelése"
-
-#: ../src/gnome-schedule.glade.h:47
+#: ../src/gnome-schedule.glade.h:42
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Kérem válasszon egy feladatot"
+#: ../src/gnome-schedule.glade.h:43
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"A crontab formátumáról szóló információkért lásd a \"man 5 crontab\" "
+"kézikönyvoldalt."
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
 msgstr ""
+"Végrehajtás egy adott percben, órában, napon, hétköznapon vagy hónapban."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Ütemezett és aktív feladatok"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Egy tartományban"
+
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Végrehajtás egy időközben."
+
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Végrehajtás minden percben, órában, napon, hétköznapon vagy hónapban."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"A crontab formátumáról szóló információkért lásd a \"man 5 crontab\" "
-"kézikönyvoldalt."
+"Végrehajtás megadott lépésközzel. Például, minden ötödik percben, órában, "
+"napon, hétköznapon vagy hónapban."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Súgó megjelenítése"
+msgid "Configure Scheduled Tasks"
+msgstr "Ütemezett feladatok beállítása"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "_Leírás:"
+msgid "Edit a scheduled task"
+msgstr "Ütemezett feladat szerkesztése"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Feladat"
+msgid "Delete a scheduled task"
+msgstr "Ütemezett feladat törlése"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "Sa_blon:"
+msgid "Run selected task"
+msgstr "Kérem válasszon egy feladatot"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Súgó az időkifejezéshez"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
 #, fuzzy
-msgid "Time:"
-msgstr "Cím"
+msgid "Templates"
+msgstr "Sa_blon:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Eddig:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Az alkalmazás névjegye"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+"Válassza ki a felhasználót, akinek az ütemezett feladatait módosítani kívánja"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Súgó megjelenítése"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Felhasználó:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "A Gnome ütemező névjegye"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Ütemezett és aktív feladatok"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1139,23 +1145,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Ez egy érvénytelen rekord! A hiba a következő lehet: %s "
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/it.po b/po/it.po
index aa77b46..92e166f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule-it 2.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2009-08-31 16:20+0200\n"
 "Last-Translator: Andrea Zagli <azagli libero it>\n"
 "Language-Team: Italian <tp lists linux it>\n"
@@ -17,26 +17,26 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Gestisce i compiti di sistema"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Compiti pianificati"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configura i propri compiti pianificati"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Gestisce i compiti di sistema"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configura i propri compiti pianificati"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Strumenti di sistema"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -44,7 +44,7 @@ msgstr ""
 "Fallita la creazione della directory dati. Assicurarsi che ~/.gnome e ~/."
 "gnome/gnome-schedule siano scrivibili."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -53,24 +53,31 @@ msgstr ""
 "Fallita la creazione della directory dati: %s. Assicurarsi che ~/.gnome e ~/."
 "gnome/gnome-schedule siano scrivibili."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr "Attenzione. Compito sconosciuto: %(preview)s"
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "In %(timestring)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Una volta"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Attenzione: una riga nell'output di atq non è stata analizzata"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Senza titolo"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minuto"
@@ -91,7 +98,7 @@ msgstr "Mese"
 msgid "Weekday"
 msgstr "Giorno della settimana"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Base"
 
@@ -110,41 +117,36 @@ msgstr "Deve essere compreso tra %(min)s e %(max)s"
 msgid "%s is not a number"
 msgstr "%s non è un numero"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Senza titolo"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Ricorrente"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Al riavvio"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "ora"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "giorno"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "mese"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "giorno della settimana"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -152,12 +154,12 @@ msgstr ""
 "«crontab»."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Ogni minuto"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Ogni ora"
 
@@ -175,19 +177,19 @@ msgstr "Ogni settimana"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Crea un nuovo compito pianificato"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Modifica modello"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Nuovo modello"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Modifica un compito pianificato"
 
@@ -228,11 +230,11 @@ msgstr ""
 "\n"
 "i compiti ricorrenti saranno eseguiti dalla directory home."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "Non mostrare _di nuovo"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Attenzione: directory di lavoro dei compiti eseguiti"
 
@@ -266,11 +268,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Questo non è valido. Motivo: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "A un minuto esatto"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuto:"
 
@@ -279,7 +281,7 @@ msgstr "Minuto:"
 msgid "At an exact hour"
 msgstr "A un'ora esatta"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ora:"
 
@@ -288,7 +290,7 @@ msgstr "Ora:"
 msgid "On a day"
 msgstr "A un giorno"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Giorno:"
 
@@ -297,7 +299,7 @@ msgstr "Giorno:"
 msgid "In a month"
 msgstr "A un mese"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mese:"
 
@@ -306,16 +308,16 @@ msgstr "Mese:"
 msgid "On a weekday"
 msgstr "Un giorno della settimana"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Giorno della settimana:"
 
 #
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "A intervalli di tempo"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuti:"
 
@@ -336,8 +338,8 @@ msgid "Weekdays:"
 msgstr "Giorni della settimana:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "I_nformazioni"
+msgid "_Manage tasks"
+msgstr "_Gestisci i compiti"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -348,8 +350,8 @@ msgid "_Help"
 msgstr "A_iuto"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Gestisci i compiti"
+msgid "A_bout"
+msgstr "I_nformazioni"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -380,13 +382,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -433,68 +438,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Scegli modello"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Crea un nuovo compito dal modello selezionato"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Gestisci modelli"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Scegliere l'utente di cui modificare i compiti</b>"
+msgid "Create a new template."
+msgstr "Crea un nuovo modello."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Selezionare il tipo di compito pianificato:</b>"
+msgid "Edit the selected template"
+msgstr "Modifica il modello selezionato"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Anteprima</big>"
+msgid "Delete the selected template"
+msgstr "Elimina il modello selezionato"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Ora e data</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Informazioni su Gnome-schedule"
+msgid "Task description:"
+msgstr "Descrizione compito:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Aggiungi un compito pianificato"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Applicazione X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Aggiungi come modello"
+msgid "Execute at:"
+msgstr "Eseguire a:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avanzata"
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Ora:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Cambia utente"
+msgid "Task:"
+msgstr "Compito:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Cambia la modalità modifica"
+msgid "Add as template"
+msgstr "Aggiungi come modello"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Scegli modello"
+msgid "Edit a periodical task"
+msgstr "Modifica un compito periodico"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Scegliere l'utente di cui si vogliono modificare i compiti"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -502,148 +515,142 @@ msgid "Command:"
 msgstr "Comando:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configura i compiti pianificati"
+msgid "Description:"
+msgstr "Descrizione:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Crea un nuovo compito dal modello selezionato"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Crea un nuovo modello."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Ora e data</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data:"
+msgid "Advanced"
+msgstr "Avanzata"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Elimina un compito pianificato"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Elimina il modello selezionato"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Modifica un compito periodico"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Modifica un compito pianificato"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Anteprima</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Modifica il modello selezionato"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Cambia utente"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Eseguire a:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Scegliere l'utente di cui modificare i compiti</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"Esecuzione a uno specifico minuto, ora, giorno, giorno della settimana o "
-"mese."
+msgid "_User:"
+msgstr "_Utente:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Esecuzione a intervalli di tempo. Per esempio ogni cinque minuti, ore, "
-"giorni, giorni della settimana o mesi."
+msgid "Add a Scheduled Task"
+msgstr "Aggiungi un compito pianificato"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Esecuzione a ogni minuto, ora, giorno, giorno della settimana o mese."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Selezionare il tipo di compito pianificato:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Esecuzione in un intervallo."
+msgid "Time expression help"
+msgstr "Aiuto per l'espressione dell'ora"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Espressione:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "A:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Da:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "In un intervallo"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Altro"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Gestisci modelli"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Vedere «man 5 crontab» per informazioni sul formato di crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Altro"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+"Esecuzione a uno specifico minuto, ora, giorno, giorno della settimana o "
+"mese."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Esegui compito selezionato"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "In un intervallo"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Esegui compito"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Esecuzione in un intervallo."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Compiti pianificati e attivi"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Esecuzione a ogni minuto, ora, giorno, giorno della settimana o mese."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Vedere «man 5 crontab» per informazioni sul formato di crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Esecuzione a intervalli di tempo. Per esempio ogni cinque minuti, ore, "
+"giorni, giorni della settimana o mesi."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Mostra l'aiuto"
+msgid "Configure Scheduled Tasks"
+msgstr "Configura i compiti pianificati"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Descrizione compito:"
+msgid "Edit a scheduled task"
+msgstr "Modifica un compito pianificato"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Compito:"
+msgid "Delete a scheduled task"
+msgstr "Elimina un compito pianificato"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Modelli"
+msgid "Run selected task"
+msgstr "Esegui compito selezionato"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Aiuto per l'espressione dell'ora"
+msgid "Run task"
+msgstr "Esegui compito"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Ora:"
+msgid "Templates"
+msgstr "Modelli"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "A:"
+msgid "Change edit mode"
+msgstr "Cambia la modalità modifica"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Applicazione X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Scegliere l'utente di cui si vogliono modificare i compiti"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Mostra l'aiuto"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Utente:"
+msgid "About Gnome-schedule"
+msgstr "Informazioni su Gnome-schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Compiti pianificati e attivi"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1130,11 +1137,11 @@ msgstr "Un compito che viene lanciato una volta"
 msgid "A task from a predefined template"
 msgstr "Un compito da un modello predefinito"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1144,12 +1151,12 @@ msgstr ""
 "numero fuori intervallo. Ricordare che un'ora ha solo 60 minuti e un giorno "
 "solamente 24 ore."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Questa impostazione non è valida. Il problema potrebbe essere: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/lt.po b/po/lt.po
index dd59e2f..5eb3efd 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-04-21 01:33+0300\n"
 "Last-Translator: Žygimantas Beručka <uid0 akl lt>\n"
 "Language-Team: Lithuanian <komp_lt konferencijos lt>\n"
@@ -17,59 +17,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Valdykit Jūsų sistemos užduotis"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Nustatyti suplanuotą užduotį"
 
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Valdykit Jūsų sistemos užduotis"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "Konfigūruoti suplanuotas užduotis"
+msgid "Gnome schedule"
+msgstr "Gnome tvarkaraštis"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
-msgid "Gnome schedule"
-msgstr "Gnome tvarkaraštis"
+msgid "Configures your scheduled tasks"
+msgstr "Konfigūruoti suplanuotas užduotis"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "%(date)s  %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "KartÄ…"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Nepavadinta"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "MinutÄ—"
@@ -90,7 +96,7 @@ msgstr "MÄ—nuo"
 msgid "Weekday"
 msgstr "SavaitÄ—s diena"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Paprasta"
 
@@ -109,52 +115,47 @@ msgstr "Turi būti tarp %s ir %s"
 msgid "%s is not a number"
 msgstr "%s nėra skaičius"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Nepavadinta"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Pasikartojanti"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minutÄ™"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "valandÄ…"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dienÄ…"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "mėnesį"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "savaitÄ—s dienÄ…"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "KiekvienÄ… minutÄ™"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "KiekvienÄ… valandÄ…"
 
@@ -172,21 +173,21 @@ msgstr "KiekvienÄ… savaitÄ™"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Sukurti naują suplanuotą užduotį"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Trafaretas:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Pridėti užduotį"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Keisti suplanuotą užduotį"
 
@@ -216,11 +217,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -259,12 +260,12 @@ msgid "This is invalid. Reason: %s"
 msgstr "Netinkama. Priežastis: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "KiekvienÄ… minutÄ™"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "_MinutÄ—:"
@@ -274,7 +275,7 @@ msgstr "_MinutÄ—:"
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "_Valanda:"
@@ -284,7 +285,7 @@ msgstr "_Valanda:"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 #, fuzzy
 msgid "Day:"
 msgstr "_Data:"
@@ -295,7 +296,7 @@ msgstr "_Data:"
 msgid "In a month"
 msgstr "mėnesį"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "MÄ—nuo"
@@ -306,16 +307,16 @@ msgstr "MÄ—nuo"
 msgid "On a weekday"
 msgstr "savaitÄ—s dienÄ…"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "SavaitÄ—s diena"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "Mi_nutÄ—s:"
@@ -341,8 +342,8 @@ msgstr "_SavaitÄ—s dienos:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
 #, fuzzy
-msgid "A_bout"
-msgstr "_Apie"
+msgid "_Manage tasks"
+msgstr "Valdykit Jūsų sistemos užduotis"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -355,8 +356,8 @@ msgstr "_Pagalba"
 
 #: ../src/gnome-schedule-applet.xml.h:4
 #, fuzzy
-msgid "_Manage tasks"
-msgstr "Valdykit Jūsų sistemos užduotis"
+msgid "A_bout"
+msgstr "_Apie"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -387,13 +388,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -440,72 +444,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "Valdykit Jūsų sistemos užduotis"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Pasirinkite naudotoją, kurio užduotis norite keisti</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Pridėti užduotį"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Pasirinkite suplanuotos užduoties tipą</b>"
+msgid "Edit the selected template"
+msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Peržiūra</b>"
+msgid "Delete the selected template"
+msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Gnome tvarkaraštis"
+msgid "Task description:"
+msgstr "Ap_rašymas:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Pridėti suplanuotą užduotį"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Apie Å¡iÄ… programÄ…"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "_Pridėti užduotį"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "SudÄ—tinga"
+#, fuzzy
+msgid "Date:"
+msgstr "_Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Laikas:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Pakeisti naudotojÄ…"
+#, fuzzy
+msgid "Task:"
+msgstr "_Užduotys"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Pridėti užduotį"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Keisti suplanuotą užduotį"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Pasirinkite naudotoją, kurio užduotis norite pakeisti"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -514,76 +533,55 @@ msgid "Command:"
 msgstr "Ko_manda:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Konfigūruoti suplanuotas užduotis"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
+msgid "Description:"
+msgstr "Ap_rašymas:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Pridėti užduotį"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Data:"
+msgid "Advanced"
+msgstr "SudÄ—tinga"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Ištrinti suplanuotą užduotį"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Ap_rašymas:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Keisti suplanuotą užduotį"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Keisti suplanuotą užduotį"
+msgid "<big>Preview</big>"
+msgstr "<b>Peržiūra</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "IÅ¡trinti pasirinktÄ… trafaretÄ…"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Pakeisti naudotojÄ…"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Pasirinkite naudotoją, kurio užduotis norite keisti</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Vykdymas nurodytą minutę, valandą, dieną, savaitės dieną, mėnesį."
+msgid "_User:"
+msgstr "_Naudotojas"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Vykdymas tam tikru žingsniu. Pvz. kas penkias minutes, valandas, dienas, "
-"savaitÄ—s dienas ar mÄ—nesius."
+msgid "Add a Scheduled Task"
+msgstr "Pridėti suplanuotą užduotį"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Vykdymas kiekvieną minutė, valandą, dieną, savaitės dieną ar mėnesį."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Pasirinkite suplanuotos užduoties tipą</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Vykdyti ribose."
+msgid "Time expression help"
+msgstr "Laiko išraiškos pagalba"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -591,87 +589,95 @@ msgid "Expression:"
 msgstr "Kita išraiška"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
 #, fuzzy
-msgid "Manage templates"
-msgstr "Valdykit Jūsų sistemos užduotis"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Norėdami gauti daugiau informacijos apie crontab formatą, žr. „man 5 "
+"crontab“."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Vykdymas nurodytą minutę, valandą, dieną, savaitės dieną, mėnesį."
+
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Prašau pasirinkite užduotį"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Vykdyti ribose."
 
 #: ../src/gnome-schedule.glade.h:49
-#, fuzzy
-msgid "Run task"
-msgstr "Paleisti laiku:"
-
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Suplanuotos ir aktyvios užduotys"
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Vykdymas kiekvieną minutė, valandą, dieną, savaitės dieną ar mėnesį."
 
 #: ../src/gnome-schedule.glade.h:51
-#, fuzzy
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Norėdami gauti daugiau informacijos apie crontab formatą, žr. „man 5 "
-"crontab“."
+"Vykdymas tam tikru žingsniu. Pvz. kas penkias minutes, valandas, dienas, "
+"savaitÄ—s dienas ar mÄ—nesius."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Rodyti pagalbÄ…"
+msgid "Configure Scheduled Tasks"
+msgstr "Konfigūruoti suplanuotas užduotis"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "Ap_rašymas:"
+msgid "Edit a scheduled task"
+msgstr "Keisti suplanuotą užduotį"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Užduotys"
+msgid "Delete a scheduled task"
+msgstr "Ištrinti suplanuotą užduotį"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Trafaretas:"
+msgid "Run selected task"
+msgstr "Prašau pasirinkite užduotį"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Laiko išraiškos pagalba"
+#, fuzzy
+msgid "Run task"
+msgstr "Paleisti laiku:"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Laikas:"
+#, fuzzy
+msgid "Templates"
+msgstr "_Trafaretas:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Apie Å¡iÄ… programÄ…"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Pasirinkite naudotoją, kurio užduotis norite pakeisti"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Rodyti pagalbÄ…"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Naudotojas"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Gnome tvarkaraštis"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Suplanuotos ir aktyvios užduotys"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1158,23 +1164,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Netinkamas įrašas! Problema gali būti: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/nb.po b/po/nb.po
index f9b6ef1..123d77e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-01-16 15:36+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Noksk bokmal <i18n-nb lister ping uio no>\n"
@@ -17,56 +17,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
+msgid "Scheduled tasks"
 msgstr ""
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:2
-msgid "Scheduled tasks"
+msgid "Manage your system tasks"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
+msgid "Gnome schedule"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
-msgid "Gnome schedule"
+msgid "Configures your scheduled tasks"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr ""
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr ""
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Uten navn"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minutt"
@@ -87,7 +93,7 @@ msgstr "MÃ¥ned"
 msgid "Weekday"
 msgstr "Ukedag"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Grunnleggende"
 
@@ -106,53 +112,48 @@ msgstr "Må være mellom %s og %s"
 msgid "%s is not a number"
 msgstr "%s er ikke et tall"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Uten navn"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minutt"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "time"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dag"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "måned"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "ukedag"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "minutt"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "Hver"
@@ -174,19 +175,19 @@ msgstr "Hver"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr ""
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr ""
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr ""
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr ""
 
@@ -215,11 +216,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -258,11 +259,11 @@ msgid "This is invalid. Reason: %s"
 msgstr ""
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "Minutt"
@@ -272,7 +273,7 @@ msgstr "Minutt"
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "Time"
@@ -282,7 +283,7 @@ msgstr "Time"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr ""
 
@@ -292,7 +293,7 @@ msgstr ""
 msgid "In a month"
 msgstr "måned"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "MÃ¥ned"
@@ -303,16 +304,16 @@ msgstr "MÃ¥ned"
 msgid "On a weekday"
 msgstr "ukedag"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "Ukedag"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "Minutt"
@@ -337,7 +338,7 @@ msgid "Weekdays:"
 msgstr "Ukedag"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
+msgid "_Manage tasks"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:2
@@ -349,7 +350,7 @@ msgid "_Help"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
+msgid "A_bout"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:45
@@ -380,13 +381,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 msgid "Gnome Schedule: Import tasks"
@@ -432,67 +436,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
+msgid "Create a new task from the selected template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
+msgid "Manage templates"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgid "Create a new template."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
+msgid "Edit the selected template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
+msgid "Delete the selected template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
+msgid "Task description:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Om dette programmet"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
+msgid "Execute at:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avansert"
+msgid "Date:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Tid:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
+msgid "Task:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
+msgid "Add as template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
+msgid "Edit a periodical task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
@@ -502,67 +515,52 @@ msgid "Command:"
 msgstr "kommando"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr ""
+#, fuzzy
+msgid "Description:"
+msgstr "Skript"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
+msgid "<big>Time &amp; Date</big>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr ""
+msgid "Advanced"
+msgstr "Avansert"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
+msgid "0"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Skript"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
+msgid "*"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
 msgstr ""
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
+msgid "_User:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
+msgid "Add a Scheduled Task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
+msgid "<b>Select the type of the scheduled task:</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
+msgid "Time expression help"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:38
@@ -570,77 +568,85 @@ msgid "Expression:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
+msgid "See \"man 5 crontab\" for information about the crontab format."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Vis hjelp"
+msgid "Configure Scheduled Tasks"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
+msgid "Edit a scheduled task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
+msgid "Delete a scheduled task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
+msgid "Run selected task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
+msgid "Run task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Tid:"
+msgid "Templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Om dette programmet"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Vis hjelp"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
+msgid "About Gnome-schedule"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
+msgid "Scheduled and active tasks"
 msgstr ""
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
@@ -1084,23 +1090,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr ""
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/ne.po b/po/ne.po
index 5d83d83..0cec87d 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule.HEAD.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-06-11 15:58+0545\n"
 "Last-Translator: Mahesh subedi <submanesh hotmail com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -25,57 +25,64 @@ msgstr ""
 "Plural-Forms: nplurals=2;plural=(n!=1)\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "तपाईँको प्रणालीका कार्यहरू व्यवस्थापन गर्नुहोस् "
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "कार्यतालिकाको कार्य थप्नुहोस्"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "तपाईँको कार्यतालिकाको कार्यहरू कन्फिगर गर्नुहोस्"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "तपाईँको प्रणालीका कार्यहरू व्यवस्थापन गर्नुहोस् "
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "जिनोम कार्यतालिका"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "तपाईँको कार्यतालिकाको कार्यहरू कन्फिगर गर्नुहोस्"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "प्रणाली उपकरणहरू"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr " %(date)s at %(time)s मा"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "एकपटक "
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "चेतावनी: atq's एउटा लाइनमा निर्गत पद वर्णन गरेन"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "शीर्षक विहिन "
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "मिनेट"
@@ -96,7 +103,7 @@ msgstr "महिना"
 msgid "Weekday"
 msgstr "हप्तादिन"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "आधारभूत"
 
@@ -115,52 +122,47 @@ msgstr " %(min)s र %(max)sको बीचमा हुनुपर्दछ "
 msgid "%s is not a number"
 msgstr "%s सङ्ख्या होइन "
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "शीर्षक विहिन "
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "पुनराबृत्ति"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "मिनेट"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "घण्टा"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "दिन"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "महिना"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "हप्तादिन"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "प्रत्येक मिनेट"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "प्रत्येक घण्टा"
 
@@ -178,21 +180,21 @@ msgstr "प्रत्येक हप्ता"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "एक नयाँ कार्यतालिका कार्य निर्माण गर्नुहोस्"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "टेम्प्लेट:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "कार्य थप्नुहोस्"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "कार्य तालिकामा भएको कार्य सम्पादन गर्नुहोस्"
 
@@ -223,11 +225,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -265,11 +267,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "यो अमान्य छ। कारण: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "प्रत्येक मिनेटमा"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "मिनेट"
 
@@ -278,7 +280,7 @@ msgstr "मिनेट"
 msgid "At an exact hour"
 msgstr "निश्चित घण्टामा"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "घण्टा:"
 
@@ -287,7 +289,7 @@ msgstr "घण्टा:"
 msgid "On a day"
 msgstr "एक दिनमा"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "दिन:"
 
@@ -296,7 +298,7 @@ msgstr "दिन:"
 msgid "In a month"
 msgstr "एक महिनामा"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "महिना:"
 
@@ -305,15 +307,15 @@ msgstr "महिना:"
 msgid "On a weekday"
 msgstr "हप्तादिन मा"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "हप्तादिन:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "चरण चौडाइमा"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "मिनेट:"
 
@@ -334,8 +336,8 @@ msgid "Weekdays:"
 msgstr "हप्तादिनहरू:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "बारेमा"
+msgid "_Manage tasks"
+msgstr "कार्यहरू ब्यवस्थापन गर्नुहोस्"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -346,8 +348,8 @@ msgid "_Help"
 msgstr "मद्दत"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "कार्यहरू ब्यवस्थापन गर्नुहोस्"
+msgid "A_bout"
+msgstr "बारेमा"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -378,13 +380,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -431,72 +436,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "कार्यहरू ब्यवस्थापन गर्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>प्रयोगकर्ता रोज्नुहोस् जसको कार्य तपाईँ परिमार्जन गर्न चाहनुहुन्छ</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "कार्य थप्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>कार्यतालिकामा भएको कार्य प्रकार छनोट गर्नुहोस्</b>"
+msgid "Edit the selected template"
+msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>पूर्वदृश्य</b>"
+msgid "Delete the selected template"
+msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "जिनोम कार्यतालिकाका बारेमा"
+msgid "Task description:"
+msgstr "वर्णन:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "कार्यतालिकाको कार्य थप्नुहोस्"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "यो अनुप्रयोगका बारेमा"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "कार्य थप्नुहोस्"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "उन्नत"
+#, fuzzy
+msgid "Date:"
+msgstr "मिति:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "प्रयोगकर्ता परिवर्तन गर्नुहोस्"
+#, fuzzy
+msgid "Task:"
+msgstr "कार्य"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "कार्य थप्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "कार्य तालिकाको कार्य सम्पादन गर्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "प्रयोगकर्ता रोज्नुहोस् जसको कार्यहरू तपाईँ परिमार्जन गर्न चाहनुहुन्छ "
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -505,159 +525,146 @@ msgid "Command:"
 msgstr "आदेश:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "कार्यतालिकाको कार्यहरू कन्फिगर गर्नुहोस्"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
+msgid "Description:"
+msgstr "वर्णन:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "कार्य थप्नुहोस्"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "मिति:"
+msgid "Advanced"
+msgstr "उन्नत"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "कार्यतालिकाको कार्य मेट्नुहोस्"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "वर्णन:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "कार्य तालिकाको कार्य सम्पादन गर्नुहोस्"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "कार्य तालिकाको कार्य सम्पादन गर्नुहोस्"
+msgid "<big>Preview</big>"
+msgstr "<b>पूर्वदृश्य</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "चयन गरिएको टेम्प्लेट मेट्नुहोस् "
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "प्रयोगकर्ता परिवर्तन गर्नुहोस्"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>प्रयोगकर्ता रोज्नुहोस् जसको कार्य तपाईँ परिमार्जन गर्न चाहनुहुन्छ</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "निश्चित मिनेट, घण्टा, दिन, हप्तादिन वा महिनामा सञ्चालन गर्नुहोस्"
+msgid "_User:"
+msgstr "प्रयोगकर्ता:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"चरण चौडाइमा कार्यान्वयन, उदाहरणका लागि हरेक पाँच मिनेट, घण्टा दिनहरू  हप्तादिनहरू वा "
-"महिनाहरू।"
+msgid "Add a Scheduled Task"
+msgstr "कार्यतालिकाको कार्य थप्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "प्रत्येक मिनेट, घण्टा, दिन, हप्ता वा महिनामा कार्यान्वयन गर्नुहोस्।"
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>कार्यतालिकामा भएको कार्य प्रकार छनोट गर्नुहोस्</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "दायरामा कार्यान्वयन।"
+msgid "Time expression help"
+msgstr "समय अभिव्यक्ति मद्दत"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "अभिव्यक्ति:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "लाई:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "बाट:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "दायरामा:"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "अन्य"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "कार्यहरू ब्यवस्थापन गर्नुहोस्"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "क्रोनट्याब ढाँचाका बारेमा हेर्नका लागि \"man 5 crontab\" हेर्नुहोस्।"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "अन्य"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "निश्चित मिनेट, घण्टा, दिन, हप्तादिन वा महिनामा सञ्चालन गर्नुहोस्"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "कृपया कार्य चयन गर्नुहोस्"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "दायरामा:"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "दायरामा कार्यान्वयन।"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "कार्यतालिका र सक्रिय कार्यहरू"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "प्रत्येक मिनेट, घण्टा, दिन, हप्ता वा महिनामा कार्यान्वयन गर्नुहोस्।"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "क्रोनट्याब ढाँचाका बारेमा हेर्नका लागि \"man 5 crontab\" हेर्नुहोस्।"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"चरण चौडाइमा कार्यान्वयन, उदाहरणका लागि हरेक पाँच मिनेट, घण्टा दिनहरू  हप्तादिनहरू वा "
+"महिनाहरू।"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "मद्दत देखाउनुहोस्"
+msgid "Configure Scheduled Tasks"
+msgstr "कार्यतालिकाको कार्यहरू कन्फिगर गर्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "वर्णन:"
+msgid "Edit a scheduled task"
+msgstr "कार्य तालिकाको कार्य सम्पादन गर्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "कार्य"
+msgid "Delete a scheduled task"
+msgstr "कार्यतालिकाको कार्य मेट्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "टेम्प्लेट:"
+msgid "Run selected task"
+msgstr "कृपया कार्य चयन गर्नुहोस्"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "समय अभिव्यक्ति मद्दत"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "टेम्प्लेट:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "लाई:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "यो अनुप्रयोगका बारेमा"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "प्रयोगकर्ता रोज्नुहोस् जसको कार्यहरू तपाईँ परिमार्जन गर्न चाहनुहुन्छ "
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "मद्दत देखाउनुहोस्"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "प्रयोगकर्ता:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "जिनोम कार्यतालिकाका बारेमा"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "कार्यतालिका र सक्रिय कार्यहरू"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1124,23 +1131,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "यो अवैध रेकर्ड हो! समस्या हुन सक्थ्यो: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/nl.po b/po/nl.po
index 5e23710..3cf6ad8 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-01-12 14:22+0100\n"
 "Last-Translator: Tino Meinen <a t meinen chello nl>\n"
 "Language-Team: Dutch <vertaling vrijschrift org>\n"
@@ -18,58 +18,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Uw systeemtaken beheren"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "De geplande taak instellen"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configureert uw geplande taken"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Uw systeemtaken beheren"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome taakplanning"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configureert uw geplande taken"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Systeemgereedschap"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Op %(date)s om %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Eenmalig"
 
 # was/werd niet verwerkt
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Let op: een regel in atq's uitvoer kon niet worden verwerkt"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Naamloos"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minuut"
@@ -90,7 +97,7 @@ msgstr "Maand"
 msgid "Weekday"
 msgstr "Weekdag"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Basis"
 
@@ -109,53 +116,48 @@ msgstr "Moet tussen %(min)s en %(max)s liggen"
 msgid "%s is not a number"
 msgstr "%s is geen getal"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Naamloos"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Terugkerend"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 #, fuzzy
 msgid "At reboot"
 msgstr "root"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minuut"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "uur"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dag"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "maand"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "weekdag"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Elke minuut"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Elk uur"
 
@@ -173,22 +175,22 @@ msgstr "Elke week"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Een nieuwe geplande taak aanmaken"
 
 # sjabloon/voorinstelling
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Voorinstelling:"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Taak toevoegen"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Een geplande taak bewerken"
 
@@ -219,11 +221,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -261,11 +263,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Dit is ongeldig. Reden: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Op een bepaalde minuut"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuut:"
 
@@ -274,7 +276,7 @@ msgstr "Minuut:"
 msgid "At an exact hour"
 msgstr "Op een bepaald uur"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Uur:"
 
@@ -283,7 +285,7 @@ msgstr "Uur:"
 msgid "On a day"
 msgstr "Op een bepaalde dag"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dag:"
 
@@ -292,7 +294,7 @@ msgstr "Dag:"
 msgid "In a month"
 msgstr "In een bepaalde maand"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Maand:"
 
@@ -301,16 +303,16 @@ msgstr "Maand:"
 msgid "On a weekday"
 msgstr "Op een bepaalde weekdag"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Weekdag:"
 
 # in stapjes/in stappen van/
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "In stapgrootte"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuten:"
 
@@ -332,8 +334,8 @@ msgid "Weekdays:"
 msgstr "Weekdagen:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "I_nfo"
+msgid "_Manage tasks"
+msgstr "Taken _beheren"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -344,8 +346,8 @@ msgid "_Help"
 msgstr "_Hulp"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "Taken _beheren"
+msgid "A_bout"
+msgstr "I_nfo"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -376,13 +378,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -429,72 +434,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "De gekozen voorinstelling verwijderen"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "Taken _beheren"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Selecteer de gebruiker wiens taken u wilt aanpassen</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Taak toevoegen"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Kies het soort geplande taak</b>"
+msgid "Edit the selected template"
+msgstr "De gekozen voorinstelling verwijderen"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Voorbeeld</b>"
+msgid "Delete the selected template"
+msgstr "De gekozen voorinstelling verwijderen"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Over Gnome taakplanning"
+msgid "Task description:"
+msgstr "Omsch_rijving:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Een geplande taak toevoegen"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Over deze toepassing"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "_Taak toevoegen"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Geavanceerd"
+#, fuzzy
+msgid "Date:"
+msgstr "_Datum:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Tijd:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Gebruiker wijzigen"
+#, fuzzy
+msgid "Task:"
+msgstr "_Taak"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Taak toevoegen"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Een geplande taak bewerken"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Selecteer de gebruiker wiens taken u wilt aanpassen"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -503,163 +523,150 @@ msgid "Command:"
 msgstr "_Opdracht:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Geplande taken configureren"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "De gekozen voorinstelling verwijderen"
+msgid "Description:"
+msgstr "Omsch_rijving:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Taak toevoegen"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Datum:"
+msgid "Advanced"
+msgstr "Geavanceerd"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Een geplande taak verwijderen"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "De gekozen voorinstelling verwijderen"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Omsch_rijving:"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Een geplande taak bewerken"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Een geplande taak bewerken"
+msgid "<big>Preview</big>"
+msgstr "<b>Voorbeeld</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "De gekozen voorinstelling verwijderen"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Gebruiker wijzigen"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Selecteer de gebruiker wiens taken u wilt aanpassen</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Uitvoering op een bepaald tijdstip."
+msgid "_User:"
+msgstr "_Gebruiker:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Uitvoering met een bepaalde regelmaat, zoals elke vijf minuten of elke vijf "
-"dagen."
+msgid "Add a Scheduled Task"
+msgstr "Een geplande taak toevoegen"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr ""
-"Uitvoering op elke minuut, uur, dag, weekdag (doordeweekse dag) of maand."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Kies het soort geplande taak</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Uitvoeren in een bereik."
+msgid "Time expression help"
+msgstr "Tijdsuitdrukking hulp"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Uitdrukking:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Naar:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Van:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "In een bereik"
-
-#: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "Taken _beheren"
-
 # derde/andere/overige
-#: ../src/gnome-schedule.glade.h:47
+#: ../src/gnome-schedule.glade.h:42
 msgid "Other"
 msgstr "Overige"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Kies alstublieft een taak"
+#: ../src/gnome-schedule.glade.h:43
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Zie \"man 5 crontab\" voor informatie over het crontab-formaat."
 
-#: ../src/gnome-schedule.glade.h:49
-#, fuzzy
-msgid "Run task"
-msgstr "Uitvoeren op:"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Uitvoering op een bepaald tijdstip."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Geplande en actieve taken"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "In een bereik"
+
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Uitvoeren in een bereik."
+
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr ""
+"Uitvoering op elke minuut, uur, dag, weekdag (doordeweekse dag) of maand."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Zie \"man 5 crontab\" voor informatie over het crontab-formaat."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Uitvoering met een bepaalde regelmaat, zoals elke vijf minuten of elke vijf "
+"dagen."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Hulp weergeven"
+msgid "Configure Scheduled Tasks"
+msgstr "Geplande taken configureren"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "Omsch_rijving:"
+msgid "Edit a scheduled task"
+msgstr "Een geplande taak bewerken"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Taak"
+msgid "Delete a scheduled task"
+msgstr "Een geplande taak verwijderen"
 
-# sjabloon/voorinstelling
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Voorinstelling:"
+msgid "Run selected task"
+msgstr "Kies alstublieft een taak"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Tijdsuitdrukking hulp"
+#, fuzzy
+msgid "Run task"
+msgstr "Uitvoeren op:"
 
+# sjabloon/voorinstelling
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Tijd:"
+#, fuzzy
+msgid "Templates"
+msgstr "_Voorinstelling:"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Naar:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Over deze toepassing"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Selecteer de gebruiker wiens taken u wilt aanpassen"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Hulp weergeven"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Gebruiker:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Over Gnome taakplanning"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Geplande en actieve taken"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1132,23 +1139,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Dit is een ongeldig record! Het probleem kan zijn: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/nn.po b/po/nn.po
index d5ace4c..c6a82a5 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2007-12-26 16:25+0100\n"
 "Last-Translator: Gaute Hope <eg gaute vetsj com>\n"
 "Language-Team: Norwegian/Nynorsk <i18n-nn lister ping uio no>\n"
@@ -18,26 +18,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Administrer systemoppgåvene dine"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Planlagte oppgåver"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Konfigurer planlagte oppgåver"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Administrer systemoppgåvene dine"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome Schedule"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Konfigurer planlagte oppgåver"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Systemverkty"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -45,7 +45,7 @@ msgstr ""
 "Klarte ikkje å lage data mappa! Sjekk at du har skriveløyve på ~/.gnome og "
 "~/.gnome/gnome-schedule"
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -54,7 +54,7 @@ msgstr ""
 "Klarte ikkje lage data mappe: %s. Sjekk at du har skriveløyve på~/.gnome og "
 "~/.gnome/gnome-schedule."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
@@ -62,20 +62,27 @@ msgstr ""
 # python-format
 #
 #
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Den %(date)s kl %(time)s"
 
 #
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Ein gong"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Advarsel: Ei linje i utdataen frå atq kunne ikkje analyserast"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Namnlaus"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minutt"
@@ -96,7 +103,7 @@ msgstr "MÃ¥nad"
 msgid "Weekday"
 msgstr "Vekedag"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Enkel"
 
@@ -118,41 +125,36 @@ msgstr "MÃ¥ vere mellom %(min)s og %(max)s"
 msgid "%s is not a number"
 msgstr "%s er ikkje eit nummer"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Namnlaus"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Gjentakande"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Ved omstart"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minutt"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "time"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dag"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "månad"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "vekedag"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -160,12 +162,12 @@ msgstr ""
 "crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Kvart minutt"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Kvar time"
 
@@ -183,21 +185,21 @@ msgstr "Kvar veke"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Lag ei ny oppgåve"
 
 #
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Rediger førehandsoppsett"
 
 #
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Nytt førehandsoppsett"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Rediger ei planlagt oppgåve"
 
@@ -240,11 +242,11 @@ msgstr ""
 "\n"
 "Gjentakane oppgåver vil bli køyrde frå heimemappa."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Ikkje vis igjen"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Advarsel: Arbeidsmappe til oppgåver"
 
@@ -283,11 +285,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Dette er ugyldig. Grunn: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "PÃ¥ eit spesifikt minutt"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minutt:"
 
@@ -296,7 +298,7 @@ msgstr "Minutt:"
 msgid "At an exact hour"
 msgstr "PÃ¥ ein spesifikk time"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Time:"
 
@@ -305,7 +307,7 @@ msgstr "Time:"
 msgid "On a day"
 msgstr "PÃ¥ ein dag"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dag:"
 
@@ -314,7 +316,7 @@ msgstr "Dag:"
 msgid "In a month"
 msgstr "I ein månad"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "MÃ¥nad:"
 
@@ -323,15 +325,15 @@ msgstr "MÃ¥nad:"
 msgid "On a weekday"
 msgstr "PÃ¥ ein vekedag"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Vekedag:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Med eit mellomrom"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutt:"
 
@@ -352,8 +354,8 @@ msgid "Weekdays:"
 msgstr "Vekedagar:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Om"
+msgid "_Manage tasks"
+msgstr "Administrer dine system _oppgåver"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -364,8 +366,8 @@ msgid "_Help"
 msgstr "_Hjelp"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "Administrer dine system _oppgåver"
+msgid "A_bout"
+msgstr "_Om"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -396,13 +398,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -449,71 +454,86 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
+#
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Velg førehandsoppsett"
 
+#
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Lag ei ny oppgåve i frå det valde førehandsoppsettet"
 
+#
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Administrer førehandsoppsett"
 
+#
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Velg brukaren som du vil endre oppgåvene til</b>"
+msgid "Create a new template."
+msgstr "Lag eit nytt førehandsoppsett"
 
 #
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Velg typen av oppgåve:</b>"
+msgid "Edit the selected template"
+msgstr "Rediger merka førehandsoppsett"
 
-#
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Førehandsvisning</big>"
+msgid "Delete the selected template"
+msgstr "Slett merka førehandsoppsett"
 
+#
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Tid og dato</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Om Gnome Schedule"
+msgid "Task description:"
+msgstr "Oppgåve skildring"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Legg til ei planlagt oppgåve"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X applikasjon"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Legg til som førhandsoppsett"
+msgid "Execute at:"
+msgstr "Køyr:"
 
+#
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avansert"
+msgid "Date:"
+msgstr "Dato:"
 
+#
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Tid:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
+
+#
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Velg brukar"
+msgid "Task:"
+msgstr "Oppgåve:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Endre redigeringsmodus"
+msgid "Add as template"
+msgstr "Legg til som førhandsoppsett"
 
 #
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Velg førehandsoppsett"
+msgid "Edit a periodical task"
+msgstr "Rediger ei oppgåve"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Velg brukaren som du vil endre oppgåvene for"
+msgid "ls -l"
+msgstr "ls -l"
 
 #
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
@@ -521,158 +541,145 @@ msgstr "Velg brukaren som du vil endre oppgåvene for"
 msgid "Command:"
 msgstr "Kommando:"
 
+#
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Konfigurer planlagte oppgåver"
+msgid "Description:"
+msgstr "Skildring:"
 
-#
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Lag ei ny oppgåve i frå det valde førehandsoppsettet"
-
-#
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Lag eit nytt førehandsoppsett"
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Tid og dato</big>"
 
-#
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Dato:"
+msgid "Advanced"
+msgstr "Avansert"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Slett ei planlagt oppgåve"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Slett merka førehandsoppsett"
-
-#
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Skildring:"
+msgid "*"
+msgstr "*"
 
 #
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Rediger ei oppgåve"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Rediger ei planlagt oppgåve"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Førehandsvisning</big>"
 
-#
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Rediger merka førehandsoppsett"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Velg brukar"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Køyr:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Velg brukaren som du vil endre oppgåvene til</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Utføring på eit minutt, ein time, dag, vekedag eller månad."
+msgid "_User:"
+msgstr "_Brukar:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Utføring i eit tidsrom på for eksempel fem minutt, timar, dagar, vekedagar "
-"eller månadar."
+msgid "Add a Scheduled Task"
+msgstr "Legg til ei planlagt oppgåve"
 
+#
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Utføring kvart minutt, time, dag, vekedag, eller månad."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Velg typen av oppgåve:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Utføring i eit tidsrom."
+msgid "Time expression help"
+msgstr "Tidsuttrykk hjelp"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Uttrykk:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Til:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Frå:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "I eit tidsrom"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Anna"
 
-#
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Administrer førehandsoppsett"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Sjå \"man 5 crontab\" for meir informasjon om crontab formatet."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Anna"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Utføring på eit minutt, ein time, dag, vekedag eller månad."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Køyr merka oppgåve"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "I eit tidsrom"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Køyr oppgåve"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Utføring i eit tidsrom."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Planlagte og aktive oppgåver"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Utføring kvart minutt, time, dag, vekedag, eller månad."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Sjå \"man 5 crontab\" for meir informasjon om crontab formatet."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Utføring i eit tidsrom på for eksempel fem minutt, timar, dagar, vekedagar "
+"eller månadar."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Vis hjelp"
+msgid "Configure Scheduled Tasks"
+msgstr "Konfigurer planlagte oppgåver"
 
-#
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Oppgåve skildring"
+msgid "Edit a scheduled task"
+msgstr "Rediger ei planlagt oppgåve"
 
-#
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Oppgåve:"
+msgid "Delete a scheduled task"
+msgstr "Slett ei planlagt oppgåve"
 
-#
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Førhandsoppsett"
+msgid "Run selected task"
+msgstr "Køyr merka oppgåve"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Tidsuttrykk hjelp"
+msgid "Run task"
+msgstr "Køyr oppgåve"
 
 #
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Tid:"
+msgid "Templates"
+msgstr "Førhandsoppsett"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Til:"
+msgid "Change edit mode"
+msgstr "Endre redigeringsmodus"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X applikasjon"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Velg brukaren som du vil endre oppgåvene for"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Vis hjelp"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Brukar:"
+msgid "About Gnome-schedule"
+msgstr "Om Gnome Schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Planlagte og aktive oppgåver"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1200,11 +1207,11 @@ msgstr "Ei oppgåve som køyrar ein gong"
 msgid "A task from a predefined template"
 msgstr "Ei oppgåve frå eit førhandsoppsett"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1215,12 +1222,12 @@ msgstr ""
 "dag kun 24 timar."
 
 # python-format
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Dette er eit ugyldig tidsuttrykk! Problemet kan vere: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/oc.po b/po/oc.po
index 279f6ae..8448cdb 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2008-02-29 01:31+0100\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig marchegay org>\n"
 "Language-Team: Occitan (post 1500) <ubuntu-l10n-oci lists ubuntu com>\n"
@@ -19,56 +19,62 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
+msgid "Scheduled tasks"
 msgstr ""
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:2
-msgid "Scheduled tasks"
+msgid "Manage your system tasks"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
+msgid "Gnome schedule"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
-msgid "Gnome schedule"
+msgid "Configures your scheduled tasks"
 msgstr ""
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr ""
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Un còp"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Sens nom"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minuta"
@@ -89,7 +95,7 @@ msgstr "Mes"
 msgid "Weekday"
 msgstr ""
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Basic"
 
@@ -108,52 +114,47 @@ msgstr ""
 msgid "%s is not a number"
 msgstr ""
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Sens nom"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minuta"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "ora"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "jorn"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "mes"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr ""
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Cada minuta"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Cada ora"
 
@@ -171,19 +172,19 @@ msgstr "Cada setmana"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr ""
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Modificar lo modèl"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr ""
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr ""
 
@@ -212,11 +213,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -250,11 +251,11 @@ msgid "This is invalid. Reason: %s"
 msgstr ""
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "A una minuta exacta"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuta :"
 
@@ -263,7 +264,7 @@ msgstr "Minuta :"
 msgid "At an exact hour"
 msgstr "A una ora exacta"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ora :"
 
@@ -272,7 +273,7 @@ msgstr "Ora :"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Jorn :"
 
@@ -281,7 +282,7 @@ msgstr "Jorn :"
 msgid "In a month"
 msgstr "Dins un mes"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mes :"
 
@@ -290,15 +291,15 @@ msgstr "Mes :"
 msgid "On a weekday"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minutas :"
 
@@ -319,8 +320,8 @@ msgid "Weekdays:"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "A _prepaus"
+msgid "_Manage tasks"
+msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -331,8 +332,8 @@ msgid "_Help"
 msgstr "_Ajuda"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr ""
+msgid "A_bout"
+msgstr "A _prepaus"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -363,13 +364,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -416,68 +420,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgid "Create a new template."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr ""
+msgid "Edit the selected template"
+msgstr "Modificar lo modèl seleccionat"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Ulhada</big>"
-
-#: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
+msgid "Delete the selected template"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "A prepaus de gnome-schedule"
+#: ../src/gnome-schedule.glade.h:7
+msgid "Task description:"
+msgstr "Descripcion del prètzfach :"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
 msgstr ""
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Apondre coma modèl"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "A_vançat"
+msgid "Date:"
+msgstr "Data :"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Títol:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr ""
+msgid "Task:"
+msgstr "Prètzfach :"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+msgid "Add as template"
+msgstr "Apondre coma modèl"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
+msgid "Edit a periodical task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr ""
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -485,66 +497,51 @@ msgid "Command:"
 msgstr "Comanda :"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr ""
+msgid "Description:"
+msgstr "Descripcion :"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
+msgid "<big>Time &amp; Date</big>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data :"
+msgid "Advanced"
+msgstr "A_vançat"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr ""
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Descripcion :"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Ulhada</big>"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Modificar lo modèl seleccionat"
-
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
+msgid "_User:"
+msgstr "_Utilizaire :"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
+msgid "Add a Scheduled Task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
+msgid "<b>Select the type of the scheduled task:</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
+msgid "Time expression help"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:38
@@ -552,77 +549,86 @@ msgid "Expression:"
 msgstr "Expression :"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Destinatari :"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Expedidor :"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Autre"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
+msgid "See \"man 5 crontab\" for information about the crontab format."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Autre"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
+msgid "Configure Scheduled Tasks"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Descripcion del prètzfach :"
+msgid "Edit a scheduled task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Prètzfach :"
+msgid "Delete a scheduled task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Modèls"
+msgid "Run selected task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
+msgid "Run task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Títol:"
+msgid "Templates"
+msgstr "Modèls"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Destinatari :"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Utilizaire :"
+msgid "About Gnome-schedule"
+msgstr "A prepaus de gnome-schedule"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr ""
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1064,23 +1070,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Calendièr"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr ""
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/pa.po b/po/pa.po
index e430383..a533afd 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2004-12-07 19:10+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam redhat com>\n"
 "Language-Team: Punjabi <fedora-trans-pa redhat com>\n"
@@ -19,58 +19,64 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
+msgid "Gnome schedule"
+msgstr ""
+
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
 msgid "Configures your scheduled tasks"
 msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
-msgid "Gnome schedule"
-msgstr ""
-
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr ""
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr ""
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ"
+
 #: ../src/crontab.py:87
 #, fuzzy
 msgid "Minute"
@@ -95,7 +101,7 @@ msgstr "ਮਹੀਨਾ"
 msgid "Weekday"
 msgstr "ਹਫਤਾ"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "ਮੂਲ"
 
@@ -114,53 +120,48 @@ msgstr ""
 msgid "%s is not a number"
 msgstr "%s ਇੱਕ ਨੰਬਰ ਨਹੀਂ ਹੈ"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "ਬਿਨਾਂ ਸਿਰਲੇਖ"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "ਮਿੰਟ"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "ਘੰਟਾ"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "ਦਿਨ"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "ਹਫਤਾ"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "ਹਰ ਮਿੰਟ"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "ਹਰ ਘੰਟੇ"
@@ -182,21 +183,21 @@ msgstr "ਹਰ"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 #, fuzzy
 msgid "Create a New Scheduled Task"
 msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr ""
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 #, fuzzy
 msgid "Edit a Scheduled Task"
 msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
@@ -226,11 +227,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -269,12 +270,12 @@ msgid "This is invalid. Reason: %s"
 msgstr ""
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "ਹਰ ਮਿੰਟ"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "ਮਿੰਟ: "
@@ -284,7 +285,7 @@ msgstr "ਮਿੰਟ: "
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "ਘੰਟਾ: "
@@ -294,7 +295,7 @@ msgstr "ਘੰਟਾ: "
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr ""
 
@@ -304,7 +305,7 @@ msgstr ""
 msgid "In a month"
 msgstr "ਮਹੀਨਾ"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "ਮਹੀਨਾ"
@@ -315,16 +316,16 @@ msgstr "ਮਹੀਨਾ"
 msgid "On a weekday"
 msgstr "ਹਫਤਾ"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "ਹਫਤਾ"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "ਮਿੰਟ: "
@@ -349,8 +350,9 @@ msgid "Weekdays:"
 msgstr "ਹਫਤਾ"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr ""
+#, fuzzy
+msgid "_Manage tasks"
+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -362,9 +364,8 @@ msgid "_Help"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:4
-#, fuzzy
-msgid "_Manage tasks"
-msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
+msgid "A_bout"
+msgstr ""
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -395,13 +396,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -448,70 +452,84 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
+#, fuzzy
+msgid "Create a new template."
+msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr ""
+#, fuzzy
+msgid "Edit the selected template"
+msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>ਨਮੂਨਾ</b>"
+msgid "Delete the selected template"
+msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
+msgid "Task description:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ"
+
+#. This comes before the time and date input boxes in the One-time task editor
+#: ../src/gnome-schedule.glade.h:10
+msgid "Execute at:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:9
+#: ../src/gnome-schedule.glade.h:11
 #, fuzzy
-msgid "Add a Scheduled Task"
-msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
+msgid "Date:"
+msgstr "ਹਟਾਉ(_D)"
 
-#: ../src/gnome-schedule.glade.h:10
+#: ../src/gnome-schedule.glade.h:12
 #, fuzzy
-msgid "Add as template"
-msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
+msgid "Time:"
+msgstr "ਸਮਾਂ: "
 
-#: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
+msgid "Task:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
@@ -521,73 +539,55 @@ msgid "Command:"
 msgstr "ਕਮਾਂਡ"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr ""
+#, fuzzy
+msgid "Description:"
+msgstr "ਸਕ੍ਰਿਪਟ"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
+msgid "<big>Time &amp; Date</big>"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
-
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "ਹਟਾਉ(_D)"
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr ""
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "ਸਕ੍ਰਿਪਟ"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
+msgid "<big>Preview</big>"
+msgstr "<b>ਨਮੂਨਾ</b>"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "ਕੰਮ ਸ਼ਾਮਿਲ(_A)"
-
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
+msgid "_User:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
+#, fuzzy
+msgid "Add a Scheduled Task"
+msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
+msgid "<b>Select the type of the scheduled task:</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr ""
+msgid "Time expression help"
+msgstr "ਸਮਾਂ ਸਮੀਕਰਨ ਸਹਾਇਤਾ"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -595,81 +595,87 @@ msgid "Expression:"
 msgstr "ਹੋਰ ਸਮੀਕਰਨ"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਕੰਮਾਂ ਦਾ ਪ੍ਰਬੰਧ"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:49
-#, fuzzy
-msgid "Run task"
-msgstr "ਇਸ ਤੇ ਚਲਾਉ:"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "ਸਹਾਇਤਾ ਵੇਖਾਉ"
+msgid "Configure Scheduled Tasks"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
+msgid "Edit a scheduled task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
+msgid "Delete a scheduled task"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr ""
+#, fuzzy
+msgid "Run selected task"
+msgstr "ਇੱਕ ਕੰਮ ਸਮਾਂ ਤਬਦੀਲ"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "ਸਮਾਂ ਸਮੀਕਰਨ ਸਹਾਇਤਾ"
+#, fuzzy
+msgid "Run task"
+msgstr "ਇਸ ਤੇ ਚਲਾਉ:"
 
 #: ../src/gnome-schedule.glade.h:57
-#, fuzzy
-msgid "Time:"
-msgstr "ਸਮਾਂ: "
+msgid "Templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "ਇਸ ਕਾਰਜ ਬਾਰੇ"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "ਸਹਾਇਤਾ ਵੇਖਾਉ"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
+msgid "About Gnome-schedule"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
+msgid "Scheduled and active tasks"
 msgstr ""
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
@@ -1118,23 +1124,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr ""
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/pl.po b/po/pl.po
index 4ef4489..c43a082 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-27 21:18+0100\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-27 21:19+0100\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
@@ -22,21 +22,21 @@ msgstr ""
 "X-Poedit-Country: Poland\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "ZarzÄ…dzanie zadaniami systemowymi"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Zaplanowane zadania"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Konfiguracja zaplanowanych zadań"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "ZarzÄ…dzanie zadaniami systemowymi"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Terminarz GNOME"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Konfiguracja zaplanowanych zadań"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Narzędzia systemowe"
@@ -102,7 +102,7 @@ msgstr "MiesiÄ…c"
 msgid "Weekday"
 msgstr "Dzień tygodnia"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Podstawowe"
 
@@ -158,12 +158,12 @@ msgstr ""
 "błędu w pliku crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Co minutÄ™"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Co godzinÄ™"
 
@@ -271,11 +271,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "To jest nieprawidłowe: Przyczyna: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "O dokładnej minucie"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minuta:"
 
@@ -284,7 +284,7 @@ msgstr "Minuta:"
 msgid "At an exact hour"
 msgstr "O dokładnej godzinie"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Godzina:"
 
@@ -293,7 +293,7 @@ msgstr "Godzina:"
 msgid "On a day"
 msgstr "Danego dnia"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dzień:"
 
@@ -302,7 +302,7 @@ msgstr "Dzień:"
 msgid "In a month"
 msgstr "W miesiÄ…cu"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "MiesiÄ…c:"
 
@@ -311,15 +311,15 @@ msgstr "MiesiÄ…c:"
 msgid "On a weekday"
 msgstr "Danego dnia tygodnia"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Dzień tygodnia:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Między podanym czasem"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuty:"
 
@@ -340,8 +340,8 @@ msgid "Weekdays:"
 msgstr "Dni tygodnia:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_O programie"
+msgid "_Manage tasks"
+msgstr "_ZarzÄ…dzaj zadaniami"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -352,8 +352,8 @@ msgid "_Help"
 msgstr "Pomo_c"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_ZarzÄ…dzaj zadaniami"
+msgid "A_bout"
+msgstr "_O programie"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -446,64 +446,70 @@ msgstr[1] "Ukończono, zaimportowano: %d zadania."
 msgstr[2] "Ukończono, zaimportowano: %d zadań."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Wybierz szablon"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Tworzy nowe zadanie z zaznaczonego szablonu"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "ZarzÄ…dzaj szablonami"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Proszę wybrać użytkownika, którego zadania modyfikować</b>"
+msgid "Create a new template."
+msgstr "Tworzy nowy szablon."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Proszę wybrać typ zaplanowanego zadania:</b>"
+msgid "Edit the selected template"
+msgstr "Modyfikuj zaznaczony szablon"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<b>PodglÄ…d</b>"
+msgid "Delete the selected template"
+msgstr "Usuń zaznaczony szablon"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Czas i data</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "O programie Terminarz GNOME"
+msgid "Task description:"
+msgstr "Opis zadania:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Dodaj zaplanowane zadanie"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Program X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Dodaj jako szablon"
+msgid "Execute at:"
+msgstr "Wykonanie o:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Zaawansowane"
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Czas:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Zmień użytkownika"
+msgid "Task:"
+msgstr "Zadanie:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Zmień tryb modyfikowania"
+msgid "Add as template"
+msgstr "Dodaj jako szablon"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Wybierz szablon"
+msgid "Edit a periodical task"
+msgstr "Modyfikuj zadanie okresowe"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Proszę wybrać użytkownika, którego zadania modyfikować"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -511,149 +517,143 @@ msgid "Command:"
 msgstr "Polecenie:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Skonfiguruj zaplanowane zadania"
+msgid "Description:"
+msgstr "Opis:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Tworzy nowe zadanie z zaznaczonego szablonu"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Tworzy nowy szablon."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Czas i data</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data:"
+msgid "Advanced"
+msgstr "Zaawansowane"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Usuń zaplanowane zdanie"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Usuń zaznaczony szablon"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Modyfikuj zadanie okresowe"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Modyfikuj zaplanowane zadanie"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<b>PodglÄ…d</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Modyfikuj zaznaczony szablon"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Zmień użytkownika"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Wykonanie o:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Proszę wybrać użytkownika, którego zadania modyfikować</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr ""
-"Wykonanie o podanej minucie, godzinie, dniu, dniu tygodnia lub miesiÄ…cu."
+msgid "_User:"
+msgstr "_Użytkownik:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Wykonanie między podanym czasem. Na przykład co pięć minut, godzin, dni, dni "
-"tygodnia lub miesięcy."
+msgid "Add a Scheduled Task"
+msgstr "Dodaj zaplanowane zadanie"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Wykonanie co minutę, godzinę, dzień, dzień tygodnia lub miesiąc."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Proszę wybrać typ zaplanowanego zadania:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Wykonanie w zakresie."
+msgid "Time expression help"
+msgstr "Pomoc wyrażeń czasu"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Wyrażenie:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Do:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "W zakresie"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Inne"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "ZarzÄ…dzaj szablonami"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Proszę zobaczyć \"man 5 crontab\", aby dowiedzieć się więcej o formacie "
+"crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Inne"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+"Wykonanie o podanej minucie, godzinie, dniu, dniu tygodnia lub miesiÄ…cu."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Uruchom zaznaczone zadanie"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "W zakresie"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Uruchom zadanie"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Wykonanie w zakresie."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Zaplanowane i aktywne zadania"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Wykonanie co minutę, godzinę, dzień, dzień tygodnia lub miesiąc."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Proszę zobaczyć \"man 5 crontab\", aby dowiedzieć się więcej o formacie "
-"crontab."
+"Wykonanie między podanym czasem. Na przykład co pięć minut, godzin, dni, dni "
+"tygodnia lub miesięcy."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Wyświetl pomoc"
+msgid "Configure Scheduled Tasks"
+msgstr "Skonfiguruj zaplanowane zadania"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Opis zadania:"
+msgid "Edit a scheduled task"
+msgstr "Modyfikuj zaplanowane zadanie"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Zadanie:"
+msgid "Delete a scheduled task"
+msgstr "Usuń zaplanowane zdanie"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Szablony"
+msgid "Run selected task"
+msgstr "Uruchom zaznaczone zadanie"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Pomoc wyrażeń czasu"
+msgid "Run task"
+msgstr "Uruchom zadanie"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Czas:"
+msgid "Templates"
+msgstr "Szablony"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Do:"
+msgid "Change edit mode"
+msgstr "Zmień tryb modyfikowania"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Program X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Proszę wybrać użytkownika, którego zadania modyfikować"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Wyświetl pomoc"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Użytkownik:"
+msgid "About Gnome-schedule"
+msgstr "O programie Terminarz GNOME"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Zaplanowane i aktywne zadania"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
diff --git a/po/pt.po b/po/pt.po
index 9726c8a..db954ac 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2004-12-11 13:30+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt hotmail com>\n"
 "Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
@@ -17,59 +17,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Efectue a gestão das tarefas do seu sistema"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Configurar a tarefa calendarizada"
 
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Efectue a gestão das tarefas do seu sistema"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "Configurar tarefas calendarizadas"
+msgid "Gnome schedule"
+msgstr "Calendarização Gnome"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
-msgid "Gnome schedule"
-msgstr "Calendarização Gnome"
+msgid "Configures your scheduled tasks"
+msgstr "Configurar tarefas calendarizadas"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Todos os anos a %(date)s às %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr ""
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Sem título"
+
 #: ../src/crontab.py:87
 #, fuzzy
 msgid "Minute"
@@ -95,7 +101,7 @@ msgstr "mês"
 msgid "Weekday"
 msgstr "dia da semana"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Básico"
 
@@ -114,54 +120,49 @@ msgstr "tem de ser entre 0 e 7"
 msgid "%s is not a number"
 msgstr "%s não é um número"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Sem título"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 #, fuzzy
 msgid "At reboot"
 msgstr "root"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minuto"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "hora"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dia"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "mês"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "dia da semana"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "a cada minuto"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "a cada hora"
@@ -183,21 +184,21 @@ msgstr "A cada"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 #, fuzzy
 msgid "Create a New Scheduled Task"
 msgstr "Criar uma nova tarefa calendarizada"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr ""
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Adicionar tarefa"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 #, fuzzy
 msgid "Edit a Scheduled Task"
 msgstr "Editar uma tarefa calendarizada"
@@ -228,11 +229,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -271,12 +272,12 @@ msgid "This is invalid. Reason: %s"
 msgstr "Isto é inválido. Motivo: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "A cada minuto"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "minuto: "
@@ -286,7 +287,7 @@ msgstr "minuto: "
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "hora: "
@@ -296,7 +297,7 @@ msgstr "hora: "
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr ""
 
@@ -306,7 +307,7 @@ msgstr ""
 msgid "In a month"
 msgstr "mês"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "mês: "
@@ -317,16 +318,16 @@ msgstr "mês: "
 msgid "On a weekday"
 msgstr "dia da semana"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "dia da semana"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "minuto: "
@@ -351,8 +352,9 @@ msgid "Weekdays:"
 msgstr "dia da semana"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr ""
+#, fuzzy
+msgid "_Manage tasks"
+msgstr "Efectue a gestão das tarefas do seu sistema"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -364,9 +366,8 @@ msgid "_Help"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:4
-#, fuzzy
-msgid "_Manage tasks"
-msgstr "Efectue a gestão das tarefas do seu sistema"
+msgid "A_bout"
+msgstr ""
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -397,13 +398,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -450,72 +454,85 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Irá apagar a pré-definição seleccionada"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "Efectue a gestão das tarefas do seu sistema"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Adicionar tarefa"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Seleccione o tipo de tarefa calendarizada</b>"
+msgid "Edit the selected template"
+msgstr "Irá apagar a pré-definição seleccionada"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Antever</b>"
+msgid "Delete the selected template"
+msgstr "Irá apagar a pré-definição seleccionada"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
+msgid "Task description:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:8
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Calendarização Gnome"
+msgid "X application"
+msgstr "Sobre esta aplicação"
 
-#: ../src/gnome-schedule.glade.h:9
+#. This comes before the time and date input boxes in the One-time task editor
+#: ../src/gnome-schedule.glade.h:10
+msgid "Execute at:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:11
 #, fuzzy
-msgid "Add a Scheduled Task"
-msgstr "Adicionar uma tarefa calendarizada"
+msgid "Date:"
+msgstr "_Apagar"
 
-#: ../src/gnome-schedule.glade.h:10
+#: ../src/gnome-schedule.glade.h:12
 #, fuzzy
-msgid "Add as template"
-msgstr "_Adicionar tarefa"
+msgid "Time:"
+msgstr "Hora: "
 
-#: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avançado"
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
+msgid "Task:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Adicionar tarefa"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Editar uma tarefa calendarizada"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
@@ -526,81 +543,55 @@ msgstr "comando"
 
 #: ../src/gnome-schedule.glade.h:19
 #, fuzzy
-msgid "Configure Scheduled Tasks"
-msgstr "Configurar tarefas calendarizadas"
+msgid "Description:"
+msgstr "Script"
 
 #: ../src/gnome-schedule.glade.h:20
-#, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Irá apagar a pré-definição seleccionada"
-
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Adicionar tarefa"
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Apagar"
+msgid "Advanced"
+msgstr "Avançado"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Apagar uma tarefa calendarizada"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Irá apagar a pré-definição seleccionada"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Script"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Editar uma tarefa calendarizada"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Editar uma tarefa calendarizada"
+msgid "<big>Preview</big>"
+msgstr "<b>Antever</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Irá apagar a pré-definição seleccionada"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr ""
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-#, fuzzy
-msgid "Execution at a specific minute, hour, day, weekday or month."
+msgid "_User:"
 msgstr ""
-"Ocorre em todas as alturas. Por exemplo, ocorre em todos os minutos, horas, "
-"dias, dias da semana ou meses"
 
 #: ../src/gnome-schedule.glade.h:35
 #, fuzzy
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Ocorre a cada x ocorrências. Por exemplo a cada dois minutos, horas, dias, "
-"dias da semana ou meses"
+msgid "Add a Scheduled Task"
+msgstr "Adicionar uma tarefa calendarizada"
 
 #: ../src/gnome-schedule.glade.h:36
 #, fuzzy
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Todos os minutos, %s hora; %s dia; todos os meses"
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Seleccione o tipo de tarefa calendarizada</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr ""
+msgid "Time expression help"
+msgstr "Ajuda de expressão temporal"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -608,83 +599,98 @@ msgid "Expression:"
 msgstr "Outra expressão"
 
 #: ../src/gnome-schedule.glade.h:39
-msgid "From:"
+msgid "To:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:40
+msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "Efectue a gestão das tarefas do seu sistema"
-
-#: ../src/gnome-schedule.glade.h:47
+#: ../src/gnome-schedule.glade.h:42
 #, fuzzy
 msgid "Other"
 msgstr "terceiro"
 
-#: ../src/gnome-schedule.glade.h:48
+#: ../src/gnome-schedule.glade.h:43
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:45
 #, fuzzy
-msgid "Run selected task"
-msgstr "Alterar uma tarefa calendarizada"
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr ""
+"Ocorre em todas as alturas. Por exemplo, ocorre em todos os minutos, horas, "
+"dias, dias da semana ou meses"
+
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:49
 #, fuzzy
-msgid "Run task"
-msgstr "Executar a:"
-
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Tarefas agendadas e activas"
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Todos os minutos, %s hora; %s dia; todos os meses"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
+#, fuzzy
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
+"Ocorre a cada x ocorrências. Por exemplo a cada dois minutos, horas, dias, "
+"dias da semana ou meses"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Apresentar a ajuda"
+#, fuzzy
+msgid "Configure Scheduled Tasks"
+msgstr "Configurar tarefas calendarizadas"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr ""
+msgid "Edit a scheduled task"
+msgstr "Editar uma tarefa calendarizada"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr ""
+msgid "Delete a scheduled task"
+msgstr "Apagar uma tarefa calendarizada"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr ""
+#, fuzzy
+msgid "Run selected task"
+msgstr "Alterar uma tarefa calendarizada"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Ajuda de expressão temporal"
+#, fuzzy
+msgid "Run task"
+msgstr "Executar a:"
 
 #: ../src/gnome-schedule.glade.h:57
-#, fuzzy
-msgid "Time:"
-msgstr "Hora: "
+msgid "Templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Sobre esta aplicação"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Apresentar a ajuda"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr ""
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Calendarização Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Tarefas agendadas e activas"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1155,23 +1161,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, fuzzy, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Este é um registo inválido! O problema poderá ser: %s "
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 212ed5d..befe8d9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"schedule&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-13 11:30+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2013-02-16 00:32-0300\n"
 "Last-Translator: Rafael Ferreira <rafael f f1 gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br listas cipsga org br>\n"
diff --git a/po/ro.po b/po/ro.po
index 21e4bd2..769dc46 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2010-12-02 20:32+0300\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian grijincu gmail com>\n"
 "Language-Team: Romanian Gnome Team <gnomero-list lists sourceforge net>\n"
@@ -21,26 +21,26 @@ msgstr ""
 "X-Generator: Virtaal 0.6.1\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Gestionează sarcinile sistemului"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Sarcini planificate"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Configurează sarcinile planificate ale sistemului"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Gestionează sarcinile sistemului"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Planificator Gnome"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Configurează sarcinile planificate ale sistemului"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Instrumente de sistem"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -48,7 +48,7 @@ msgstr ""
 "Eșec la crearea dosarului de date! Asigurați-vă că ~/.gnome și ~/.gnome/"
 "gnome-schedule pot fi scrise."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -57,24 +57,31 @@ msgstr ""
 "Eșec la crearea datei dir: %s. Asigurați-vă că ~/.gnome și ~/.gnome/gnome-"
 "schedule pot fi scrise."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr "Atenție! Sarcină necunoscută: %(preview)s"
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "Pe %(timestring)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "O dată"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Atenție: o linie în ieșirea programului atq nu a putut fi parsată"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Fără titlu"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minut"
@@ -95,7 +102,7 @@ msgstr "Lună"
 msgid "Weekday"
 msgstr "Zi de lucru"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "De bază"
 
@@ -114,41 +121,36 @@ msgstr "Trebuie să fie între %(min)s și %(max)s"
 msgid "%s is not a number"
 msgstr "%s nu este un număr"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Fără titlu"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Recurent"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "La repornire"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minute"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "oră"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "zi"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "lună"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "zi de lucru"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -156,12 +158,12 @@ msgstr ""
 "crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "ÃŽn fiecare minut"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "În fiecare oră"
 
@@ -179,19 +181,19 @@ msgstr "În fiecare săptămână"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Creați o nouă sarcină planificată"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Editează șablonul"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Șablon nou"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Editează o sarcină planificată"
 
@@ -232,11 +234,11 @@ msgstr ""
 "\n"
 "Sarcinile recurente vor fi rulate din dosarul de pornire."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "Nu arăta _din nou"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Atenție: Dosarul de lucru al sarcinilor planificate"
 
@@ -270,11 +272,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Nu este nevalid. Cauza: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "La un minut exact"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minut:"
 
@@ -283,7 +285,7 @@ msgstr "Minut:"
 msgid "At an exact hour"
 msgstr "La o oră exactă"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ora:"
 
@@ -292,7 +294,7 @@ msgstr "Ora:"
 msgid "On a day"
 msgstr "ÃŽntr-o zi"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Ziua:"
 
@@ -301,7 +303,7 @@ msgstr "Ziua:"
 msgid "In a month"
 msgstr "Într-o lună:"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Luna:"
 
@@ -310,15 +312,15 @@ msgstr "Luna:"
 msgid "On a weekday"
 msgstr "ÃŽntr-o zi de lucru:"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Zi de lucru:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "La o lățime pas"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minute:"
 
@@ -339,8 +341,8 @@ msgid "Weekdays:"
 msgstr "Zile de lucru:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Despre"
+msgid "_Manage tasks"
+msgstr "_Gestionează sarcinile"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -351,8 +353,8 @@ msgid "_Help"
 msgstr "_Ajutor"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Gestionează sarcinile"
+msgid "A_bout"
+msgstr "_Despre"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -383,13 +385,17 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -436,71 +442,77 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Alege șablon"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Creează o nouă sarcină din șablonul selectat"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Administrează șabloanele"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
-"<b>Alegeți utilizatorul ale cărui sarcini planificate doriți să le "
-"modificați</b>"
+msgid "Create a new template."
+msgstr "Creează un șablon nou."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Selectați tipul de sarcină planificată:</b>"
+msgid "Edit the selected template"
+msgstr "Editează șablonul selectat"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Previzualizare</big>"
+msgid "Delete the selected template"
+msgstr "Șterge șablonul selectat"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Oră și dată</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Despre planificatorul Gnome"
+msgid "Task description:"
+msgstr "Descrierea sarcinii:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Adaugă o sarcină planificată"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Aplicație X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Adaugă ca șablon"
+msgid "Execute at:"
+msgstr "Execută la:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avansat"
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Data:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Schimbă utilizatorul"
+msgid "Task:"
+msgstr "Sarcina:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Schimbă modul de editare"
+msgid "Add as template"
+msgstr "Adaugă ca șablon"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Alege șablon"
+msgid "Edit a periodical task"
+msgstr "Editează o sarcină periodică"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr ""
-"Alegeți utilizatorul ale cărui sarcini planificate doriți să le modificați"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -508,146 +520,143 @@ msgid "Command:"
 msgstr "Comanda:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Configurează sarcinile planificate"
+msgid "Description:"
+msgstr "Descriere:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Creează o nouă sarcină din șablonul selectat"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Creează un șablon nou."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Oră și dată</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Data:"
+msgid "Advanced"
+msgstr "Avansat"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Șterge sarcina planificată"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Șterge șablonul selectat"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Descriere:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Editează o sarcină periodică"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Editează o sarcină planificată"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Previzualizare</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Editează șablonul selectat"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Schimbă utilizatorul"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Execută la:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr ""
+"<b>Alegeți utilizatorul ale cărui sarcini planificate doriți să le "
+"modificați</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Execuție la un anumit minut, oră, zi, zi de lucru sau lună."
+msgid "_User:"
+msgstr "_Utilizator:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Execuție la o lățime pas. De exemplu, la fiecare cinci minute, ore, zile, "
-"zile lucrătoare sau luni."
+msgid "Add a Scheduled Task"
+msgstr "Adaugă o sarcină planificată"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Execuție la fiecare minut, ora, zi, zi de lucru sau lună."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Selectați tipul de sarcină planificată:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Execuție într-un interval."
+msgid "Time expression help"
+msgstr "Ajutor expresie de timp"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Expresie:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Pentru:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "De la:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "ÃŽntr-un interval"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Alte"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Administrează șabloanele"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Consultați „man 5 crontab” pentru informații despre formatul crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Alte"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Execuție la un anumit minut, oră, zi, zi de lucru sau lună."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Rulează sarcinile selectate"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "ÃŽntr-un interval"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Rulează sarcina"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Execuție într-un interval."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Sarcini planificate și active"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Execuție la fiecare minut, ora, zi, zi de lucru sau lună."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Consultați „man 5 crontab” pentru informații despre formatul crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Execuție la o lățime pas. De exemplu, la fiecare cinci minute, ore, zile, "
+"zile lucrătoare sau luni."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Arată ajutorul"
+msgid "Configure Scheduled Tasks"
+msgstr "Configurează sarcinile planificate"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Descrierea sarcinii:"
+msgid "Edit a scheduled task"
+msgstr "Editează o sarcină planificată"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Sarcina:"
+msgid "Delete a scheduled task"
+msgstr "Șterge sarcina planificată"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Șabloane"
+msgid "Run selected task"
+msgstr "Rulează sarcinile selectate"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Ajutor expresie de timp"
+msgid "Run task"
+msgstr "Rulează sarcina"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Data:"
+msgid "Templates"
+msgstr "Șabloane"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Pentru:"
+msgid "Change edit mode"
+msgstr "Schimbă modul de editare"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Aplicație X"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+"Alegeți utilizatorul ale cărui sarcini planificate doriți să le modificați"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Arată ajutorul"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Utilizator:"
+msgid "About Gnome-schedule"
+msgstr "Despre planificatorul Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Sarcini planificate și active"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1136,11 +1145,11 @@ msgstr "O sarcină lansată o singură dată"
 msgid "A task from a predefined template"
 msgstr "O sarcină dintr-un șablon predefinit"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Calendar"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1150,12 +1159,12 @@ msgstr ""
 "sau un număr din afara intervalului. Nu uitați că o oră are doar 60 de "
 "minute și o zi are doar 24 de ore."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Aceasta este o înregistrare nevalidă! Problema poate fi: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/ru.po b/po/ru.po
index 1f61dcd..c50d9c8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,49 +5,56 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-schedule&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-11-02 19:10+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-10 02:06+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\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"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Управление системными заданиями"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Запланированные задания"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Правка запланированных заданий"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Управление системными заданиями"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Планировщик GNOME"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Правка запланированных заданий"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Системные средства"
 
-#: ../src/at.py:112
-#: ../src/crontab.py:62
-msgid "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Не удалось создать каталог данных! Убедитесь в возможности записи в ~/.gnome и 
~/.gnome/gnome-schedule."
+#: ../src/at.py:112 ../src/crontab.py:62
+msgid ""
+"Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
+"are writable."
+msgstr ""
+"Не удалось создать каталог данных! Убедитесь в возможности записи в ~/.gnome "
+"и ~/.gnome/gnome-schedule."
 
-#: ../src/at.py:145
-#: ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
-msgid "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Не удалось создать каталог данных: %s. Убедитесь, что в каталоги ~/.gnome и ~/.gnome/gnome-schedule 
возможна запись."
+msgid ""
+"Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
+"schedule are writable."
+msgstr ""
+"Не удалось создать каталог данных: %s. Убедитесь, что в каталоги ~/.gnome и "
+"~/.gnome/gnome-schedule возможна запись."
 
 #: ../src/at.py:547
 #, python-format
@@ -59,22 +66,16 @@ msgstr "Внимание! Неизвестное задание: %(preview)s"
 msgid "On %(timestring)s"
 msgstr "%(timestring)s"
 
-#: ../src/at.py:560
-#: ../src/at.py:565
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Один раз"
 
 #: ../src/at.py:569
-#| msgid "Warning: a line in atq's output didn't parse"
 msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Предупреждение: строка в выводе atq не была разобрана:"
 
-#: ../src/at.py:624
-#: ../src/crontab.py:288
-#: ../src/crontab.py:334
-#: ../src/crontabEditor.py:275
-#: ../src/atEditor.py:127
-#: ../src/atEditor.py:523
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
 #: ../src/atEditor.py:549
 msgid "Untitled"
 msgstr "Безымянное"
@@ -99,8 +100,7 @@ msgstr "Месяц"
 msgid "Weekday"
 msgstr "День недели"
 
-#: ../src/crontab.py:192
-#: ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Основные"
 
@@ -109,9 +109,7 @@ msgstr "Основные"
 msgid "This is not a valid special record: %(record)s"
 msgstr "Недопустимая особая запись: %(record)s"
 
-#: ../src/crontab.py:220
-#: ../src/crontab.py:225
-#: ../src/crontab.py:229
+#: ../src/crontab.py:220 ../src/crontab.py:225 ../src/crontab.py:229
 #, python-format
 msgid "Must be between %(min)s and %(max)s"
 msgstr "Значение должно находится между %(min)s и %(max)s"
@@ -121,16 +119,12 @@ msgstr "Значение должно находится между %(min)s и %
 msgid "%s is not a number"
 msgstr "%s не является числом"
 
-#: ../src/crontab.py:455
-#: ../src/crontab.py:457
-#: ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Периодично"
 
-#: ../src/crontab.py:455
-#: ../src/crontabEditor.py:74
-#: ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "При перезагрузке"
 
@@ -155,28 +149,25 @@ msgid "weekday"
 msgstr "день недели"
 
 #: ../src/crontab.py:576
-msgid "Failed to parse the Day of Month field, possibly due to a bug in crontab."
+msgid ""
+"Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr "Не удалось разобрать день месяца, возможна ошибка в crontab."
 
-#: ../src/crontabEditor.py:69
-#: ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Каждую минуту"
 
-#: ../src/crontabEditor.py:70
-#: ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Каждый час"
 
-#: ../src/crontabEditor.py:71
-#: ../src/crontabEditorHelper.py:99
+#: ../src/crontabEditor.py:71 ../src/crontabEditorHelper.py:99
 msgid "Every day"
 msgstr "Каждый день"
 
-#: ../src/crontabEditor.py:72
-#: ../src/crontabEditorHelper.py:105
+#: ../src/crontabEditor.py:72 ../src/crontabEditorHelper.py:105
 msgid "Every month"
 msgstr "Каждый месяц"
 
@@ -185,38 +176,48 @@ msgid "Every week"
 msgstr "Каждую неделю"
 
 #. add new task
-#: ../src/crontabEditor.py:131
-#: ../src/crontabEditor.py:142
-#: ../src/atEditor.py:129
-#: ../src/atEditor.py:148
+#: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Запланировать новое задание"
 
-#: ../src/crontabEditor.py:198
-#: ../src/atEditor.py:166
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Правка шаблона"
 
-#: ../src/crontabEditor.py:223
-#: ../src/atEditor.py:188
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Создание шаблона"
 
-#: ../src/crontabEditor.py:249
-#: ../src/atEditor.py:230
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Правка запланированного задания"
 
-#: ../src/crontabEditor.py:302
-#: ../src/crontabEditor.py:578
+#: ../src/crontabEditor.py:302 ../src/crontabEditor.py:578
 #: ../src/crontabEditor.py:618
 #, python-format
-msgid "This is an invalid record! The problem could be in the %(field)s field. Reason: %(reason)s"
-msgstr "Эта запись некорректна! Проблема может быть в поле %(field)s. Причина: %(reason)s"
+msgid ""
+"This is an invalid record! The problem could be in the %(field)s field. "
+"Reason: %(reason)s"
+msgstr ""
+"Эта запись некорректна! Проблема может быть в поле %(field)s. Причина: "
+"%(reason)s"
 
 #: ../src/crontabEditor.py:307
-msgid "Your command contains one or more of the character %, this is special for cron and cannot be used 
with Gnome-schedule because of the format it uses to store extra information on the crontab line. Please use 
the | redirector character to achieve the same functionality. Refer to the crontab manual for more 
information about the % character. If you don not want to use it for redirection it must be properly escaped 
with the \\ letter."
-msgstr "В вашей команде содержатся символы %, имеющие специальное значение для cron; их нельзя использовать 
в Планировщике GNOME, т. к. он использует их для кодирования дополнительной информации в файле crontab. 
Вместо них используйте символ |. Обратитесь к руководству crontab за разъяснением функции символа %. Если вы 
не используете их для перенаправления, экранируйте их символом \\."
+msgid ""
+"Your command contains one or more of the character %, this is special for "
+"cron and cannot be used with Gnome-schedule because of the format it uses to "
+"store extra information on the crontab line. Please use the | redirector "
+"character to achieve the same functionality. Refer to the crontab manual for "
+"more information about the % character. If you don not want to use it for "
+"redirection it must be properly escaped with the \\ letter."
+msgstr ""
+"В вашей команде содержатся символы %, имеющие специальное значение для cron; "
+"их нельзя использовать в Планировщике GNOME, т. к. он использует их для "
+"кодирования дополнительной информации в файле crontab. Вместо них "
+"используйте символ |. Обратитесь к руководству crontab за разъяснением "
+"функции символа %. Если вы не используете их для перенаправления, "
+"экранируйте их символом \\."
 
 #: ../src/crontabEditor.py:456
 msgid ""
@@ -228,15 +229,11 @@ msgstr ""
 "\n"
 "Повторяющиеся задания будут запущены из вашего домашнего каталога."
 
-#: ../src/crontabEditor.py:457
-#: ../src/mainWindow.py:666
-#: ../src/atEditor.py:597
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Больше не показывать"
 
-#: ../src/crontabEditor.py:458
-#: ../src/mainWindow.py:667
-#: ../src/atEditor.py:598
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Предупреждение: рабочий каталог выполняемых заданий"
 
@@ -270,13 +267,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Значение некорректно. Причина: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231
-#: ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Точно в минуту"
 
-#: ../src/crontabEditorHelper.py:232
-#: ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Минуты:"
 
@@ -285,8 +280,7 @@ msgstr "Минуты:"
 msgid "At an exact hour"
 msgstr "Точно в час"
 
-#: ../src/crontabEditorHelper.py:236
-#: ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Час:"
 
@@ -295,8 +289,7 @@ msgstr "Час:"
 msgid "On a day"
 msgstr "Точно в день"
 
-#: ../src/crontabEditorHelper.py:240
-#: ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "День:"
 
@@ -305,8 +298,7 @@ msgstr "День:"
 msgid "In a month"
 msgstr "Точно в месяц"
 
-#: ../src/crontabEditorHelper.py:244
-#: ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Месяц:"
 
@@ -315,18 +307,15 @@ msgstr "Месяц:"
 msgid "On a weekday"
 msgstr "Точно в день недели"
 
-#: ../src/crontabEditorHelper.py:248
-#: ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "День недели:"
 
-#: ../src/crontabEditorHelper.py:253
-#: ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "С шагом"
 
-#: ../src/crontabEditorHelper.py:255
-#: ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Минуты:"
 
@@ -347,8 +336,8 @@ msgid "Weekdays:"
 msgstr "Дни недели:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_О программе"
+msgid "_Manage tasks"
+msgstr "_Управление заданиями"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -359,8 +348,8 @@ msgid "_Help"
 msgstr "_Справка"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Управление заданиями"
+msgid "A_bout"
+msgstr "_О программе"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -391,13 +380,11 @@ msgstr "Экспорт задания crontab: %s"
 
 #: ../src/gnome-schedule-export.py:103
 #, python-format
-#| msgid "Exporting at task: "
 msgid "Exporting at task: %s"
 msgstr "Экспортирование задания at: %s"
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-#| msgid "Finished, exported: %d tasks total"
 msgid "Finished, exported: %d task total."
 msgid_plural "Finished, exported: %d tasks total."
 msgstr[0] "Завершено. Экспортировано: %d задание."
@@ -448,7 +435,6 @@ msgstr "Импорт задания at: %s"
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-#| msgid "Finished, imported: %d tasks total."
 msgid "Finished, imported: %d task total."
 msgid_plural "Finished, imported: %d tasks total."
 msgstr[0] "Завершено. Импортировано: %d задание."
@@ -456,212 +442,214 @@ msgstr[1] "Завершено. Импортировано: %d задания."
 msgstr[2] "Завершено. Импортировано: %d заданий."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Выбор шаблона"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Создать задание из выбранного шаблона"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Управление шаблонами"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Выберите пользователя, чьи задачи вы хотите изменить</b>"
+msgid "Create a new template."
+msgstr "Создание нового шаблона."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Выберите тип задания:</b>"
+msgid "Edit the selected template"
+msgstr "Изменить выбранный шаблон"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Расписание</big>"
+msgid "Delete the selected template"
+msgstr "Удалить выбранный шаблон"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Время и дата</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "О Планировщике GNOME"
+msgid "Task description:"
+msgstr "Описание задания:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Запланировать задачу"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Приложение X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Создать шаблон"
+msgid "Execute at:"
+msgstr "Выполнить в:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Дополнительные"
+msgid "Date:"
+msgstr "Дата:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Время:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Сменить пользователя"
+msgid "Task:"
+msgstr "Задание:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Изменить представление"
+msgid "Add as template"
+msgstr "Создать шаблон"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Выбор шаблона"
+msgid "Edit a periodical task"
+msgstr "Правка многократного задания"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Выберите пользователя, чьи задания вы хотите изменить"
+msgid "ls -l"
+msgstr "ls -l"
 
-#: ../src/gnome-schedule.glade.h:18
-#: ../src/template.py:198
+#: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
 msgid "Command:"
 msgstr "Команда:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Правка запланированных заданий"
+msgid "Description:"
+msgstr "Описание:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Создать задание из выбранного шаблона"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Создание нового шаблона."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Время и дата</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Дата:"
+msgid "Advanced"
+msgstr "Дополнительные"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Удалить запланированное задание"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Удалить выбранный шаблон"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Описание:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Правка многократного задания"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Правка запланированного задания"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Расписание</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Изменить выбранный шаблон"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Сменить пользователя"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Выполнить в:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Выберите пользователя, чьи задачи вы хотите изменить</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Выполнение в заданную минуту, час, день, день недели или месяц."
+msgid "_User:"
+msgstr "_Пользователь:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid "Execution at a step width. For example every five minutes, hours, days, weekdays or months."
-msgstr "Выполнить с шагом. Например, каждые пять минут, часов, дней, дней недели или месяцев."
+msgid "Add a Scheduled Task"
+msgstr "Запланировать задачу"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Выполнение каждую минуту, час, день, день недели или месяц."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Выберите тип задания:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Выполнение в диапазоне."
+msgid "Time expression help"
+msgstr "Помощь по описанию времени"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Выражение:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Ð’:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Из:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "В промежутке"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Другое"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Управление шаблонами"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr ""
+"Выполните \"man 5 crontab\" для получение информации о формате crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Другое"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Выполнение в заданную минуту, час, день, день недели или месяц."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Запуск выделенного задания"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "В промежутке"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Запуск"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Выполнение в диапазоне."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Запланированные и активные задания"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Выполнение каждую минуту, час, день, день недели или месяц."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Выполните \"man 5 crontab\" для получение информации о формате crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Выполнить с шагом. Например, каждые пять минут, часов, дней, дней недели или "
+"месяцев."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Справка"
+msgid "Configure Scheduled Tasks"
+msgstr "Правка запланированных заданий"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Описание задания:"
+msgid "Edit a scheduled task"
+msgstr "Правка запланированного задания"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Задание:"
+msgid "Delete a scheduled task"
+msgstr "Удалить запланированное задание"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Шаблоны"
+msgid "Run selected task"
+msgstr "Запуск выделенного задания"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Помощь по описанию времени"
+msgid "Run task"
+msgstr "Запуск"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Время:"
+msgid "Templates"
+msgstr "Шаблоны"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Ð’:"
+msgid "Change edit mode"
+msgstr "Изменить представление"
+
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Выберите пользователя, чьи задания вы хотите изменить"
 
 #: ../src/gnome-schedule.glade.h:60
-#: ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Приложение X"
+msgid "Show help"
+msgstr "Справка"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Пользователь:"
+msgid "About Gnome-schedule"
+msgstr "О Планировщике GNOME"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Запланированные и активные задания"
 
-#: ../src/gnome-schedule.py:66
-#: ../src/scheduleapplet.py:67
+#: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
 msgid ""
 "You need to install pyGTK or GTKv2,\n"
@@ -730,8 +718,12 @@ msgstr "В день %(monthday)s каждого месяца в минуту %(m
 
 #: ../src/lang.py:202
 #, python-format
-msgid "On day %(monthday)s of every month at every minute between %(time_from)s and %(time_to)s"
-msgstr "В день %(monthday)s каждого месяца в каждую минуту между %(time_from)s и %(time_to)s"
+msgid ""
+"On day %(monthday)s of every month at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"В день %(monthday)s каждого месяца в каждую минуту между %(time_from)s и "
+"%(time_to)s"
 
 #: ../src/lang.py:204
 #, python-format
@@ -755,8 +747,11 @@ msgstr "Каждый день в %(month)s в %(minute)s минуту каждо
 
 #: ../src/lang.py:215
 #, python-format
-msgid "On every day in %(month)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Каждый день в  %(month)s в каждую минуту между %(time_from)s и %(time_to)s"
+msgid ""
+"On every day in %(month)s at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Каждый день в  %(month)s в каждую минуту между %(time_from)s и %(time_to)s"
 
 #: ../src/lang.py:217
 #, python-format
@@ -780,8 +775,10 @@ msgstr "Каждый год %(date)s в %(minute)s минуту каждого 
 
 #: ../src/lang.py:228
 #, python-format
-msgid "Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Каждый год %(date)s числа каждую минуту между %(time_from)s и %(time_to)s"
+msgid ""
+"Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Каждый год %(date)s числа каждую минуту между %(time_from)s и %(time_to)s"
 
 #: ../src/lang.py:230
 #, python-format
@@ -805,7 +802,9 @@ msgstr "Каждый %(weekday)s, в %(minute)s-ю минуту каждого 
 
 #: ../src/lang.py:241
 #, python-format
-msgid "On every weekday: %(weekday)s at every minute between %(time_from)s and %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr "Каждый %(weekday)s, каждую минуту между %(time_from)s и %(time_to)s"
 
 #: ../src/lang.py:243
@@ -815,27 +814,41 @@ msgstr "Каждый %(weekday)s в %(time)s"
 
 #: ../src/lang.py:248
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every full hour"
-msgstr "%(monthday)s числа каждого месяца и каждый %(weekday)s каждый полный час"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"full hour"
+msgstr ""
+"%(monthday)s числа каждого месяца и каждый %(weekday)s каждый полный час"
 
 #: ../src/lang.py:250
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute"
 msgstr "%(monthday)s числа каждого месяца и каждый %(weekday)s в каждую минуту"
 
 #: ../src/lang.py:252
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at minute %(minute)s of every hour"
-msgstr "%(monthday)s числа каждого месяца и каждый %(weekday)s в %(minute)s-ю минуту каждого часа"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at minute "
+"%(minute)s of every hour"
+msgstr ""
+"%(monthday)s числа каждого месяца и каждый %(weekday)s в %(minute)s-ю минуту "
+"каждого часа"
 
 #: ../src/lang.py:254
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "%(monthday)s числа каждого месяца и каждый %(weekday)s каждую минуту с %(time_from)s по %(time_to)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"%(monthday)s числа каждого месяца и каждый %(weekday)s каждую минуту с "
+"%(time_from)s по %(time_to)s"
 
 #: ../src/lang.py:256
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
 msgstr "%(monthday)s числа каждого месяца и каждый %(weekday)s в %(time)s"
 
 #: ../src/lang.py:261
@@ -850,13 +863,19 @@ msgstr "Каждый %(weekday)s в месяце %(month)s в каждую ми
 
 #: ../src/lang.py:265
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
-msgstr "Каждый %(weekday)s в месяце %(month)s в %(minute)s-ю минуту каждого часа"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
+msgstr ""
+"Каждый %(weekday)s в месяце %(month)s в %(minute)s-ю минуту каждого часа"
 
 #: ../src/lang.py:267
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "В каждый %(weekday)s в месяце %(month)s каждую минуту с %(time_from)s по %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at every minute between "
+"%(time_from)s and %(time_to)s"
+msgstr ""
+"В каждый %(weekday)s в месяце %(month)s каждую минуту с %(time_from)s по "
+"%(time_to)s"
 
 #: ../src/lang.py:269
 #, python-format
@@ -865,28 +884,47 @@ msgstr "Каждый %(weekday)s в месяце %(month)s, в %(time)s"
 
 #: ../src/lang.py:274
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every full hour"
-msgstr "В каждый %(weekday)s в месяце %(month)s и %(date)s каждого года в каждый полный час"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every full hour"
+msgstr ""
+"В каждый %(weekday)s в месяце %(month)s и %(date)s каждого года в каждый "
+"полный час"
 
 #: ../src/lang.py:276
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute"
-msgstr "Каждый %(weekday)s в месяце %(month)s и %(date)s каждый год каждую минуту"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute"
+msgstr ""
+"Каждый %(weekday)s в месяце %(month)s и %(date)s каждый год каждую минуту"
 
 #: ../src/lang.py:278
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at minute %(minute)s of every 
hour"
-msgstr "Каждый %(weekday)s в месяце %(month)s и %(date)s каждого года в %(minute)s-ю минуту каждого часа"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"minute %(minute)s of every hour"
+msgstr ""
+"Каждый %(weekday)s в месяце %(month)s и %(date)s каждого года в %(minute)s-ю "
+"минуту каждого часа"
 
 #: ../src/lang.py:280
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "Каждый %(weekday)s в %(month)s и %(date)s каждого года в каждую минуту с %(time_from)s по 
%(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Каждый %(weekday)s в %(month)s и %(date)s каждого года в каждую минуту с "
+"%(time_from)s по %(time_to)s"
 
 #: ../src/lang.py:282
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at %(time)s"
-msgstr "Каждый %(weekday)s в месяце %(month)s, а также %(date)s каждого года в %(time)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"%(time)s"
+msgstr ""
+"Каждый %(weekday)s в месяце %(month)s, а также %(date)s каждого года в "
+"%(time)s"
 
 #: ../src/lang.py:290
 msgid "every minute"
@@ -939,18 +977,15 @@ msgstr "день недели: %s"
 msgid "At %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 msgstr "Ð’ %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 
-#: ../src/mainWindow.py:71
-#: ../src/examples/dump.py:55
+#: ../src/mainWindow.py:71 ../src/examples/dump.py:55
 msgid "Default behaviour"
 msgstr "Обычное"
 
-#: ../src/mainWindow.py:72
-#: ../src/examples/dump.py:56
+#: ../src/mainWindow.py:72 ../src/examples/dump.py:56
 msgid "Suppress output"
 msgstr "Подавить вывод"
 
-#: ../src/mainWindow.py:74
-#: ../src/examples/dump.py:58
+#: ../src/mainWindow.py:74 ../src/examples/dump.py:58
 msgid "X application: suppress output"
 msgstr "Приложение X, подавить вывод"
 
@@ -970,52 +1005,41 @@ msgstr "Из шаблона"
 msgid "Add a new task"
 msgstr "Добавить задание"
 
-#: ../src/mainWindow.py:286
-#: ../src/mainWindow.py:416
+#: ../src/mainWindow.py:286 ../src/mainWindow.py:416
 #, python-format
 msgid "Editing user: %s"
 msgstr "Правка пользователя: %s"
 
-#: ../src/mainWindow.py:333
-#: ../src/mainWindow.py:344
-#: ../src/mainWindow.py:355
-#: ../src/mainWindow.py:370
-#: ../src/mainWindow.py:381
+#: ../src/mainWindow.py:333 ../src/mainWindow.py:344 ../src/mainWindow.py:355
+#: ../src/mainWindow.py:370 ../src/mainWindow.py:381
 #: ../src/scheduleapplet.py:122
 msgid "ERROR: Could not load icon"
 msgstr "ОШИБКА: невозможно загрузить значок"
 
-#: ../src/mainWindow.py:390
-#: ../src/mainWindow.py:396
+#: ../src/mainWindow.py:390 ../src/mainWindow.py:396
 msgid "ERROR: Could not load glade file"
 msgstr "ОШИБКА: невозможно загрузить файл glade"
 
-#: ../src/mainWindow.py:451
-#: ../src/template_chooser.py:69
+#: ../src/mainWindow.py:451 ../src/template_chooser.py:69
 #: ../src/template_manager.py:72
 msgid "Task"
 msgstr "Задание"
 
-#: ../src/mainWindow.py:464
-#: ../src/mainWindow.py:490
-#: ../src/template_chooser.py:78
-#: ../src/template_manager.py:81
+#: ../src/mainWindow.py:464 ../src/mainWindow.py:490
+#: ../src/template_chooser.py:78 ../src/template_manager.py:81
 msgid "Description"
 msgstr "Описание"
 
-#: ../src/mainWindow.py:468
-#: ../src/mainWindow.py:481
+#: ../src/mainWindow.py:468 ../src/mainWindow.py:481
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: ../src/mainWindow.py:472
-#: ../src/mainWindow.py:485
+#: ../src/mainWindow.py:472 ../src/mainWindow.py:485
 msgid "Command preview"
 msgstr "Команда"
 
 #. print ex
-#: ../src/mainWindow.py:544
-#: ../src/mainWindow.py:607
+#: ../src/mainWindow.py:544 ../src/mainWindow.py:607
 msgid "Please select a task"
 msgstr "Пожалуйста, выберите задание"
 
@@ -1027,11 +1051,13 @@ msgstr "Хотите удалить это задание?"
 msgid ""
 "Are you sure you want to run this task now?\n"
 "\n"
-"This is used to preview the task and initiates a one-time run, this does not affect the normal scheduled 
run times."
+"This is used to preview the task and initiates a one-time run, this does not "
+"affect the normal scheduled run times."
 msgstr ""
 "Выполнить это задание прямо сейчас?\n"
 "\n"
-"Так вы можете проверить его работу.  Задание будет выполнено однократно; его расписание изменено не будет."
+"Так вы можете проверить его работу.  Задание будет выполнено однократно; его "
+"расписание изменено не будет."
 
 #: ../src/mainWindow.py:656
 msgid "Are you sure you want to run this task?"
@@ -1041,11 +1067,15 @@ msgstr "Выполнить это задание?"
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"Recurrent tasks will be run from the home directory, one-time tasks from the directory where Gnome schedule 
was run from at the time of task creation (normally the home directory)."
+"Recurrent tasks will be run from the home directory, one-time tasks from the "
+"directory where Gnome schedule was run from at the time of task creation "
+"(normally the home directory)."
 msgstr ""
 "Замечание о рабочем каталоге задач:\n"
 "\n"
-"Повторяющиеся задания будут запущены из домашнего каталога, однократные из каталога, из которого был 
запущен Планировщик GNOME во время создания задачи (обычно из домашнего каталога)."
+"Повторяющиеся задания будут запущены из домашнего каталога, однократные из "
+"каталога, из которого был запущен Планировщик GNOME во время создания задачи "
+"(обычно из домашнего каталога)."
 
 #: ../src/mainWindow.py:727
 msgid "Please select a task!"
@@ -1099,8 +1129,13 @@ msgid "Calendar"
 msgstr "Календарь"
 
 #: ../src/atEditor.py:515
-msgid "In one or both of the fields hour and minute there was entered a letter, or a number out of range. 
Remember an hour only has 60 minutes and a day only 24 hours."
-msgstr "Неверные числовые значения для часа и минуты. Помните, что в часе 60 минут, а в сутках 24 часа."
+msgid ""
+"In one or both of the fields hour and minute there was entered a letter, or "
+"a number out of range. Remember an hour only has 60 minutes and a day only "
+"24 hours."
+msgstr ""
+"Неверные числовые значения для часа и минуты. Помните, что в часе 60 минут, "
+"а в сутках 24 часа."
 
 #: ../src/atEditor.py:576
 #, python-format
@@ -1111,14 +1146,15 @@ msgstr "Это некорректная запись! Проблема може
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"One-time tasks will be run from the directory where Gnome schedule is run from (normally the home 
directory)."
+"One-time tasks will be run from the directory where Gnome schedule is run "
+"from (normally the home directory)."
 msgstr ""
 "Замечание о рабочем каталоге заданий:\n"
 "\n"
-"Однократные задания запускаются из каталога, из которого был запущен Планировщик GNOME (обычно домашний 
каталог)."
+"Однократные задания запускаются из каталога, из которого был запущен "
+"Планировщик GNOME (обычно домашний каталог)."
 
-#: ../src/template.py:198
-#: ../src/template.py:212
+#: ../src/template.py:198 ../src/template.py:212
 msgid "Title:"
 msgstr "Название:"
 
@@ -1126,13 +1162,11 @@ msgstr "Название:"
 msgid "Run:"
 msgstr "Запуск:"
 
-#: ../src/template_chooser.py:40
-#: ../src/template_manager.py:37
+#: ../src/template_chooser.py:40 ../src/template_manager.py:37
 msgid "Use template"
 msgstr "использовать"
 
-#: ../src/template_chooser.py:97
-#: ../src/template_manager.py:102
+#: ../src/template_chooser.py:97 ../src/template_manager.py:102
 msgid "One-time"
 msgstr "Однократное"
 
@@ -1140,28 +1174,35 @@ msgstr "Однократное"
 msgid "Could not open a connection to X!"
 msgstr "Не удалось соединиться с X!"
 
-#: ../src/xwrapper.py:71
-#: ../src/xwrapper.py:79
+#: ../src/xwrapper.py:71 ../src/xwrapper.py:79
 msgid "Wrong number of arguments."
 msgstr "Неверное число аргументов."
 
-#: ../src/xwrapper.py:73
-#: ../src/xwrapper.py:81
-msgid "Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for applications to be run from 
crontab or at under X. Use through gnome-schedule."
-msgstr "Сценарий для Gnome-schedule (http://gnome-schedule.sf.net) для запуска приложений из crontab или 
из-под X. Используйте через программу gnome-schedule."
+#: ../src/xwrapper.py:73 ../src/xwrapper.py:81
+msgid ""
+"Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for "
+"applications to be run from crontab or at under X. Use through gnome-"
+"schedule."
+msgstr ""
+"Сценарий для Gnome-schedule (http://gnome-schedule.sf.net) для запуска "
+"приложений из crontab или из-под X. Используйте через программу gnome-"
+"schedule."
 
 #: ../src/xwrapper.py:87
 msgid "Unknown type of job."
 msgstr "Неизвестный тип задания."
 
-#: ../src/xwrapper.py:106
-#: ../src/xwrapper.py:110
+#: ../src/xwrapper.py:106 ../src/xwrapper.py:110
 msgid "Invalid job id."
 msgstr "Неверный номер задания."
 
 #: ../src/xwrapper.py:117
-msgid "Could not get job data, the task might have been created with an old version - try recreating the 
task."
-msgstr "Не удалось получить сведения о задании, скорее всего из-за устаревшей версии; попробуйте создать 
задание заново."
+msgid ""
+"Could not get job data, the task might have been created with an old version "
+"- try recreating the task."
+msgstr ""
+"Не удалось получить сведения о задании, скорее всего из-за устаревшей "
+"версии; попробуйте создать задание заново."
 
 #: ../src/xwrapper.py:121
 msgid "Data file too old. Recreate task."
@@ -1187,4 +1228,3 @@ msgstr "Вы не увидите этого сообщения."
 #: ../src/xwrapper.py:158
 msgid "xwrapper.py: completed"
 msgstr "xwrapper.py: завершено"
-
diff --git a/po/rw.po b/po/rw.po
index b6e0482..78d8b30 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
@@ -27,60 +27,67 @@ msgstr ""
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
 #, fuzzy
-msgid "Manage your system tasks"
-msgstr "Sisitemu Ibikorwa"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
-#, fuzzy
 msgid "Scheduled tasks"
 msgstr "i Igikorwa"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "Ibikorwa"
+msgid "Manage your system tasks"
+msgstr "Sisitemu Ibikorwa"
 
 # scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Fvschedule.4.text
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
 msgid "Gnome schedule"
 msgstr "Igenabihe"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#, fuzzy
+msgid "Configures your scheduled tasks"
+msgstr "Ibikorwa"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Itariki S ku Igihe S"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr ""
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_DEFAULT_UI_NAME.text
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Nta mutwe"
+
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_MIN.text
 #: ../src/crontab.py:87
 #, fuzzy
@@ -108,7 +115,7 @@ msgstr "Ukwezi"
 msgid "Weekday"
 msgstr "UmunsiW'Icyumweru"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "By'ibanze"
 
@@ -127,33 +134,27 @@ msgstr "hagati Na"
 msgid "%s is not a number"
 msgstr "%sni OYA a Umubare"
 
-# filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_DEFAULT_UI_NAME.text
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Nta mutwe"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr ""
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME.4.text
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "iminota"
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_TIME.2.text
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "isaha"
 
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE.6.text
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "umunsi"
 
@@ -161,29 +162,29 @@ msgstr "umunsi"
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DATE.4.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\scfuncs.src:RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GDA_2.10.text
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "ukwezi"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_DAY_OF_WEEK.text
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 #, fuzzy
 msgid "weekday"
 msgstr "UMUNSIICYUMWERU"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "buri UMUNOTA"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "buri ISAHA"
@@ -207,21 +208,21 @@ msgstr "Buri"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 #, fuzzy
 msgid "Create a New Scheduled Task"
 msgstr "a Gishya Igikorwa"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr ""
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "Igikorwa"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 #, fuzzy
 msgid "Edit a Scheduled Task"
 msgstr "a Igikorwa"
@@ -251,11 +252,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -301,13 +302,13 @@ msgid "This is invalid. Reason: %s"
 msgstr "ni Sibyo"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "buri UMUNOTA"
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_MIN.text
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "UMUNOTA"
@@ -318,7 +319,7 @@ msgid "At an exact hour"
 msgstr ""
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_HOUR.text
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "ISAHA"
@@ -328,7 +329,7 @@ msgstr "ISAHA"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr ""
 
@@ -343,7 +344,7 @@ msgid "In a month"
 msgstr "ukwezi"
 
 # sw/source\ui\utlui\initui.src:STR_AUTH_FIELD_MONTH.text
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "Ukwezi"
@@ -356,17 +357,17 @@ msgid "On a weekday"
 msgstr "UMUNSIICYUMWERU"
 
 # 6515
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "UmunsiW'Icyumweru"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
 # sc/source\core\src\compiler.src:RID_SC_FUNCTION_NAMES.SC_OPCODE_GET_MIN.text
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "UMUNOTA"
@@ -394,8 +395,9 @@ msgid "Weekdays:"
 msgstr "UmunsiW'Icyumweru"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr ""
+#, fuzzy
+msgid "_Manage tasks"
+msgstr "Sisitemu Ibikorwa"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -407,9 +409,8 @@ msgid "_Help"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:4
-#, fuzzy
-msgid "_Manage tasks"
-msgstr "Sisitemu Ibikorwa"
+msgid "A_bout"
+msgstr ""
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -440,13 +441,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -493,74 +497,89 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Gusiba i Byahiswemo"
 
-# setup2/source\ui\pages\pcfgserver.src:RESID_PAGE_PAGECONFIGSERVER.FT_INFO3.text
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "Sisitemu Ibikorwa"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
+#, fuzzy
+msgid "Create a new template."
+msgstr "Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<B i Ubwoko Bya i Igikorwa B"
+msgid "Edit the selected template"
+msgstr "Gusiba i Byahiswemo"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<B B"
+msgid "Delete the selected template"
+msgstr "Gusiba i Byahiswemo"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
+msgid "Task description:"
 msgstr ""
 
-# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Fvschedule.4.text
-#: ../src/gnome-schedule.glade.h:8
-#, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Igenabihe"
-
-#: ../src/gnome-schedule.glade.h:9
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
 #, fuzzy
-msgid "Add a Scheduled Task"
-msgstr "a Igikorwa"
+msgid "X application"
+msgstr "iyi Porogaramu"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "Igikorwa"
+msgid "Execute at:"
+msgstr ""
 
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
+# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
+# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Urwego rwo hejuru"
+#, fuzzy
+msgid "Date:"
+msgstr "Gusiba"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Igihe:"
+
+# setup2/source\ui\pages\pcfgserver.src:RESID_PAGE_PAGECONFIGSERVER.FT_INFO3.text
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
+msgid "Task:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "a Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
 
 # padmin/source\rtsetup.src:RID_RTS_RTSDIALOG.RID_RTS_RTSDIALOG_TABCONTROL.RID_RTS_COMMANDPAGE.text
@@ -570,89 +589,59 @@ msgstr ""
 msgid "Command:"
 msgstr "Icyo wifuza"
 
+# sw/source\ui\fldui\fldui.src:STR_SCRIPTFLD.text
 #: ../src/gnome-schedule.glade.h:19
 #, fuzzy
-msgid "Configure Scheduled Tasks"
-msgstr "Ibikorwa"
+msgid "Description:"
+msgstr "Inyandiko-porogaramu"
 
 #: ../src/gnome-schedule.glade.h:20
-#, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Gusiba i Byahiswemo"
-
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "Igikorwa"
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "Gusiba"
+msgid "Advanced"
+msgstr "Urwego rwo hejuru"
 
 #: ../src/gnome-schedule.glade.h:24
-#, fuzzy
-msgid "Delete a scheduled task"
-msgstr "a Igikorwa"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Gusiba i Byahiswemo"
-
-# sw/source\ui\fldui\fldui.src:STR_SCRIPTFLD.text
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Inyandiko-porogaramu"
-
-#: ../src/gnome-schedule.glade.h:27
-#, fuzzy
-msgid "Edit a periodical task"
-msgstr "a Igikorwa"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:28
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a scheduled task"
-msgstr "a Igikorwa"
+msgid "<big>Preview</big>"
+msgstr "<B B"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Gusiba i Byahiswemo"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr ""
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-#, fuzzy
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "ku a UMUNOTA ISAHA UMUNSI UMUNSIICYUMWERU Cyangwa Ukwezi"
+msgid "_User:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:35
 #, fuzzy
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"ku a Intera Ubugari Urugero buri Iminota amasaha Iminsi Uminsi y'akazi "
-"Cyangwa Amezi"
+msgid "Add a Scheduled Task"
+msgstr "a Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:36
 #, fuzzy
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "ku buri UMUNOTA ISAHA UMUNSI UMUNSIICYUMWERU Cyangwa Ukwezi"
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<B i Ubwoko Bya i Igikorwa B"
 
 #: ../src/gnome-schedule.glade.h:37
 #, fuzzy
-msgid "Execution in a range."
-msgstr "in a Urutonde"
+msgid "Time expression help"
+msgstr "imvugo Ifashayobora"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -660,85 +649,102 @@ msgid "Expression:"
 msgstr "imvugo"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
 #, fuzzy
-msgid "Manage templates"
-msgstr "Sisitemu Ibikorwa"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "5 kugirango Ibyerekeye i Imiterere"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+#: ../src/gnome-schedule.glade.h:45
+#, fuzzy
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "ku a UMUNOTA ISAHA UMUNSI UMUNSIICYUMWERU Cyangwa Ukwezi"
+
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
+#: ../src/gnome-schedule.glade.h:47
 #, fuzzy
-msgid "Run selected task"
-msgstr "Guhitamo a Igikorwa"
+msgid "Execution in a range."
+msgstr "in a Urutonde"
 
 #: ../src/gnome-schedule.glade.h:49
 #, fuzzy
-msgid "Run task"
-msgstr "ku"
-
-#: ../src/gnome-schedule.glade.h:50
-#, fuzzy
-msgid "Scheduled and active tasks"
-msgstr "Na Gikora Ibikorwa"
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "ku buri UMUNOTA ISAHA UMUNSI UMUNSIICYUMWERU Cyangwa Ukwezi"
 
 #: ../src/gnome-schedule.glade.h:51
 #, fuzzy
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "5 kugirango Ibyerekeye i Imiterere"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"ku a Intera Ubugari Urugero buri Iminota amasaha Iminsi Uminsi y'akazi "
+"Cyangwa Amezi"
 
 #: ../src/gnome-schedule.glade.h:52
 #, fuzzy
-msgid "Show help"
-msgstr "Ifashayobora"
+msgid "Configure Scheduled Tasks"
+msgstr "Ibikorwa"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr ""
+#, fuzzy
+msgid "Edit a scheduled task"
+msgstr "a Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr ""
+#, fuzzy
+msgid "Delete a scheduled task"
+msgstr "a Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr ""
+#, fuzzy
+msgid "Run selected task"
+msgstr "Guhitamo a Igikorwa"
 
 #: ../src/gnome-schedule.glade.h:56
 #, fuzzy
-msgid "Time expression help"
-msgstr "imvugo Ifashayobora"
+msgid "Run task"
+msgstr "ku"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Igihe:"
+msgid "Templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
 #, fuzzy
-msgid "X application"
-msgstr "iyi Porogaramu"
+msgid "Show help"
+msgstr "Ifashayobora"
 
+# scaddins/source\analysis\analysis.src:RID_ANALYSIS_FUNCTION_DESCRIPTIONS.ANALYSIS_Fvschedule.4.text
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr ""
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Igenabihe"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+#, fuzzy
+msgid "Scheduled and active tasks"
+msgstr "Na Gikora Ibikorwa"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1216,23 +1222,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, fuzzy, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "ni Sibyo Icyabitswe"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/sl.po b/po/sl.po
index 8189002..3c7c775 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-schedule&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2011-11-24 10:13+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-11-25 17:50+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -16,41 +16,48 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Upravljanje sistemskih nalog"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Načrtovane naloge"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Nastavitve načrtovanih nalog"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Upravljanje sistemskih nalog"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Urnik Gnome"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Nastavitve načrtovanih nalog"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Sistemska orodja"
 
-#: ../src/at.py:112
-#: ../src/crontab.py:62
-msgid "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Napaka med ustvarjanjem mape podatkov. Prepričajte se, da imata mapi ~/.gnome in 
~/.gnome/gnome-schedule ustrezna dovoljenja za pisanje."
+#: ../src/at.py:112 ../src/crontab.py:62
+msgid ""
+"Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
+"are writable."
+msgstr ""
+"Napaka med ustvarjanjem mape podatkov. Prepričajte se, da imata mapi ~/."
+"gnome in ~/.gnome/gnome-schedule ustrezna dovoljenja za pisanje."
 
-#: ../src/at.py:145
-#: ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
-msgid "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-schedule are writable."
-msgstr "Napaka med ustvarjanjem mape podatkov: %s. Prepričajte se, da imata mapi ~/.gnome in 
~/.gnome/gnome-schedule ustrezna dovoljenja za pisanje."
+msgid ""
+"Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
+"schedule are writable."
+msgstr ""
+"Napaka med ustvarjanjem mape podatkov: %s. Prepričajte se, da imata mapi ~/."
+"gnome in ~/.gnome/gnome-schedule ustrezna dovoljenja za pisanje."
 
 #: ../src/at.py:547
 #, python-format
@@ -62,8 +69,7 @@ msgstr "Opozorilo! Neznana naloga: %(preview)s"
 msgid "On %(timestring)s"
 msgstr "Ob %(timestring)s"
 
-#: ../src/at.py:560
-#: ../src/at.py:565
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Enkrat"
 
@@ -71,12 +77,8 @@ msgstr "Enkrat"
 msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Opozorilo: vrstice v atq's odvodu ni mogoče razčleniti:"
 
-#: ../src/at.py:624
-#: ../src/crontab.py:288
-#: ../src/crontab.py:334
-#: ../src/crontabEditor.py:275
-#: ../src/atEditor.py:127
-#: ../src/atEditor.py:523
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
 #: ../src/atEditor.py:549
 msgid "Untitled"
 msgstr "Brez naslova"
@@ -101,8 +103,7 @@ msgstr "Mesec"
 msgid "Weekday"
 msgstr "Dan v tednu"
 
-#: ../src/crontab.py:192
-#: ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Osnovno"
 
@@ -111,9 +112,7 @@ msgstr "Osnovno"
 msgid "This is not a valid special record: %(record)s"
 msgstr "To ni veljaven zapis: %(record)s"
 
-#: ../src/crontab.py:220
-#: ../src/crontab.py:225
-#: ../src/crontab.py:229
+#: ../src/crontab.py:220 ../src/crontab.py:225 ../src/crontab.py:229
 #, python-format
 msgid "Must be between %(min)s and %(max)s"
 msgstr "Vrednost mora biti med %(min)s in %(max)s"
@@ -123,16 +122,12 @@ msgstr "Vrednost mora biti med %(min)s in %(max)s"
 msgid "%s is not a number"
 msgstr "%s ni Å¡tevilo"
 
-#: ../src/crontab.py:455
-#: ../src/crontab.py:457
-#: ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Ponavljajoče"
 
-#: ../src/crontab.py:455
-#: ../src/crontabEditor.py:74
-#: ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Med ponovnim zagonom"
 
@@ -157,28 +152,27 @@ msgid "weekday"
 msgstr "dan v tednu"
 
 #: ../src/crontab.py:576
-msgid "Failed to parse the Day of Month field, possibly due to a bug in crontab."
-msgstr "Napaka med razčlenjevanjem polja dneva meseca; najverjetneje je to napaka crontab sistema."
+msgid ""
+"Failed to parse the Day of Month field, possibly due to a bug in crontab."
+msgstr ""
+"Napaka med razčlenjevanjem polja dneva meseca; najverjetneje je to napaka "
+"crontab sistema."
 
-#: ../src/crontabEditor.py:69
-#: ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Vsako minuto"
 
-#: ../src/crontabEditor.py:70
-#: ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Vsako uro"
 
-#: ../src/crontabEditor.py:71
-#: ../src/crontabEditorHelper.py:99
+#: ../src/crontabEditor.py:71 ../src/crontabEditorHelper.py:99
 msgid "Every day"
 msgstr "Vsak dan"
 
-#: ../src/crontabEditor.py:72
-#: ../src/crontabEditorHelper.py:105
+#: ../src/crontabEditor.py:72 ../src/crontabEditorHelper.py:105
 msgid "Every month"
 msgstr "Vsak mesec"
 
@@ -187,38 +181,46 @@ msgid "Every week"
 msgstr "Vsak teden"
 
 #. add new task
-#: ../src/crontabEditor.py:131
-#: ../src/crontabEditor.py:142
-#: ../src/atEditor.py:129
-#: ../src/atEditor.py:148
+#: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Ustvari novo načrtovano nalogo."
 
-#: ../src/crontabEditor.py:198
-#: ../src/atEditor.py:166
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Uredi predlogo"
 
-#: ../src/crontabEditor.py:223
-#: ../src/atEditor.py:188
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Nova predloga"
 
-#: ../src/crontabEditor.py:249
-#: ../src/atEditor.py:230
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Uredi načrtovano nalogo"
 
-#: ../src/crontabEditor.py:302
-#: ../src/crontabEditor.py:578
+#: ../src/crontabEditor.py:302 ../src/crontabEditor.py:578
 #: ../src/crontabEditor.py:618
 #, python-format
-msgid "This is an invalid record! The problem could be in the %(field)s field. Reason: %(reason)s"
-msgstr "Zapis je neveljaven! Težava je lahko v polju %(field)s. Vzrok: %(reason)s"
+msgid ""
+"This is an invalid record! The problem could be in the %(field)s field. "
+"Reason: %(reason)s"
+msgstr ""
+"Zapis je neveljaven! Težava je lahko v polju %(field)s. Vzrok: %(reason)s"
 
 #: ../src/crontabEditor.py:307
-msgid "Your command contains one or more of the character %, this is special for cron and cannot be used 
with Gnome-schedule because of the format it uses to store extra information on the crontab line. Please use 
the | redirector character to achieve the same functionality. Refer to the crontab manual for more 
information about the % character. If you don not want to use it for redirection it must be properly escaped 
with the \\ letter."
-msgstr "Ukaz vsebuje enega ali več znakov %. Znak je rezerviran za cron in ga ni mogoče uporabljati z 
Urnikom Gnome. Uporabite | preusmeritev za dosego enakega učinka. Za več podrobnosti o znaku % si poglejte 
priročnik za crontab. V kolikor znaka ne želite uporabiti za preusmeritev, mora biti znak pravilno opuščen z 
\\. Primer: \\ črka."
+msgid ""
+"Your command contains one or more of the character %, this is special for "
+"cron and cannot be used with Gnome-schedule because of the format it uses to "
+"store extra information on the crontab line. Please use the | redirector "
+"character to achieve the same functionality. Refer to the crontab manual for "
+"more information about the % character. If you don not want to use it for "
+"redirection it must be properly escaped with the \\ letter."
+msgstr ""
+"Ukaz vsebuje enega ali več znakov %. Znak je rezerviran za cron in ga ni "
+"mogoče uporabljati z Urnikom Gnome. Uporabite | preusmeritev za dosego "
+"enakega učinka. Za več podrobnosti o znaku % si poglejte priročnik za "
+"crontab. V kolikor znaka ne želite uporabiti za preusmeritev, mora biti znak "
+"pravilno opuščen z \\. Primer: \\ črka."
 
 #: ../src/crontabEditor.py:456
 msgid ""
@@ -230,15 +232,11 @@ msgstr ""
 "\n"
 "Ponavljajoče se naloge bodo izvedene iz domače mape."
 
-#: ../src/crontabEditor.py:457
-#: ../src/mainWindow.py:666
-#: ../src/atEditor.py:597
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "_Sporočila ne pokaži več"
 
-#: ../src/crontabEditor.py:458
-#: ../src/mainWindow.py:667
-#: ../src/atEditor.py:598
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Opozorilo: delovna mapa izvedenih nalog"
 
@@ -272,13 +270,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Izbor ni veljaven. Razlog: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231
-#: ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Ob točni minuti"
 
-#: ../src/crontabEditorHelper.py:232
-#: ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minute:"
 
@@ -287,8 +283,7 @@ msgstr "Minute:"
 msgid "At an exact hour"
 msgstr "Ob točni uri"
 
-#: ../src/crontabEditorHelper.py:236
-#: ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Ura:"
 
@@ -297,8 +292,7 @@ msgstr "Ura:"
 msgid "On a day"
 msgstr "Na dan"
 
-#: ../src/crontabEditorHelper.py:240
-#: ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dan:"
 
@@ -307,8 +301,7 @@ msgstr "Dan:"
 msgid "In a month"
 msgstr "V mesecu"
 
-#: ../src/crontabEditorHelper.py:244
-#: ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Mesec:"
 
@@ -317,18 +310,15 @@ msgstr "Mesec:"
 msgid "On a weekday"
 msgstr "Na delavni dan"
 
-#: ../src/crontabEditorHelper.py:248
-#: ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Dan v tednu:"
 
-#: ../src/crontabEditorHelper.py:253
-#: ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "V korak z"
 
-#: ../src/crontabEditorHelper.py:255
-#: ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minute:"
 
@@ -349,8 +339,8 @@ msgid "Weekdays:"
 msgstr "Dnevi v tednu:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_O programu"
+msgid "_Manage tasks"
+msgstr "_Upravljaj z nalogami"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -361,8 +351,8 @@ msgid "_Help"
 msgstr "Pomo_č"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Upravljaj z nalogami"
+msgid "A_bout"
+msgstr "_O programu"
 
 #: ../src/gnome-schedule-export.py:45
 msgid "Gnome Schedule: Export tasks"
@@ -457,212 +447,213 @@ msgstr[2] "Opravilo je končano. Uvoženi sta %d nalogi."
 msgstr[3] "Opravilo je končano. Uvožene so %d naloge."
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Izbor predloge"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Ustvari novo nalogo iz izbrane predloge"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Upravljanje z nalogami"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Izbor uporabnika za spreminjanje nalog</b>"
+msgid "Create a new template."
+msgstr "Ustvari novo predlogo."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Izbor vrste načrtovane naloge:</b>"
+msgid "Edit the selected template"
+msgstr "Uredi izbrano predlogo"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Predogled</big>"
+msgid "Delete the selected template"
+msgstr "Izbris izbrane predloge"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>ÄŒas in Datum</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "O programu"
+msgid "Task description:"
+msgstr "Opis naloge:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Dodaj načrtovano nalogo"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "Program za X"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Dodaj kot predlogo"
+msgid "Execute at:"
+msgstr "Izvedi ob:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Date:"
+msgstr "Datum:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "ÄŒas:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Zamenjaj uporabnika"
+msgid "Task:"
+msgstr "Naloga:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Spremeni način urejanja"
+msgid "Add as template"
+msgstr "Dodaj kot predlogo"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Izbor predloge"
+msgid "Edit a periodical task"
+msgstr "Uredi ponavljajočo se nalogo"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Izbor uporabnika za spreminjanje nalog"
+msgid "ls -l"
+msgstr "ls -l"
 
-#: ../src/gnome-schedule.glade.h:18
-#: ../src/template.py:198
+#: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
 msgid "Command:"
 msgstr "Ukaz:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Nastavitve načrtovanih nalog"
+msgid "Description:"
+msgstr "Opis:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Ustvari novo nalogo iz izbrane predloge"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Ustvari novo predlogo."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>ÄŒas in Datum</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Datum:"
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Izbris naloge v urniku"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Izbris izbrane predloge"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Uredi ponavljajočo se nalogo"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Uredi načrtovano nalogo"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Predogled</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Uredi izbrano predlogo"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Zamenjaj uporabnika"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Izvedi ob:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Izbor uporabnika za spreminjanje nalog</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Izvedba ob določeni minuti, uri, dnevu, tednu ali mesecu."
+msgid "_User:"
+msgstr "_Uporabnik:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid "Execution at a step width. For example every five minutes, hours, days, weekdays or months."
-msgstr "Izvedba po korakih. Na primer: izvedba vsakih nekaj minut, ur, dni, tednov ali mesecev."
+msgid "Add a Scheduled Task"
+msgstr "Dodaj načrtovano nalogo"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Izvedba ob vsaki minuti, uri, dnevu, tednu ali mesecu."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Izbor vrste načrtovane naloge:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Izvedba v območju."
+msgid "Time expression help"
+msgstr "Pomoč o časovnem zapisu"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Izraz:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Na:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "V območju"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Ostalo"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Upravljanje z nalogami"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Več podrobnosti o crontab obliki je mogoče najti z \"man 5 crontab\" ."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Ostalo"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Izvedba ob določeni minuti, uri, dnevu, tednu ali mesecu."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Zaženi izbrano nalogo"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "V območju"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Zaženi nalogo"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Izvedba v območju."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Načrtovane in dejavne naloge"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Izvedba ob vsaki minuti, uri, dnevu, tednu ali mesecu."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Več podrobnosti o crontab obliki je mogoče najti z \"man 5 crontab\" ."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Izvedba po korakih. Na primer: izvedba vsakih nekaj minut, ur, dni, tednov "
+"ali mesecev."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Pokaži pomoč"
+msgid "Configure Scheduled Tasks"
+msgstr "Nastavitve načrtovanih nalog"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Opis naloge:"
+msgid "Edit a scheduled task"
+msgstr "Uredi načrtovano nalogo"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Naloga:"
+msgid "Delete a scheduled task"
+msgstr "Izbris naloge v urniku"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Predloga"
+msgid "Run selected task"
+msgstr "Zaženi izbrano nalogo"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Pomoč o časovnem zapisu"
+msgid "Run task"
+msgstr "Zaženi nalogo"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "ÄŒas:"
+msgid "Templates"
+msgstr "Predloga"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Na:"
+msgid "Change edit mode"
+msgstr "Spremeni način urejanja"
+
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Izbor uporabnika za spreminjanje nalog"
 
 #: ../src/gnome-schedule.glade.h:60
-#: ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "Program za X"
+msgid "Show help"
+msgstr "Pokaži pomoč"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Uporabnik:"
+msgid "About Gnome-schedule"
+msgstr "O programu"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Načrtovane in dejavne naloge"
 
-#: ../src/gnome-schedule.py:66
-#: ../src/scheduleapplet.py:67
+#: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
 msgid ""
 "You need to install pyGTK or GTKv2,\n"
@@ -731,8 +722,11 @@ msgstr "Na %(monthday)s dan meseca ob %(minute)s minuti vsake ure"
 
 #: ../src/lang.py:202
 #, python-format
-msgid "On day %(monthday)s of every month at every minute between %(time_from)s and %(time_to)s"
-msgstr "Na %(monthday)s dan meseca na vsako minuto med %(time_from)s in %(time_to)s"
+msgid ""
+"On day %(monthday)s of every month at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Na %(monthday)s dan meseca na vsako minuto med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:204
 #, python-format
@@ -756,7 +750,9 @@ msgstr "%(month)s, vsak dan ob %(minute)s minuto vsake ure"
 
 #: ../src/lang.py:215
 #, python-format
-msgid "On every day in %(month)s at every minute between %(time_from)s and %(time_to)s"
+msgid ""
+"On every day in %(month)s at every minute between %(time_from)s and "
+"%(time_to)s"
 msgstr "%(month)s, vsak dan ob vsaki minuti med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:217
@@ -781,8 +777,10 @@ msgstr "Vsako leto na %(date)s ob %(minute)s minuti vsake ure"
 
 #: ../src/lang.py:228
 #, python-format
-msgid "Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Vsako leto na %(date)s ob vsaki minuti med %(time_from)s in %(time_to)s"
+msgid ""
+"Every year on %(date)s at every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Vsako leto na %(date)s ob vsaki minuti med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:230
 #, python-format
@@ -806,8 +804,11 @@ msgstr "Vsak delovnik: %(weekday)s vsako %(minute)s minuto vsake ure"
 
 #: ../src/lang.py:241
 #, python-format
-msgid "On every weekday: %(weekday)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Vsak delovnik: %(weekday)s na vsako minuto med %(time_from)s in %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s at every minute between %(time_from)s and "
+"%(time_to)s"
+msgstr ""
+"Vsak delovnik: %(weekday)s na vsako minuto med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:243
 #, python-format
@@ -816,28 +817,44 @@ msgstr "Vsak delovnik: %(weekday)s ob %(time)s"
 
 #: ../src/lang.py:248
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every full hour"
-msgstr "Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s vsako polno uro"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"full hour"
+msgstr ""
+"Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s vsako polno uro"
 
 #: ../src/lang.py:250
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute"
-msgstr "Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s na vsako minuto"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute"
+msgstr ""
+"Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s na vsako minuto"
 
 #: ../src/lang.py:252
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at minute %(minute)s of every hour"
-msgstr "Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s vsako %(minute)s minuto vsake ure"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at minute "
+"%(minute)s of every hour"
+msgstr ""
+"Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s vsako "
+"%(minute)s minuto vsake ure"
 
 #: ../src/lang.py:254
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s na vsako minuto med %(time_from)s in 
%(time_to)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at every "
+"minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Vsak %(monthday)s dan v mesecu in vsak delovnik: %(weekday)s na vsako minuto "
+"med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:256
 #, python-format
-msgid "On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
-msgstr "Vsak %(monthday)s dan v mesecu in v vsak delovnik: %(weekday)s ob %(time)s"
+msgid ""
+"On day %(monthday)s of every month and every weekday: %(weekday)s at %(time)s"
+msgstr ""
+"Vsak %(monthday)s dan v mesecu in v vsak delovnik: %(weekday)s ob %(time)s"
 
 #: ../src/lang.py:261
 #, python-format
@@ -851,13 +868,19 @@ msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s na vsako minuto"
 
 #: ../src/lang.py:265
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s ob %(minute)s minuti vsake ure"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at minute %(minute)s of every hour"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s ob %(minute)s minuti vsake ure"
 
 #: ../src/lang.py:267
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s at every minute between %(time_from)s and %(time_to)s"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s na vsako minuto med %(time_from)s in %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s at every minute between "
+"%(time_from)s and %(time_to)s"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s na vsako minuto med "
+"%(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:269
 #, python-format
@@ -866,28 +889,48 @@ msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s ob %(time)s"
 
 #: ../src/lang.py:274
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every full hour"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto ob vsaki polni uri"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every full hour"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto ob "
+"vsaki polni uri"
 
 #: ../src/lang.py:276
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto vsako minuto"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto "
+"vsako minuto"
 
 #: ../src/lang.py:278
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at minute %(minute)s of every 
hour"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto na vsako %(minute)s minuto 
vsake ure"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"minute %(minute)s of every hour"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto na "
+"vsako %(minute)s minuto vsake ure"
 
 #: ../src/lang.py:280
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at every minute between 
%(time_from)s and %(time_to)s"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto ob vsaki minuti med 
%(time_from)s in %(time_to)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"every minute between %(time_from)s and %(time_to)s"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsako leto ob "
+"vsaki minuti med %(time_from)s in %(time_to)s"
 
 #: ../src/lang.py:282
 #, python-format
-msgid "On every weekday: %(weekday)s in %(month)s and on %(date)s every year at %(time)s"
-msgstr "Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsakega leta ob %(time)s"
+msgid ""
+"On every weekday: %(weekday)s in %(month)s and on %(date)s every year at "
+"%(time)s"
+msgstr ""
+"Vsak delovnik: %(weekday)s v mesecu %(month)s in na %(date)s vsakega leta ob "
+"%(time)s"
 
 #: ../src/lang.py:290
 msgid "every minute"
@@ -940,18 +983,15 @@ msgstr "dan v tednu: %s"
 msgid "At %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 msgstr "Ob %(minute)s, %(hour)s, %(monthday)s, %(month)s, %(weekday)s"
 
-#: ../src/mainWindow.py:71
-#: ../src/examples/dump.py:55
+#: ../src/mainWindow.py:71 ../src/examples/dump.py:55
 msgid "Default behaviour"
 msgstr "Privzeto obnašanje"
 
-#: ../src/mainWindow.py:72
-#: ../src/examples/dump.py:56
+#: ../src/mainWindow.py:72 ../src/examples/dump.py:56
 msgid "Suppress output"
 msgstr "Prepreči odvajanje"
 
-#: ../src/mainWindow.py:74
-#: ../src/examples/dump.py:58
+#: ../src/mainWindow.py:74 ../src/examples/dump.py:58
 msgid "X application: suppress output"
 msgstr "program X: prepreči odvajanje"
 
@@ -971,52 +1011,41 @@ msgstr "Iz predloge"
 msgid "Add a new task"
 msgstr "Dodaj nalogo"
 
-#: ../src/mainWindow.py:286
-#: ../src/mainWindow.py:416
+#: ../src/mainWindow.py:286 ../src/mainWindow.py:416
 #, python-format
 msgid "Editing user: %s"
 msgstr "Urejanje uporabnika: %s"
 
-#: ../src/mainWindow.py:333
-#: ../src/mainWindow.py:344
-#: ../src/mainWindow.py:355
-#: ../src/mainWindow.py:370
-#: ../src/mainWindow.py:381
+#: ../src/mainWindow.py:333 ../src/mainWindow.py:344 ../src/mainWindow.py:355
+#: ../src/mainWindow.py:370 ../src/mainWindow.py:381
 #: ../src/scheduleapplet.py:122
 msgid "ERROR: Could not load icon"
 msgstr "NAPAKA: ni mogoče naložiti ikone"
 
-#: ../src/mainWindow.py:390
-#: ../src/mainWindow.py:396
+#: ../src/mainWindow.py:390 ../src/mainWindow.py:396
 msgid "ERROR: Could not load glade file"
 msgstr "NAPAKA: ni mogoče naložiti glade datoteke"
 
-#: ../src/mainWindow.py:451
-#: ../src/template_chooser.py:69
+#: ../src/mainWindow.py:451 ../src/template_chooser.py:69
 #: ../src/template_manager.py:72
 msgid "Task"
 msgstr "Naloga"
 
-#: ../src/mainWindow.py:464
-#: ../src/mainWindow.py:490
-#: ../src/template_chooser.py:78
-#: ../src/template_manager.py:81
+#: ../src/mainWindow.py:464 ../src/mainWindow.py:490
+#: ../src/template_chooser.py:78 ../src/template_manager.py:81
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/mainWindow.py:468
-#: ../src/mainWindow.py:481
+#: ../src/mainWindow.py:468 ../src/mainWindow.py:481
 msgid "Date and Time"
 msgstr "Datum in čas"
 
-#: ../src/mainWindow.py:472
-#: ../src/mainWindow.py:485
+#: ../src/mainWindow.py:472 ../src/mainWindow.py:485
 msgid "Command preview"
 msgstr "Predogled ukaza"
 
 #. print ex
-#: ../src/mainWindow.py:544
-#: ../src/mainWindow.py:607
+#: ../src/mainWindow.py:544 ../src/mainWindow.py:607
 msgid "Please select a task"
 msgstr "Izberite nalogo."
 
@@ -1028,11 +1057,13 @@ msgstr "Ali želite izbrisati nalogo?"
 msgid ""
 "Are you sure you want to run this task now?\n"
 "\n"
-"This is used to preview the task and initiates a one-time run, this does not affect the normal scheduled 
run times."
+"This is used to preview the task and initiates a one-time run, this does not "
+"affect the normal scheduled run times."
 msgstr ""
 "Ali ste prepričani, da želite nalogo zagnati?\n"
 "\n"
-"Možnost omogoča predogled naloge in začne enkratni zagon, ki pa ni povezan z običajnim načrtovanim zagonom."
+"Možnost omogoča predogled naloge in začne enkratni zagon, ki pa ni povezan z "
+"običajnim načrtovanim zagonom."
 
 #: ../src/mainWindow.py:656
 msgid "Are you sure you want to run this task?"
@@ -1042,11 +1073,14 @@ msgstr "Ali želite zagnati to nalogo?"
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"Recurrent tasks will be run from the home directory, one-time tasks from the directory where Gnome schedule 
was run from at the time of task creation (normally the home directory)."
+"Recurrent tasks will be run from the home directory, one-time tasks from the "
+"directory where Gnome schedule was run from at the time of task creation "
+"(normally the home directory)."
 msgstr ""
 "Opomba o delovni mapi izvedenih nalog:\n"
 "\n"
-"Ponavljajoče se naloge bodo izvedene iz domače mape, enkratne naloge iz mape, kjer je zagnan program 
(običajno je to domača mapa)."
+"Ponavljajoče se naloge bodo izvedene iz domače mape, enkratne naloge iz "
+"mape, kjer je zagnan program (običajno je to domača mapa)."
 
 #: ../src/mainWindow.py:727
 msgid "Please select a task!"
@@ -1098,8 +1132,14 @@ msgid "Calendar"
 msgstr "Koledar"
 
 #: ../src/atEditor.py:515
-msgid "In one or both of the fields hour and minute there was entered a letter, or a number out of range. 
Remember an hour only has 60 minutes and a day only 24 hours."
-msgstr "V enem ali obeh poljih ure in minute je vnesena črka ali pa številčna vrednosti, ki je izven 
časovnega območja. Ura ima le 60 minut in dan le 24 ur."
+msgid ""
+"In one or both of the fields hour and minute there was entered a letter, or "
+"a number out of range. Remember an hour only has 60 minutes and a day only "
+"24 hours."
+msgstr ""
+"V enem ali obeh poljih ure in minute je vnesena črka ali pa številčna "
+"vrednosti, ki je izven časovnega območja. Ura ima le 60 minut in dan le 24 "
+"ur."
 
 #: ../src/atEditor.py:576
 #, python-format
@@ -1110,14 +1150,15 @@ msgstr "Neveljaven zapis! Težava je lahko: %s"
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
-"One-time tasks will be run from the directory where Gnome schedule is run from (normally the home 
directory)."
+"One-time tasks will be run from the directory where Gnome schedule is run "
+"from (normally the home directory)."
 msgstr ""
 "Opomba o delovni mapi izvedenih nalog:\n"
 "\n"
-"Enkratne naloge bodo izvedene iz mape, kjer je zagnan program (običajno je to domača mapa)."
+"Enkratne naloge bodo izvedene iz mape, kjer je zagnan program (običajno je "
+"to domača mapa)."
 
-#: ../src/template.py:198
-#: ../src/template.py:212
+#: ../src/template.py:198 ../src/template.py:212
 msgid "Title:"
 msgstr "Naslov:"
 
@@ -1125,13 +1166,11 @@ msgstr "Naslov:"
 msgid "Run:"
 msgstr "Zaženi:"
 
-#: ../src/template_chooser.py:40
-#: ../src/template_manager.py:37
+#: ../src/template_chooser.py:40 ../src/template_manager.py:37
 msgid "Use template"
 msgstr "Uporabi predlogo"
 
-#: ../src/template_chooser.py:97
-#: ../src/template_manager.py:102
+#: ../src/template_chooser.py:97 ../src/template_manager.py:102
 msgid "One-time"
 msgstr "Enkrat"
 
@@ -1139,28 +1178,35 @@ msgstr "Enkrat"
 msgid "Could not open a connection to X!"
 msgstr "Ni mogoče odpreti povezave s strežnikom X!"
 
-#: ../src/xwrapper.py:71
-#: ../src/xwrapper.py:79
+#: ../src/xwrapper.py:71 ../src/xwrapper.py:79
 msgid "Wrong number of arguments."
 msgstr "Napačno število argumentov."
 
-#: ../src/xwrapper.py:73
-#: ../src/xwrapper.py:81
-msgid "Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for applications to be run from 
crontab or at under X. Use through gnome-schedule."
-msgstr "Skript za Urnik Gnome (http://gnome-schedule.sf.net) za programe, ki jih je mogoče zagnati preko 
crontab sistema ali znotraj X strežnika. Možnost se uporablja preko programa gnome-schedule."
+#: ../src/xwrapper.py:73 ../src/xwrapper.py:81
+msgid ""
+"Wrapper script for Gnome-schedule (http://gnome-schedule.sf.net) for "
+"applications to be run from crontab or at under X. Use through gnome-"
+"schedule."
+msgstr ""
+"Skript za Urnik Gnome (http://gnome-schedule.sf.net) za programe, ki jih je "
+"mogoče zagnati preko crontab sistema ali znotraj X strežnika. Možnost se "
+"uporablja preko programa gnome-schedule."
 
 #: ../src/xwrapper.py:87
 msgid "Unknown type of job."
 msgstr "Neznana vrsta posla."
 
-#: ../src/xwrapper.py:106
-#: ../src/xwrapper.py:110
+#: ../src/xwrapper.py:106 ../src/xwrapper.py:110
 msgid "Invalid job id."
 msgstr "Neveljaven ID posla."
 
 #: ../src/xwrapper.py:117
-msgid "Could not get job data, the task might have been created with an old version - try recreating the 
task."
-msgstr "Ni mogoče pridobiti podatkov posla. Naloga je bila morda ustvarjena s starejšo različico programa - 
ponovno ustvarite nalogo."
+msgid ""
+"Could not get job data, the task might have been created with an old version "
+"- try recreating the task."
+msgstr ""
+"Ni mogoče pridobiti podatkov posla. Naloga je bila morda ustvarjena s "
+"starejšo različico programa - ponovno ustvarite nalogo."
 
 #: ../src/xwrapper.py:121
 msgid "Data file too old. Recreate task."
@@ -1186,4 +1232,3 @@ msgstr "Nikoli ne bo pokazano."
 #: ../src/xwrapper.py:158
 msgid "xwrapper.py: completed"
 msgstr "xwrapper.py: končano"
-
diff --git a/po/sq.po b/po/sq.po
index 3ac0954..98709b8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-01-31 19:53+0100\n"
 "Last-Translator: Elian Myftiu <elian alblinux net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit lists sourceforge net>\n"
@@ -17,59 +17,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Organizo detyrat e sistemit tënd"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Cakto detyrën kohore"
 
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Organizo detyrat e sistemit tënd"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "Konfiguro detyra kohore"
+msgid "Gnome schedule"
+msgstr "Orari Gnome"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
-msgid "Gnome schedule"
-msgstr "Orari Gnome"
+msgid "Configures your scheduled tasks"
+msgstr "Konfiguro detyra kohore"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Më %(date)s në %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr ""
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Pa Titull"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minutë"
@@ -90,7 +96,7 @@ msgstr "Muaj"
 msgid "Weekday"
 msgstr "Ditë jave"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Kryesore"
 
@@ -109,53 +115,48 @@ msgstr "Duhet të jetë midis %s dhe %s"
 msgid "%s is not a number"
 msgstr "%s nuk është një numër"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Pa Titull"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Ripërsëritës"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minutë"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "orë"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "ditë"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "muaj"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "ditë jave"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 #, fuzzy
 msgid "Every minute"
 msgstr "çdo minutë"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 #, fuzzy
 msgid "Every hour"
 msgstr "çdo orë"
@@ -177,21 +178,21 @@ msgstr "Çdo"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 #, fuzzy
 msgid "Create a New Scheduled Task"
 msgstr "Krijo një detyrë të re kohore"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr ""
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Shto detyrë"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 #, fuzzy
 msgid "Edit a Scheduled Task"
 msgstr "Ndrysho një detyrë kohore"
@@ -223,11 +224,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -266,12 +267,12 @@ msgid "This is invalid. Reason: %s"
 msgstr "Kjo është e pavlefshme. Arsyea: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "Çdo minutë"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "Minutë"
@@ -281,7 +282,7 @@ msgstr "Minutë"
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "Orë"
@@ -291,7 +292,7 @@ msgstr "Orë"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr ""
 
@@ -301,7 +302,7 @@ msgstr ""
 msgid "In a month"
 msgstr "muaj"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "Muaj"
@@ -312,16 +313,16 @@ msgstr "Muaj"
 msgid "On a weekday"
 msgstr "ditë jave"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "Ditë jave"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "Minutë"
@@ -346,8 +347,9 @@ msgid "Weekdays:"
 msgstr "Ditë jave"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr ""
+#, fuzzy
+msgid "_Manage tasks"
+msgstr "Organizo detyrat e sistemit tënd"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 #, fuzzy
@@ -359,9 +361,8 @@ msgid "_Help"
 msgstr ""
 
 #: ../src/gnome-schedule-applet.xml.h:4
-#, fuzzy
-msgid "_Manage tasks"
-msgstr "Organizo detyrat e sistemit tënd"
+msgid "A_bout"
+msgstr ""
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -392,13 +393,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -445,72 +449,84 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Do fshijë paravendosjen e zgjedhur"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "Manage templates"
+msgstr "Organizo detyrat e sistemit tënd"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr ""
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Shto detyrë"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Zgjidh llojin e detyrës kohore</b>"
+msgid "Edit the selected template"
+msgstr "Do fshijë paravendosjen e zgjedhur"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Paraparja</b>"
+msgid "Delete the selected template"
+msgstr "Do fshijë paravendosjen e zgjedhur"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
+msgid "Task description:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:8
-#, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Orari Gnome"
-
-#: ../src/gnome-schedule.glade.h:9
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
 #, fuzzy
-msgid "Add a Scheduled Task"
-msgstr "Shto një detyrë kohore"
+msgid "X application"
+msgstr "Rreth këtij programi"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "_Shto detyrë"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Detaje"
+#, fuzzy
+msgid "Date:"
+msgstr "_Fshi"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Ora:"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
+msgid "Task:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "_Shto detyrë"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Ndrysho një detyrë kohore"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
+msgid "ls -l"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
@@ -521,76 +537,55 @@ msgstr "komandë"
 
 #: ../src/gnome-schedule.glade.h:19
 #, fuzzy
-msgid "Configure Scheduled Tasks"
-msgstr "Konfiguro detyra kohore"
+msgid "Description:"
+msgstr "Programthi"
 
 #: ../src/gnome-schedule.glade.h:20
-#, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Do fshijë paravendosjen e zgjedhur"
-
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Shto detyrë"
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Fshi"
+msgid "Advanced"
+msgstr "Detaje"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Fshi një detyrë kohore"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Do fshijë paravendosjen e zgjedhur"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "Programthi"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Ndrysho një detyrë kohore"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Ndrysho një detyrë kohore"
+msgid "<big>Preview</big>"
+msgstr "<b>Paraparja</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Do fshijë paravendosjen e zgjedhur"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr ""
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Ekzekutim në një minutë, orë, ditë, ditë jave apo muaj të veçantë."
+msgid "_User:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Ekzekutim në një shkallë të caktuar. Për shembull çdo 5 minuta, orë, ditë, "
-"ditë jave apo muaj."
+#, fuzzy
+msgid "Add a Scheduled Task"
+msgstr "Shto një detyrë kohore"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Ekzekutim çdo minutë, orë, ditë, ditë jave apo muaj."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Zgjidh llojin e detyrës kohore</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Ekzekutim në një shtrirje kohore."
+msgid "Time expression help"
+msgstr "Ndihma e shprehjes së kohës"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -598,82 +593,93 @@ msgid "Expression:"
 msgstr "Shprehje tjetër"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
 #, fuzzy
-msgid "Manage templates"
-msgstr "Organizo detyrat e sistemit tënd"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Shiko \"man 5 crontab\" për të dhëna rreth formatit crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Ekzekutim në një minutë, orë, ditë, ditë jave apo muaj të veçantë."
+
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Të lutem zgjidh një detyrë"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Ekzekutim në një shtrirje kohore."
 
 #: ../src/gnome-schedule.glade.h:49
-#, fuzzy
-msgid "Run task"
-msgstr "Ekzekuto më:"
-
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Detyrat kohore aktive"
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Ekzekutim çdo minutë, orë, ditë, ditë jave apo muaj."
 
 #: ../src/gnome-schedule.glade.h:51
-#, fuzzy
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Shiko \"man 5 crontab\" për të dhëna rreth formatit crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Ekzekutim në një shkallë të caktuar. Për shembull çdo 5 minuta, orë, ditë, "
+"ditë jave apo muaj."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Shfaq ndihmën"
+#, fuzzy
+msgid "Configure Scheduled Tasks"
+msgstr "Konfiguro detyra kohore"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr ""
+msgid "Edit a scheduled task"
+msgstr "Ndrysho një detyrë kohore"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr ""
+msgid "Delete a scheduled task"
+msgstr "Fshi një detyrë kohore"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr ""
+#, fuzzy
+msgid "Run selected task"
+msgstr "Të lutem zgjidh një detyrë"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Ndihma e shprehjes së kohës"
+#, fuzzy
+msgid "Run task"
+msgstr "Ekzekuto më:"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Ora:"
+msgid "Templates"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Rreth këtij programi"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Shfaq ndihmën"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr ""
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Orari Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Detyrat kohore aktive"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1136,23 +1142,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Ky është një regjistrim i pavlefshëm! Problemi mund të jetë: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/sv.po b/po/sv.po
index fc65b97..7e85878 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2011-03-01 08:44+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -19,26 +19,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Hantera dina systemaktiviteter"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "Schemalagda aktiviteter"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Konfigurerar dina schemalagda aktiviteter"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Hantera dina systemaktiviteter"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome-schema"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Konfigurerar dina schemalagda aktiviteter"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Systemverktyg"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
@@ -46,7 +46,7 @@ msgstr ""
 "Misslyckades med att skapa datakatalog! Försäkra dig om att ~/.gnome och ~/."
 "gnome/gnome-schedule är skrivbara."
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -55,24 +55,31 @@ msgstr ""
 "Misslyckades med att skapa datakatalog: %s. Försäkra dig om att ~/.gnome och "
 "~/.gnome/gnome-schedule är skrivbara."
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr "Varning! Okänd aktivitet: %(preview)s"
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "Klockan %(timestring)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "En gång"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Varning: en rad i atq:s utdata kunde inte tolkas"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Namnlös"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Minut"
@@ -93,7 +100,7 @@ msgstr "MÃ¥nad"
 msgid "Weekday"
 msgstr "Veckodag"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Grundläggande"
 
@@ -112,41 +119,36 @@ msgstr "MÃ¥ste vara mellan %(min)s och %(max)s"
 msgid "%s is not a number"
 msgstr "%s är inte ett tal"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Namnlös"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Ã…terkommande"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "Vid omstart"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "minut"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "timme"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "dag"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "månad"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "veckodag"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
@@ -154,12 +156,12 @@ msgstr ""
 "ett fel i crontab."
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Varje minut"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Varje timme"
 
@@ -177,19 +179,19 @@ msgstr "Varje vecka"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Skapa en ny schemalagd aktivitet"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "Redigera mall"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "Ny mall"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Redigera en schemalagd aktivitet"
 
@@ -229,11 +231,11 @@ msgstr ""
 "\n"
 "Återkommande aktiviteter kommer att köras från hemkatalogen."
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "Visa _inte igen"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "Varning: Arbetskatalog för körda aktiviteter"
 
@@ -267,11 +269,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Detta är ogiltigt. Orsak: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "PÃ¥ en exakt minut"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Minut:"
 
@@ -280,7 +282,7 @@ msgstr "Minut:"
 msgid "At an exact hour"
 msgstr "Vid en exakt timme"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Timme:"
 
@@ -289,7 +291,7 @@ msgstr "Timme:"
 msgid "On a day"
 msgstr "PÃ¥ en dag"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Dag:"
 
@@ -298,7 +300,7 @@ msgstr "Dag:"
 msgid "In a month"
 msgstr "I en månad"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "MÃ¥nad:"
 
@@ -307,15 +309,15 @@ msgstr "MÃ¥nad:"
 msgid "On a weekday"
 msgstr "PÃ¥ en veckodag"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Veckodag:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "I steg"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Minuter:"
 
@@ -336,8 +338,8 @@ msgid "Weekdays:"
 msgstr "Veckodagar:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Om"
+msgid "_Manage tasks"
+msgstr "_Hantera aktiviteter"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -348,8 +350,8 @@ msgid "_Help"
 msgstr "_Hjälp"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Hantera aktiviteter"
+msgid "A_bout"
+msgstr "_Om"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -380,13 +382,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -433,70 +438,78 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "Välj mall"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "Skapa en ny aktivitet från den valda mallen"
 
-# Felrapporterat... http://bugzilla.gnome.org/show_bug.cgi?id=162867
-#
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "Hantera mallar"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Välj den användare vars aktiviteter du vill ändra på</b>"
+msgid "Create a new template."
+msgstr "Skapa en ny mall."
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Välj typen av schemalagd aktivitet:</b>"
+msgid "Edit the selected template"
+msgstr "Redigera den markerade mallen"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<big>Förhandsvisning</big>"
+msgid "Delete the selected template"
+msgstr "Ta bort den markerade mallen"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>Tid och datum</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "Om Gnome-schemaläggaren"
+msgid "Task description:"
+msgstr "Aktivitetsbeskrivning:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Lägg till en schemalagd aktivitet"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X-program"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "Lägg till en mall"
+msgid "Execute at:"
+msgstr "Kör klockan:"
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Avancerat"
+msgid "Date:"
+msgstr "Datum:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "Tid:"
+
+# Felrapporterat... http://bugzilla.gnome.org/show_bug.cgi?id=162867
+#
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Byt användare"
+msgid "Task:"
+msgstr "Aktivitet:"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "Ändra redigeringsläge"
+msgid "Add as template"
+msgstr "Lägg till en mall"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "Välj mall"
+msgid "Edit a periodical task"
+msgstr "Redigera en periodisk aktivitet"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Välj den användare vars aktiviteter du vill ändra på"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -504,145 +517,139 @@ msgid "Command:"
 msgstr "Kommando:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Konfigurera schemalagda aktiviteter"
+msgid "Description:"
+msgstr "Beskrivning:"
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "Skapa en ny aktivitet från den valda mallen"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "Skapa en ny mall."
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>Tid och datum</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "Datum:"
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Ta bort en schemalagd aktivitet"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "Ta bort den markerade mallen"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "Beskrivning:"
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "Redigera en periodisk aktivitet"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Redigera en schemalagd aktivitet"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<big>Förhandsvisning</big>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "Redigera den markerade mallen"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Byt användare"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "Kör klockan:"
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Välj den användare vars aktiviteter du vill ändra på</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Start vid en angiven minut, timme, dag, veckodag eller månad."
+msgid "_User:"
+msgstr "_Användare:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Start i steg. Till exempel var 5:e minut, timme, dag, veckodag eller månad."
+msgid "Add a Scheduled Task"
+msgstr "Lägg till en schemalagd aktivitet"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Start vid varje minut, timme, dag, veckodag eller månad."
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Välj typen av schemalagd aktivitet:</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Start i ett intervall."
+msgid "Time expression help"
+msgstr "Hjälp för tidsuttryck"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Uttryck:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Till:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Från:"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "I ett intervall"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Annan"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "Hantera mallar"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Se \"man 5 crontab\" för information om crontab-formatet."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Annan"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Start vid en angiven minut, timme, dag, veckodag eller månad."
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "Kör markerad aktivitet"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "I ett intervall"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "Kör aktivitet"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Start i ett intervall."
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Schemalagda och aktiva aktiviteter"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Start vid varje minut, timme, dag, veckodag eller månad."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Se \"man 5 crontab\" för information om crontab-formatet."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Start i steg. Till exempel var 5:e minut, timme, dag, veckodag eller månad."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Visa hjälp"
+msgid "Configure Scheduled Tasks"
+msgstr "Konfigurera schemalagda aktiviteter"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "Aktivitetsbeskrivning:"
+msgid "Edit a scheduled task"
+msgstr "Redigera en schemalagd aktivitet"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "Aktivitet:"
+msgid "Delete a scheduled task"
+msgstr "Ta bort en schemalagd aktivitet"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "Mallar"
+msgid "Run selected task"
+msgstr "Kör markerad aktivitet"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Hjälp för tidsuttryck"
+msgid "Run task"
+msgstr "Kör aktivitet"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "Tid:"
+msgid "Templates"
+msgstr "Mallar"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Till:"
+msgid "Change edit mode"
+msgstr "Ändra redigeringsläge"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X-program"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Välj den användare vars aktiviteter du vill ändra på"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Visa hjälp"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Användare:"
+msgid "About Gnome-schedule"
+msgstr "Om Gnome-schemaläggaren"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "Schemalagda och aktiva aktiviteter"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1134,11 +1141,11 @@ msgstr "En aktivitet som körs en gång"
 msgid "A task from a predefined template"
 msgstr "En aktivitet från en fördefinierad mall"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1148,12 +1155,12 @@ msgstr ""
 "tal utanför intervallet. Kom ihåg att en timme endast har 60 minuter och ett "
 "dygn har 24 timmar."
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Detta är en ogiltig post! Problemet kan vara: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/uk.po b/po/uk.po
index cdaf515..362996c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2005-08-12 00:17+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd mylinux com ua>\n"
 "Language-Team: Ukrainian <uk li org>\n"
@@ -17,59 +17,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Керування системними завданнями"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Додавання запланованого завдання"
 
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Керування системними завданнями"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 #, fuzzy
-msgid "Configures your scheduled tasks"
-msgstr "Налаштовування запланованих завдань"
+msgid "Gnome schedule"
+msgstr "Планувальник для Gnome"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
 #, fuzzy
-msgid "Gnome schedule"
-msgstr "Планувальник для Gnome"
+msgid "Configures your scheduled tasks"
+msgstr "Налаштовування запланованих завдань"
 
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr ""
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "У %(date)s о %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Один раз"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr ""
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Без назви"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Хвилина"
@@ -90,7 +96,7 @@ msgstr "Місяць"
 msgid "Weekday"
 msgstr "День тижня"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Основне"
 
@@ -109,52 +115,47 @@ msgstr "Повинно бути від %s до %s"
 msgid "%s is not a number"
 msgstr "%s - не є числом"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Без назви"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Періодично"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "щохвилини"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "щогодини"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "щодня"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "щомісяця"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "кожен день тижня"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Щохвилини"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Щогодини"
 
@@ -172,21 +173,21 @@ msgstr "Щотижня"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Створення запланованого завдання"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Шаблон"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "_Шаблон"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Правка запланованого завдання"
 
@@ -215,11 +216,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -258,12 +259,12 @@ msgid "This is invalid. Reason: %s"
 msgstr "Помилка. Причина: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 #, fuzzy
 msgid "At an exact minute"
 msgstr "Кожну хвилину"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 #, fuzzy
 msgid "Minute:"
 msgstr "_Хвилина:"
@@ -273,7 +274,7 @@ msgstr "_Хвилина:"
 msgid "At an exact hour"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 #, fuzzy
 msgid "Hour:"
 msgstr "_Година:"
@@ -283,7 +284,7 @@ msgstr "_Година:"
 msgid "On a day"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 #, fuzzy
 msgid "Day:"
 msgstr "_Дата:"
@@ -294,7 +295,7 @@ msgstr "_Дата:"
 msgid "In a month"
 msgstr "щомісяця"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 #, fuzzy
 msgid "Month:"
 msgstr "Місяць"
@@ -305,16 +306,16 @@ msgstr "Місяць"
 msgid "On a weekday"
 msgstr "кожен день тижня"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 #, fuzzy
 msgid "Weekday:"
 msgstr "День тижня"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr ""
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 #, fuzzy
 msgid "Minutes:"
 msgstr "_Хвилин:"
@@ -340,8 +341,8 @@ msgstr "День _тижня:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
 #, fuzzy
-msgid "A_bout"
-msgstr "_Про програму"
+msgid "_Manage tasks"
+msgstr "Керування системними завданнями"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -353,8 +354,8 @@ msgstr "_Довідка"
 
 #: ../src/gnome-schedule-applet.xml.h:4
 #, fuzzy
-msgid "_Manage tasks"
-msgstr "Керування системними завданнями"
+msgid "A_bout"
+msgstr "_Про програму"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -385,13 +386,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -438,71 +442,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Видалити виділений шаблон"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "Керування системними завданнями"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Виберіть користувача, чиє завдання треба змінити</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "_Шаблон"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Виберіть тип запланованого завдання</b>"
+msgid "Edit the selected template"
+msgstr "Видалити виділений шаблон"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Попередній перегляд</b>"
+msgid "Delete the selected template"
+msgstr "Видалити виділений шаблон"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Планувальник для Gnome"
+msgid "Task description:"
+msgstr "_Опис:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Додавання запланованого завдання"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Про цю програму"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
+msgid "Execute at:"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Додатково"
+#, fuzzy
+msgid "Date:"
+msgstr "_Дата:"
+
+#: ../src/gnome-schedule.glade.h:12
+#, fuzzy
+msgid "Time:"
+msgstr "Заголовок"
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Змінити користувача"
+#, fuzzy
+msgid "Task:"
+msgstr "_Завдання"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
+msgid "Add as template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Правка запланованого завдання"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Виберіть користувача, чиє завдання треба змінити"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -511,76 +531,55 @@ msgid "Command:"
 msgstr "_Команда:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Налаштовування запланованих завдань"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Видалити виділений шаблон"
+msgid "Description:"
+msgstr "_Опис:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "_Шаблон"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Дата:"
+msgid "Advanced"
+msgstr "Додатково"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Видалити завдання"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Видалити виділений шаблон"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "_Опис:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Правка запланованого завдання"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Правка запланованого завдання"
+msgid "<big>Preview</big>"
+msgstr "<b>Попередній перегляд</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Видалити виділений шаблон"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Змінити користувача"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Виберіть користувача, чиє завдання треба змінити</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Виконання у вказану хвилину, годину, день, день тижня чи місяць."
+msgid "_User:"
+msgstr "_Користувач:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Виконання з певним періодом. Наприклад кожні п'ять хвилин, годин, днів, днів "
-"тижня чи місяців."
+msgid "Add a Scheduled Task"
+msgstr "Додавання запланованого завдання"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Виконання кожну хвилину, годину, день, день тижня чи місяць."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Виберіть тип запланованого завдання</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Виконання у часовому проміжку."
+msgid "Time expression help"
+msgstr "Довідка з часового виразу"
 
 #: ../src/gnome-schedule.glade.h:38
 #, fuzzy
@@ -588,87 +587,94 @@ msgid "Expression:"
 msgstr "Інший вираз"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:43
 #, fuzzy
-msgid "Manage templates"
-msgstr "Керування системними завданнями"
-
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
+msgid "See \"man 5 crontab\" for information about the crontab format."
 msgstr ""
+"Додаткову інформацію про формат crontab можна переглянути виконавши \"man 5 "
+"crontab\"."
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Виберіть завдання"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Виконання у вказану хвилину, годину, день, день тижня чи місяць."
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Заплановані та активні завдання"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Виконання у часовому проміжку."
+
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Виконання кожну хвилину, годину, день, день тижня чи місяць."
 
 #: ../src/gnome-schedule.glade.h:51
-#, fuzzy
-msgid "See \"man 5 crontab\" for information about the crontab format."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
 msgstr ""
-"Додаткову інформацію про формат crontab можна переглянути виконавши \"man 5 "
-"crontab\"."
+"Виконання з певним періодом. Наприклад кожні п'ять хвилин, годин, днів, днів "
+"тижня чи місяців."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Показати довідку"
+msgid "Configure Scheduled Tasks"
+msgstr "Налаштовування запланованих завдань"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "_Опис:"
+msgid "Edit a scheduled task"
+msgstr "Правка запланованого завдання"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Завдання"
+msgid "Delete a scheduled task"
+msgstr "Видалити завдання"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Шаблон"
+msgid "Run selected task"
+msgstr "Виберіть завдання"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Довідка з часового виразу"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
 #, fuzzy
-msgid "Time:"
-msgstr "Заголовок"
+msgid "Templates"
+msgstr "_Шаблон"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
+msgid "Change edit mode"
 msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Про цю програму"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Виберіть користувача, чиє завдання треба змінити"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Показати довідку"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Користувач:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Планувальник для Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Заплановані та активні завдання"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1134,23 +1140,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "Неправильний запис! Можлива проблема: %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/vi.po b/po/vi.po
index f3fe394..8e6fc42 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule Gnome HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-01-15 18:13+1030\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
@@ -18,57 +18,64 @@ msgstr ""
 "X-Generator: LocFactoryEditor 1.6b23\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "Quản lý các tác vụ hệ thống của bạn"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "Thêm tác vụ đã lập lịch"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "Cấu hình các tác vụ đã lập lịch của bạn"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "Quản lý các tác vụ hệ thống của bạn"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Lịch biểu Gnome"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "Cấu hình các tác vụ đã lập lịch của bạn"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "Công cụ hệ thống"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "Và o %(date)s lúc %(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "Một lần"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "Cảnh báo : không thể phân tách một dòng trong dữ liệu xuất của atq"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "Không tên"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "Phút"
@@ -89,7 +96,7 @@ msgstr "Tháng"
 msgid "Weekday"
 msgstr "Ngà y tuần"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "Cơ bản"
 
@@ -108,52 +115,47 @@ msgstr "Phải có từ %(min)s đến %(max)s"
 msgid "%s is not a number"
 msgstr "%s không phải là con số"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "Không tên"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "Lặp"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "phút"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "giờ"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "ngà y"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "tháng"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "ngà y tuần"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "Mỗi phút"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "Mỗi giờ"
 
@@ -171,21 +173,21 @@ msgstr "Mỗi tuần"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "Tạo tác vụ đã lập lịch mới"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "_Mẫu :"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "Th_êm tác vụ"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "Sửa đổi tác vụ đã lập lịch"
 
@@ -217,11 +219,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -259,11 +261,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "Đây không phải là hợp lệ. Lý do: %s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "Và o một phút chính xác"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "Phút:"
 
@@ -272,7 +274,7 @@ msgstr "Phút:"
 msgid "At an exact hour"
 msgstr "Và o một giờ chính xác"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "Giờ :"
 
@@ -281,7 +283,7 @@ msgstr "Giờ :"
 msgid "On a day"
 msgstr "Và o một ngà y chính xác"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "Ngà y:"
 
@@ -290,7 +292,7 @@ msgstr "Ngà y:"
 msgid "In a month"
 msgstr "Trong một tháng chính xác"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "Tháng:"
 
@@ -299,15 +301,15 @@ msgstr "Tháng:"
 msgid "On a weekday"
 msgstr "Và o một ngà y tuần chính xác"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "Ngà y tuần:"
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "Trong rá»™ng bÆ°á»›c"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "Phút:"
 
@@ -328,8 +330,8 @@ msgid "Weekdays:"
 msgstr "Ngà y tuần:"
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "_Giới thiệu"
+msgid "_Manage tasks"
+msgstr "_Quản lý tác vụ"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -340,8 +342,8 @@ msgid "_Help"
 msgstr "Trợ _giúp"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "_Quản lý tác vụ"
+msgid "A_bout"
+msgstr "_Giới thiệu"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -372,13 +374,15 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -425,72 +429,86 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "Xóa bỏ biểu mẫu đã chọn"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "_Quản lý tác vụ"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>Chọn người dùng sở hữu những tác vụ bạn muốn sửa đổi</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "Th_êm tác vụ"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>Chọn kiểu tác vụ đã lập lịch</b>"
+msgid "Edit the selected template"
+msgstr "Xóa bỏ biểu mẫu đã chọn"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>Xem thá»­</b>"
+msgid "Delete the selected template"
+msgstr "Xóa bỏ biểu mẫu đã chọn"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "Giới thiệu Lịch biểu Gnome"
+msgid "Task description:"
+msgstr "_Mô tả:"
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "Thêm tác vụ đã lập lịch"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "Giới thiệu ứng dụng nà y"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "Th_êm tác vụ"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "Cấp cao"
+#, fuzzy
+msgid "Date:"
+msgstr "_Ngà y:"
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "Chuyển đổi người dùng"
+#, fuzzy
+msgid "Task:"
+msgstr "_Tác vụ"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "Th_êm tác vụ"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "Sửa đổi tác vụ đã lập lịch"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "Chọn người dùng sở hữu những tác vụ bạn muốn sửa đổi"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -499,159 +517,146 @@ msgid "Command:"
 msgstr "_Lệnh:"
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "Cấu hình tác vụ đã lập lịch"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "Xóa bỏ biểu mẫu đã chọn"
+msgid "Description:"
+msgstr "_Mô tả:"
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "Th_êm tác vụ"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "_Ngà y:"
+msgid "Advanced"
+msgstr "Cấp cao"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "Xoá bỏ tác vụ đã lập lịch"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "Xóa bỏ biểu mẫu đã chọn"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "_Mô tả:"
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "Sửa đổi tác vụ đã lập lịch"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "Sửa đổi tác vụ đã lập lịch"
+msgid "<big>Preview</big>"
+msgstr "<b>Xem thá»­</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "Xóa bỏ biểu mẫu đã chọn"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "Chuyển đổi người dùng"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>Chọn người dùng sở hữu những tác vụ bạn muốn sửa đổi</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "Thực hiện và o phút, giờ, ngà y, ngà y tuần hay tháng chính xác."
+msgid "_User:"
+msgstr "_Người dùng:"
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr ""
-"Thực hiện tại rộng bước. Lấy thí dụ, mỗi năm phút, giờ, ngà y, ngà y tuần hay "
-"tháng."
+msgid "Add a Scheduled Task"
+msgstr "Thêm tác vụ đã lập lịch"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "Thực hiện và o mỗi phút, giờ, ngà y, ngà y tuần hay tháng."
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>Chọn kiểu tác vụ đã lập lịch</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "Thực hiện trong phạm vi"
+msgid "Time expression help"
+msgstr "Trợ giúp về biểu thức thời gian"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "Biểu thức:"
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "Đến:"
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "Từ :"
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "Trong phạm vi"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "Khác"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "_Quản lý tác vụ"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "Xem « man 5 crontab » để tìm thông tin về khuôn dạng crontab."
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "Khác"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "Thực hiện và o phút, giờ, ngà y, ngà y tuần hay tháng chính xác."
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "Hãy chọn một tác vụ"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "Trong phạm vi"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "Thực hiện trong phạm vi"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "Tác vụ đã lập lịch và hoạt động"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "Thực hiện và o mỗi phút, giờ, ngà y, ngà y tuần hay tháng."
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "Xem « man 5 crontab » để tìm thông tin về khuôn dạng crontab."
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr ""
+"Thực hiện tại rộng bước. Lấy thí dụ, mỗi năm phút, giờ, ngà y, ngà y tuần hay "
+"tháng."
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "Hiện trợ giúp"
+msgid "Configure Scheduled Tasks"
+msgstr "Cấu hình tác vụ đã lập lịch"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "_Mô tả:"
+msgid "Edit a scheduled task"
+msgstr "Sửa đổi tác vụ đã lập lịch"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "_Tác vụ"
+msgid "Delete a scheduled task"
+msgstr "Xoá bỏ tác vụ đã lập lịch"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "_Mẫu :"
+msgid "Run selected task"
+msgstr "Hãy chọn một tác vụ"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "Trợ giúp về biểu thức thời gian"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "_Mẫu :"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "Đến:"
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "Giới thiệu ứng dụng nà y"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "Chọn người dùng sở hữu những tác vụ bạn muốn sửa đổi"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "Hiện trợ giúp"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "_Người dùng:"
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "Giới thiệu Lịch biểu Gnome"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "Tác vụ đã lập lịch và hoạt động"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1128,25 +1133,25 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr ""
 "• Đây là mục ghi không hợp lệ. •\n"
 "Có lé vấn đề là : %s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b9193de..9e46bed 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2010-07-31 09:25+0800\n"
 "Last-Translator: du baodao <centerpoint 139 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "管理您的系统任务"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 msgid "Scheduled tasks"
 msgstr "安排好的任务"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "配置安排好的任务"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "管理您的系统任务"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "Gnome 计划任务"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "配置安排好的任务"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "系统工具"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr "创建数据文件夹失败！请确认 ~/.gnome 和 ~/.gnome/gnome-schedule 可写。"
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
@@ -51,24 +51,31 @@ msgid ""
 msgstr ""
 "创建数据文件夹失败：%s。请确认 ~/.gnome 和 ~/.gnome/gnome-schedule 可写。"
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr "警告！未知的任务： %(preview)s"
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, python-format
 msgid "On %(timestring)s"
 msgstr "在 %(timestring)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "一次"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "警告：在 atq 的输出中的一行没有处理"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "æ— æ ‡é¢˜"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "分钟"
@@ -89,7 +96,7 @@ msgstr "月"
 msgid "Weekday"
 msgstr "星期"
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "基本"
 
@@ -108,52 +115,47 @@ msgstr "必须在 %(min)s 和 %(max)s 之间"
 msgid "%s is not a number"
 msgstr "%s 不是一个数字"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "æ— æ ‡é¢˜"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "反复"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr "在重启时"
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "分"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "小时"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "æ—¥"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "月"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr "星期"
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr "处理日期域失败，可能是 crontab 的缺陷所致。"
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "每分钟"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "每小时"
 
@@ -171,19 +173,19 @@ msgstr "每星期"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "创建新的计划任务"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 msgid "Edit template"
 msgstr "编辑模板"
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 msgid "New template"
 msgstr "新模板"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "编辑计划任务"
 
@@ -219,11 +221,11 @@ msgstr ""
 "\n"
 "重复执行的任务会从家目录运行"
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr "不再显示"
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr "警告：执行任务的工作目录"
 
@@ -257,11 +259,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "è¿™æ˜¯æ— æ•ˆçš„ã€‚åŽŸå› ï¼š%s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "在确切的分钟"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "分钟："
 
@@ -270,7 +272,7 @@ msgstr "分钟："
 msgid "At an exact hour"
 msgstr "在确切的小时"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "小时："
 
@@ -279,7 +281,7 @@ msgstr "小时："
 msgid "On a day"
 msgstr "在一天"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "天："
 
@@ -288,7 +290,7 @@ msgstr "天："
 msgid "In a month"
 msgstr "在一个月里"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "月："
 
@@ -297,15 +299,15 @@ msgstr "月："
 msgid "On a weekday"
 msgstr "在一个星期"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "星期："
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "在一段时间间隔"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "分钟："
 
@@ -326,8 +328,8 @@ msgid "Weekdays:"
 msgstr "星期："
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "关于(_A)"
+msgid "_Manage tasks"
+msgstr "管理任务(_M)"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -338,8 +340,8 @@ msgid "_Help"
 msgstr "帮助(_H)"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "管理任务(_M)"
+msgid "A_bout"
+msgstr "关于(_A)"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -370,13 +372,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -423,68 +428,76 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
-msgstr "*"
+msgid "Choose template"
+msgstr "选择模板"
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr "0"
+msgid "Create a new task from the selected template"
+msgstr "从选择的模板创建新任务"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ":"
+msgid "Manage templates"
+msgstr "管理模板"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>é€‰æ‹©ä½ æƒ³ä¿®æ”¹å“ªä¸ªç”¨æˆ·çš„ä»»åŠ¡</b>"
+msgid "Create a new template."
+msgstr "创建新模板。"
 
 #: ../src/gnome-schedule.glade.h:5
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>选择计划任务类型</b>"
+msgid "Edit the selected template"
+msgstr "编辑选定的模板"
 
 #: ../src/gnome-schedule.glade.h:6
-msgid "<big>Preview</big>"
-msgstr "<b>预览</b>"
+msgid "Delete the selected template"
+msgstr "åˆ é™¤é€‰å®šçš„æ¨¡æ¿"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr "<big>时间 &amp; 日期</big>"
-
-#: ../src/gnome-schedule.glade.h:8
-msgid "About Gnome-schedule"
-msgstr "关于 Gnome 计划任务"
+msgid "Task description:"
+msgstr "任务描述："
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "æ·»åŠ è®¡åˆ’ä»»åŠ¡"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+msgid "X application"
+msgstr "X 应用程序"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-msgid "Add as template"
-msgstr "æ·»åŠ ä¸ºæ¨¡æ¿"
+msgid "Execute at:"
+msgstr "执行在："
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "高级"
+msgid "Date:"
+msgstr "日期："
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr "时间："
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ":"
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "改变用户"
+msgid "Task:"
+msgstr "任务："
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr "改变编辑模式"
+msgid "Add as template"
+msgstr "æ·»åŠ ä¸ºæ¨¡æ¿"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr "选择模板"
+msgid "Edit a periodical task"
+msgstr "编辑周期性的任务"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "é€‰æ‹©ä½ æƒ³ä¿®æ”¹å“ªä¸ªç”¨æˆ·çš„ä»»åŠ¡"
+msgid "ls -l"
+msgstr "ls -l"
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -492,144 +505,138 @@ msgid "Command:"
 msgstr "命令："
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "配置计划任务"
+msgid "Description:"
+msgstr "描述："
 
 #: ../src/gnome-schedule.glade.h:20
-msgid "Create a new task from the selected template"
-msgstr "从选择的模板创建新任务"
-
-#: ../src/gnome-schedule.glade.h:21
-msgid "Create a new template."
-msgstr "创建新模板。"
+msgid "<big>Time &amp; Date</big>"
+msgstr "<big>时间 &amp; 日期</big>"
 
 #: ../src/gnome-schedule.glade.h:22
-msgid "Date:"
-msgstr "日期："
+msgid "Advanced"
+msgstr "高级"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "åˆ é™¤è®¡åˆ’ä»»åŠ¡"
+msgid "0"
+msgstr "0"
 
 #: ../src/gnome-schedule.glade.h:25
-msgid "Delete the selected template"
-msgstr "åˆ é™¤é€‰å®šçš„æ¨¡æ¿"
-
-#: ../src/gnome-schedule.glade.h:26
-msgid "Description:"
-msgstr "描述："
-
-#: ../src/gnome-schedule.glade.h:27
-msgid "Edit a periodical task"
-msgstr "编辑周期性的任务"
+msgid "*"
+msgstr "*"
 
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "编辑计划任务"
+#: ../src/gnome-schedule.glade.h:31
+msgid "<big>Preview</big>"
+msgstr "<b>预览</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-msgid "Edit the selected template"
-msgstr "编辑选定的模板"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "改变用户"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr "执行在："
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>é€‰æ‹©ä½ æƒ³ä¿®æ”¹å“ªä¸ªç”¨æˆ·çš„ä»»åŠ¡</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "运行在特定的分钟，小时，天，星期，或者月。"
+msgid "_User:"
+msgstr "用户(_U)："
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr "运行在一个间隔。比如每五分钟，小时，天，星期或者月。"
+msgid "Add a Scheduled Task"
+msgstr "æ·»åŠ è®¡åˆ’ä»»åŠ¡"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "运行在每分钟，小时，天，星期，或月。"
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>选择计划任务类型</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "在一个范围执行"
+msgid "Time expression help"
+msgstr "时间表达式帮助"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "表达式："
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "到："
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "从："
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "在一个范围"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "其他"
 
 #: ../src/gnome-schedule.glade.h:43
-msgid "Manage templates"
-msgstr "管理模板"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "查看“man 5 crontab”了解更多关于 crontab æ ¼å¼çš„ä¿¡æ¯ã€‚"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "其他"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "运行在特定的分钟，小时，天，星期，或者月。"
 
-#: ../src/gnome-schedule.glade.h:48
-msgid "Run selected task"
-msgstr "运行选定的任务"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "在一个范围"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr "运行任务"
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "在一个范围执行"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "安排好的和活动的任务"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "运行在每分钟，小时，天，星期，或月。"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "查看“man 5 crontab”了解更多关于 crontab æ ¼å¼çš„ä¿¡æ¯ã€‚"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr "运行在一个间隔。比如每五分钟，小时，天，星期或者月。"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "显示帮助"
+msgid "Configure Scheduled Tasks"
+msgstr "配置计划任务"
 
 #: ../src/gnome-schedule.glade.h:53
-msgid "Task description:"
-msgstr "任务描述："
+msgid "Edit a scheduled task"
+msgstr "编辑计划任务"
 
 #: ../src/gnome-schedule.glade.h:54
-msgid "Task:"
-msgstr "任务："
+msgid "Delete a scheduled task"
+msgstr "åˆ é™¤è®¡åˆ’ä»»åŠ¡"
 
 #: ../src/gnome-schedule.glade.h:55
-msgid "Templates"
-msgstr "模板"
+msgid "Run selected task"
+msgstr "运行选定的任务"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "时间表达式帮助"
+msgid "Run task"
+msgstr "运行任务"
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr "时间："
+msgid "Templates"
+msgstr "模板"
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "到："
+msgid "Change edit mode"
+msgstr "改变编辑模式"
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-msgid "X application"
-msgstr "X 应用程序"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "é€‰æ‹©ä½ æƒ³ä¿®æ”¹å“ªä¸ªç”¨æˆ·çš„ä»»åŠ¡"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "显示帮助"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "用户(_U)："
+msgid "About Gnome-schedule"
+msgstr "关于 Gnome 计划任务"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr "ls -l"
+msgid "Scheduled and active tasks"
+msgstr "安排好的和活动的任务"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1091,11 +1098,11 @@ msgstr "运行一次的任务"
 msgid "A task from a predefined template"
 msgstr "来自周期性模板的任务"
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr "日历"
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
@@ -1104,12 +1111,12 @@ msgstr ""
 "在小时和分钟的一个或全部域中输入了字母，或者超出范围的数字。请注意一小时有60"
 "分钟而一天有24小时。"
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "è¿™æ˜¯ä¸€æ¡æ— æ•ˆçš„è®°å½•ï¼é—®é¢˜å¯èƒ½æ˜¯ï¼š%s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 95a8848..b83c5dc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-06-23 01:25+0800\n"
 "Last-Translator: Kevin Tse <kevinkit netvigator com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n linux org tw>\n"
@@ -17,57 +17,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "管理系統工作排程"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "設定已安排的工作"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "管理系統工作排程"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "GNOME 工作排程"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "設定已安排的工作"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "系統工具"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "在%(date)s%(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "一次"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "警告：無法解析其中一行 atq 的輸出結果"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "無標題"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "分鐘"
@@ -88,7 +95,7 @@ msgstr "月"
 msgid "Weekday"
 msgstr ""
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "基本"
 
@@ -107,52 +114,47 @@ msgstr "å¿…é ˆåœ¨ %(min)s å’Œ %(max)s 之內"
 msgid "%s is not a number"
 msgstr "%s 不是一個數字"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "無標題"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "循環"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "分鐘"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "小時"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "æ—¥"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "月"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr ""
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "每分鐘"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "每小時"
 
@@ -170,21 +172,21 @@ msgstr "每週"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "æ–°å»ºä¸€é …å·¥ä½œ"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "模板(_T)："
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
@@ -213,11 +215,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -255,11 +257,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "é€™æ˜¯ç„¡æ•ˆçš„ã€‚åŽŸå› ï¼š%s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "在確切的某分鐘"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "分鐘："
 
@@ -268,7 +270,7 @@ msgstr "分鐘："
 msgid "At an exact hour"
 msgstr "在確切的某小時"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "小時："
 
@@ -277,7 +279,7 @@ msgstr "小時："
 msgid "On a day"
 msgstr "在一個月的某一日"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "日："
 
@@ -286,7 +288,7 @@ msgstr "日："
 msgid "In a month"
 msgstr "在某個月"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "月份："
 
@@ -295,15 +297,15 @@ msgstr "月份："
 msgid "On a weekday"
 msgstr "在一星期的某一日"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "星期："
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "每隔一段時間"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "分鐘："
 
@@ -324,8 +326,8 @@ msgid "Weekdays:"
 msgstr "星期："
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "關於(_B)"
+msgid "_Manage tasks"
+msgstr "管理工作(_M)"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -336,8 +338,8 @@ msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "管理工作(_M)"
+msgid "A_bout"
+msgstr "關於(_B)"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -368,13 +370,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -421,72 +426,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "管理工作(_M)"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>è«‹é¸æ“‡ä½ æƒ³æ›´æ”¹å“ªå€‹ç”¨æˆ¶çš„å·¥ä½œ</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>選擇已安排的工作之類型</b>"
+msgid "Edit the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>é è¦½</b>"
+msgid "Delete the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "關於 GNOME 工作排程"
+msgid "Task description:"
+msgstr "描述(_R)："
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "關於這個應用程式"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "進階"
+#, fuzzy
+msgid "Date:"
+msgstr "日期(_D)："
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "更改用戶"
+#, fuzzy
+msgid "Task:"
+msgstr "工作(_T)"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "è«‹é¸æ“‡ä½ æƒ³æ›´æ”¹å“ªå€‹ç”¨æˆ¶çš„å·¥ä½œ"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -495,157 +515,144 @@ msgid "Command:"
 msgstr "指令(_M)："
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "設定已安排的工作"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "刪除已選取的模板"
+msgid "Description:"
+msgstr "描述(_R)："
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "日期(_D)："
+msgid "Advanced"
+msgstr "進階"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "åˆªé™¤ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "刪除已選取的模板"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "描述(_R)："
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
+msgid "<big>Preview</big>"
+msgstr "<b>é è¦½</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "刪除已選取的模板"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "更改用戶"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>è«‹é¸æ“‡ä½ æƒ³æ›´æ”¹å“ªå€‹ç”¨æˆ¶çš„å·¥ä½œ</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "在每一個特定的分鐘、小時、日期、星期或月裏執行。"
+msgid "_User:"
+msgstr "用戶(_U)："
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr "每隔一段時間執行，例如每五分鐘、五小時、五個星期或五個月。"
+msgid "Add a Scheduled Task"
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "每分鐘、每小時、每天、每個星期或每個月執行。"
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>選擇已安排的工作之類型</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "在一個範圍的時間裏執行。"
+msgid "Time expression help"
+msgstr "時間顯示方式之說明"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "顯示方式："
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "至："
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "由："
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "在一個範圍內"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "其它"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "管理工作(_M)"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "如欲得知有關 crontab æ ¼å¼çš„è³‡æ–™ï¼Œè«‹åŸ·è¡Œ \"man 5 crontab\" 指令。"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "其它"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "在每一個特定的分鐘、小時、日期、星期或月裏執行。"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "è«‹é¸å–ä¸€é …å·¥ä½œ"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "在一個範圍內"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "在一個範圍的時間裏執行。"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "已安排及現行的工作"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "每分鐘、每小時、每天、每個星期或每個月執行。"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "如欲得知有關 crontab æ ¼å¼çš„è³‡æ–™ï¼Œè«‹åŸ·è¡Œ \"man 5 crontab\" 指令。"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr "每隔一段時間執行，例如每五分鐘、五小時、五個星期或五個月。"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "顯示說明文件"
+msgid "Configure Scheduled Tasks"
+msgstr "設定已安排的工作"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "描述(_R)："
+msgid "Edit a scheduled task"
+msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "工作(_T)"
+msgid "Delete a scheduled task"
+msgstr "åˆªé™¤ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "模板(_T)："
+msgid "Run selected task"
+msgstr "è«‹é¸å–ä¸€é …å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "時間顯示方式之說明"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "模板(_T)："
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "至："
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "關於這個應用程式"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "è«‹é¸æ“‡ä½ æƒ³æ›´æ”¹å“ªå€‹ç”¨æˆ¶çš„å·¥ä½œ"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "顯示說明文件"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "用戶(_U)："
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "關於 GNOME 工作排程"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "已安排及現行的工作"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1110,23 +1117,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "é€™é …ç´€éŒ„ç„¡æ•ˆï¼é€™å€‹å•é¡Œå¯èƒ½æ˜¯ï¼š%s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c2b54fb..04f358e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-schedule HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-23 16:15+0200\n"
+"POT-Creation-Date: 2013-03-01 17:05+0100\n"
 "PO-Revision-Date: 2006-06-23 01:20+0800\n"
 "Last-Translator: Kevin Tse <kevinkit netvigator com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n linux org tw>\n"
@@ -17,57 +17,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../desktop/gnome-schedule.desktop.in.in.h:1
-msgid "Manage your system tasks"
-msgstr "管理系統工作排程"
-
-#: ../desktop/gnome-schedule.desktop.in.in.h:2
 #, fuzzy
 msgid "Scheduled tasks"
 msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
-msgid "Configures your scheduled tasks"
-msgstr "設定已安排的工作"
+#: ../desktop/gnome-schedule.desktop.in.in.h:2
+msgid "Manage your system tasks"
+msgstr "管理系統工作排程"
 
-#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:1
 msgid "Gnome schedule"
 msgstr "GNOME 工作排程"
 
+#: ../servers/GNOME_GnomeSchedule.server.in.in.h:2
+msgid "Configures your scheduled tasks"
+msgstr "設定已安排的工作"
+
 #: ../servers/GNOME_GnomeSchedule.server.in.in.h:3
 msgid "System tools"
 msgstr "系統工具"
 
-#: ../src/at.py:91 ../src/crontab.py:62
+#: ../src/at.py:112 ../src/crontab.py:62
 msgid ""
 "Failed to create data dir! Make sure ~/.gnome and ~/.gnome/gnome-schedule "
 "are writable."
 msgstr ""
 
-#: ../src/at.py:124 ../src/crontab.py:162
+#: ../src/at.py:145 ../src/crontab.py:162
 #, python-format
 msgid ""
 "Failed to create data dir: %s. Make sure ~/.gnome and ~/.gnome/gnome-"
 "schedule are writable."
 msgstr ""
 
-#: ../src/at.py:512
+#: ../src/at.py:547
 #, python-format
 msgid "Warning! Unknown task: %(preview)s"
 msgstr ""
 
-#: ../src/at.py:519
+#: ../src/at.py:554
 #, fuzzy, python-format
 msgid "On %(timestring)s"
 msgstr "在%(date)s%(time)s"
 
-#: ../src/at.py:525 ../src/at.py:530
+#: ../src/at.py:560 ../src/at.py:565
 msgid "Once"
 msgstr "一次"
 
-#: ../src/at.py:534
-msgid "Warning: a line in atq's output didn't parse"
+#: ../src/at.py:569
+#, fuzzy
+msgid "Warning: a line in atq's output didn't parse:"
 msgstr "警告：無法解析其中一行 atq 的輸出結果"
 
+#: ../src/at.py:624 ../src/crontab.py:288 ../src/crontab.py:334
+#: ../src/crontabEditor.py:275 ../src/atEditor.py:127 ../src/atEditor.py:523
+#: ../src/atEditor.py:549
+msgid "Untitled"
+msgstr "無標題"
+
 #: ../src/crontab.py:87
 msgid "Minute"
 msgstr "分鐘"
@@ -88,7 +95,7 @@ msgstr "月"
 msgid "Weekday"
 msgstr ""
 
-#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:13
+#: ../src/crontab.py:192 ../src/gnome-schedule.glade.h:23
 msgid "Basic"
 msgstr "基本"
 
@@ -107,52 +114,47 @@ msgstr "å¿…é ˆåœ¨ %(min)s å’Œ %(max)s 之內"
 msgid "%s is not a number"
 msgstr "%s 不是一個數字"
 
-#: ../src/crontab.py:288 ../src/crontab.py:334 ../src/crontabEditor.py:275
-#: ../src/atEditor.py:123 ../src/atEditor.py:519 ../src/atEditor.py:545
-msgid "Untitled"
-msgstr "無標題"
-
-#: ../src/crontab.py:450 ../src/crontab.py:452 ../src/template_chooser.py:106
+#: ../src/crontab.py:455 ../src/crontab.py:457 ../src/template_chooser.py:106
 #: ../src/template_manager.py:111
 msgid "Recurrent"
 msgstr "循環"
 
-#: ../src/crontab.py:450 ../src/crontabEditor.py:74 ../src/lang.py:168
+#: ../src/crontab.py:455 ../src/crontabEditor.py:74 ../src/lang.py:168
 msgid "At reboot"
 msgstr ""
 
-#: ../src/crontab.py:464
+#: ../src/crontab.py:469
 msgid "minute"
 msgstr "分鐘"
 
-#: ../src/crontab.py:466
+#: ../src/crontab.py:471
 msgid "hour"
 msgstr "小時"
 
-#: ../src/crontab.py:468
+#: ../src/crontab.py:473
 msgid "day"
 msgstr "æ—¥"
 
-#: ../src/crontab.py:470
+#: ../src/crontab.py:475
 msgid "month"
 msgstr "月"
 
-#: ../src/crontab.py:472
+#: ../src/crontab.py:477
 msgid "weekday"
 msgstr ""
 
-#: ../src/crontab.py:571
+#: ../src/crontab.py:576
 msgid ""
 "Failed to parse the Day of Month field, possibly due to a bug in crontab."
 msgstr ""
 
 #: ../src/crontabEditor.py:69 ../src/crontabEditorHelper.py:87
-#: ../src/gnome-schedule.glade.h:31
+#: ../src/gnome-schedule.glade.h:48
 msgid "Every minute"
 msgstr "每分鐘"
 
 #: ../src/crontabEditor.py:70 ../src/crontabEditorHelper.py:93
-#: ../src/gnome-schedule.glade.h:30
+#: ../src/gnome-schedule.glade.h:21
 msgid "Every hour"
 msgstr "每小時"
 
@@ -170,21 +172,21 @@ msgstr "每週"
 
 #. add new task
 #: ../src/crontabEditor.py:131 ../src/crontabEditor.py:142
-#: ../src/atEditor.py:125 ../src/atEditor.py:144
+#: ../src/atEditor.py:129 ../src/atEditor.py:148
 msgid "Create a New Scheduled Task"
 msgstr "æ–°å»ºä¸€é …å·¥ä½œ"
 
-#: ../src/crontabEditor.py:198 ../src/atEditor.py:162
+#: ../src/crontabEditor.py:198 ../src/atEditor.py:166
 #, fuzzy
 msgid "Edit template"
 msgstr "模板(_T)："
 
-#: ../src/crontabEditor.py:223 ../src/atEditor.py:184
+#: ../src/crontabEditor.py:223 ../src/atEditor.py:188
 #, fuzzy
 msgid "New template"
 msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
-#: ../src/crontabEditor.py:249 ../src/atEditor.py:226
+#: ../src/crontabEditor.py:249 ../src/atEditor.py:230
 msgid "Edit a Scheduled Task"
 msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
@@ -213,11 +215,11 @@ msgid ""
 "Recurrent tasks will be run from the home directory."
 msgstr ""
 
-#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:593
+#: ../src/crontabEditor.py:457 ../src/mainWindow.py:666 ../src/atEditor.py:597
 msgid "_Don't show again"
 msgstr ""
 
-#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:594
+#: ../src/crontabEditor.py:458 ../src/mainWindow.py:667 ../src/atEditor.py:598
 msgid "Warning: Working directory of executed tasks"
 msgstr ""
 
@@ -255,11 +257,11 @@ msgid "This is invalid. Reason: %s"
 msgstr "é€™æ˜¯ç„¡æ•ˆçš„ã€‚åŽŸå› ï¼š%s"
 
 #. minute
-#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:12
+#: ../src/crontabEditorHelper.py:231 ../src/gnome-schedule.glade.h:44
 msgid "At an exact minute"
 msgstr "在確切的某分鐘"
 
-#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:44
+#: ../src/crontabEditorHelper.py:232 ../src/gnome-schedule.glade.h:28
 msgid "Minute:"
 msgstr "分鐘："
 
@@ -268,7 +270,7 @@ msgstr "分鐘："
 msgid "At an exact hour"
 msgstr "在確切的某小時"
 
-#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:40
+#: ../src/crontabEditorHelper.py:236 ../src/gnome-schedule.glade.h:27
 msgid "Hour:"
 msgstr "小時："
 
@@ -277,7 +279,7 @@ msgstr "小時："
 msgid "On a day"
 msgstr "在一個月的某一日"
 
-#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:23
+#: ../src/crontabEditorHelper.py:240 ../src/gnome-schedule.glade.h:26
 msgid "Day:"
 msgstr "日："
 
@@ -286,7 +288,7 @@ msgstr "日："
 msgid "In a month"
 msgstr "在某個月"
 
-#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:46
+#: ../src/crontabEditorHelper.py:244 ../src/gnome-schedule.glade.h:29
 msgid "Month:"
 msgstr "月份："
 
@@ -295,15 +297,15 @@ msgstr "月份："
 msgid "On a weekday"
 msgstr "在一星期的某一日"
 
-#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:59
+#: ../src/crontabEditorHelper.py:248 ../src/gnome-schedule.glade.h:30
 msgid "Weekday:"
 msgstr "星期："
 
-#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:42
+#: ../src/crontabEditorHelper.py:253 ../src/gnome-schedule.glade.h:50
 msgid "In a step width"
 msgstr "每隔一段時間"
 
-#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:45
+#: ../src/crontabEditorHelper.py:255 ../src/gnome-schedule.glade.h:41
 msgid "Minutes:"
 msgstr "分鐘："
 
@@ -324,8 +326,8 @@ msgid "Weekdays:"
 msgstr "星期："
 
 #: ../src/gnome-schedule-applet.xml.h:1
-msgid "A_bout"
-msgstr "關於(_B)"
+msgid "_Manage tasks"
+msgstr "管理工作(_M)"
 
 #: ../src/gnome-schedule-applet.xml.h:2
 msgid "_Add a task"
@@ -336,8 +338,8 @@ msgid "_Help"
 msgstr "求助(_H)"
 
 #: ../src/gnome-schedule-applet.xml.h:4
-msgid "_Manage tasks"
-msgstr "管理工作(_M)"
+msgid "A_bout"
+msgstr "關於(_B)"
 
 #: ../src/gnome-schedule-export.py:45
 #, fuzzy
@@ -368,13 +370,16 @@ msgid "Exporting crontab task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:103
-msgid "Exporting at task: "
+#, python-format
+msgid "Exporting at task: %s"
 msgstr ""
 
 #: ../src/gnome-schedule-export.py:113
 #, python-format
-msgid "Finished, exported: %d tasks total"
-msgstr ""
+msgid "Finished, exported: %d task total."
+msgid_plural "Finished, exported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule-import.py:63
 #, fuzzy
@@ -421,72 +426,87 @@ msgstr ""
 
 #: ../src/gnome-schedule-import.py:111
 #, python-format
-msgid "Finished, imported: %d tasks total."
-msgstr ""
+msgid "Finished, imported: %d task total."
+msgid_plural "Finished, imported: %d tasks total."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../src/gnome-schedule.glade.h:1
-msgid "*"
+msgid "Choose template"
 msgstr ""
 
 #: ../src/gnome-schedule.glade.h:2
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "Create a new task from the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:3
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "Manage templates"
+msgstr "管理工作(_M)"
 
 #: ../src/gnome-schedule.glade.h:4
-msgid "<b>Choose the user whose tasks you want to modify</b>"
-msgstr "<b>請選擇您想變更哪個用戶的工作</b>"
+#, fuzzy
+msgid "Create a new template."
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
 #: ../src/gnome-schedule.glade.h:5
 #, fuzzy
-msgid "<b>Select the type of the scheduled task:</b>"
-msgstr "<b>選擇已安排的工作之類型</b>"
+msgid "Edit the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:6
 #, fuzzy
-msgid "<big>Preview</big>"
-msgstr "<b>é è¦½</b>"
+msgid "Delete the selected template"
+msgstr "刪除已選取的模板"
 
 #: ../src/gnome-schedule.glade.h:7
-msgid "<big>Time &amp; Date</big>"
-msgstr ""
-
-#: ../src/gnome-schedule.glade.h:8
 #, fuzzy
-msgid "About Gnome-schedule"
-msgstr "關於 GNOME 工作排程"
+msgid "Task description:"
+msgstr "描述(_R)："
 
-#: ../src/gnome-schedule.glade.h:9
-msgid "Add a Scheduled Task"
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
+#: ../src/gnome-schedule.glade.h:8 ../src/mainWindow.py:73
+#: ../src/examples/dump.py:57
+#, fuzzy
+msgid "X application"
+msgstr "關於這個應用程式"
 
+#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:10
-#, fuzzy
-msgid "Add as template"
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
+msgid "Execute at:"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:11
-msgid "Advanced"
-msgstr "進階"
+#, fuzzy
+msgid "Date:"
+msgstr "日期(_D)："
+
+#: ../src/gnome-schedule.glade.h:12
+msgid "Time:"
+msgstr ""
+
+#: ../src/gnome-schedule.glade.h:13
+msgid ":"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:14
-msgid "Change User"
-msgstr "變更用戶"
+#, fuzzy
+msgid "Task:"
+msgstr "工作(_T)"
 
 #: ../src/gnome-schedule.glade.h:15
-msgid "Change edit mode"
-msgstr ""
+#, fuzzy
+msgid "Add as template"
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
 
 #: ../src/gnome-schedule.glade.h:16
-msgid "Choose template"
-msgstr ""
+#, fuzzy
+msgid "Edit a periodical task"
+msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:17
-msgid "Choose the user whose tasks you want to modify"
-msgstr "請選擇您想變更哪個用戶的工作"
+msgid "ls -l"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:18 ../src/template.py:198
 #: ../src/template.py:212
@@ -495,157 +515,144 @@ msgid "Command:"
 msgstr "指令(_M)："
 
 #: ../src/gnome-schedule.glade.h:19
-msgid "Configure Scheduled Tasks"
-msgstr "設定已安排的工作"
-
-#: ../src/gnome-schedule.glade.h:20
 #, fuzzy
-msgid "Create a new task from the selected template"
-msgstr "刪除已選取的模板"
+msgid "Description:"
+msgstr "描述(_R)："
 
-#: ../src/gnome-schedule.glade.h:21
-#, fuzzy
-msgid "Create a new template."
-msgstr "åŠ å…¥ä¸€é …å·¥ä½œ(_A)"
+#: ../src/gnome-schedule.glade.h:20
+msgid "<big>Time &amp; Date</big>"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:22
-#, fuzzy
-msgid "Date:"
-msgstr "日期(_D)："
+msgid "Advanced"
+msgstr "進階"
 
 #: ../src/gnome-schedule.glade.h:24
-msgid "Delete a scheduled task"
-msgstr "åˆªé™¤ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
+msgid "0"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:25
-#, fuzzy
-msgid "Delete the selected template"
-msgstr "刪除已選取的模板"
-
-#: ../src/gnome-schedule.glade.h:26
-#, fuzzy
-msgid "Description:"
-msgstr "描述(_R)："
+msgid "*"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:27
+#: ../src/gnome-schedule.glade.h:31
 #, fuzzy
-msgid "Edit a periodical task"
-msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
-
-#: ../src/gnome-schedule.glade.h:28
-msgid "Edit a scheduled task"
-msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
+msgid "<big>Preview</big>"
+msgstr "<b>é è¦½</b>"
 
-#: ../src/gnome-schedule.glade.h:29
-#, fuzzy
-msgid "Edit the selected template"
-msgstr "刪除已選取的模板"
+#: ../src/gnome-schedule.glade.h:32
+msgid "Change User"
+msgstr "變更用戶"
 
-#. This comes before the time and date input boxes in the One-time task editor
 #: ../src/gnome-schedule.glade.h:33
-msgid "Execute at:"
-msgstr ""
+msgid "<b>Choose the user whose tasks you want to modify</b>"
+msgstr "<b>請選擇您想變更哪個用戶的工作</b>"
 
 #: ../src/gnome-schedule.glade.h:34
-msgid "Execution at a specific minute, hour, day, weekday or month."
-msgstr "在每一個特定的分鐘、小時、日期、星期或月裡執行。"
+msgid "_User:"
+msgstr "用戶(_U)："
 
 #: ../src/gnome-schedule.glade.h:35
-msgid ""
-"Execution at a step width. For example every five minutes, hours, days, "
-"weekdays or months."
-msgstr "每隔一段時間執行，例如每五分鐘、五小時、五個星期或五個月。"
+msgid "Add a Scheduled Task"
+msgstr "åŠ å…¥ä¸€é …å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:36
-msgid "Execution at every minute, hour, day, weekday or month."
-msgstr "每分鐘、每小時、每天、每個星期或每個月執行。"
+#, fuzzy
+msgid "<b>Select the type of the scheduled task:</b>"
+msgstr "<b>選擇已安排的工作之類型</b>"
 
 #: ../src/gnome-schedule.glade.h:37
-msgid "Execution in a range."
-msgstr "在一個範圍的時間裡執行。"
+msgid "Time expression help"
+msgstr "時間顯示方式之說明"
 
 #: ../src/gnome-schedule.glade.h:38
 msgid "Expression:"
 msgstr "顯示方式："
 
 #: ../src/gnome-schedule.glade.h:39
+msgid "To:"
+msgstr "至："
+
+#: ../src/gnome-schedule.glade.h:40
 msgid "From:"
 msgstr "由："
 
-#: ../src/gnome-schedule.glade.h:41
-msgid "In a range"
-msgstr "在一個範圍內"
+#: ../src/gnome-schedule.glade.h:42
+msgid "Other"
+msgstr "其它"
 
 #: ../src/gnome-schedule.glade.h:43
-#, fuzzy
-msgid "Manage templates"
-msgstr "管理工作(_M)"
+msgid "See \"man 5 crontab\" for information about the crontab format."
+msgstr "如欲得知有關 crontab æ ¼å¼çš„è³‡æ–™ï¼Œè«‹åŸ·è¡Œ \"man 5 crontab\" 指令。"
 
-#: ../src/gnome-schedule.glade.h:47
-msgid "Other"
-msgstr "其它"
+#: ../src/gnome-schedule.glade.h:45
+msgid "Execution at a specific minute, hour, day, weekday or month."
+msgstr "在每一個特定的分鐘、小時、日期、星期或月裡執行。"
 
-#: ../src/gnome-schedule.glade.h:48
-#, fuzzy
-msgid "Run selected task"
-msgstr "è«‹é¸å–ä¸€é …å·¥ä½œ"
+#: ../src/gnome-schedule.glade.h:46
+msgid "In a range"
+msgstr "在一個範圍內"
 
-#: ../src/gnome-schedule.glade.h:49
-msgid "Run task"
-msgstr ""
+#: ../src/gnome-schedule.glade.h:47
+msgid "Execution in a range."
+msgstr "在一個範圍的時間裡執行。"
 
-#: ../src/gnome-schedule.glade.h:50
-msgid "Scheduled and active tasks"
-msgstr "已安排及現行的工作"
+#: ../src/gnome-schedule.glade.h:49
+msgid "Execution at every minute, hour, day, weekday or month."
+msgstr "每分鐘、每小時、每天、每個星期或每個月執行。"
 
 #: ../src/gnome-schedule.glade.h:51
-msgid "See \"man 5 crontab\" for information about the crontab format."
-msgstr "如欲得知有關 crontab æ ¼å¼çš„è³‡æ–™ï¼Œè«‹åŸ·è¡Œ \"man 5 crontab\" 指令。"
+msgid ""
+"Execution at a step width. For example every five minutes, hours, days, "
+"weekdays or months."
+msgstr "每隔一段時間執行，例如每五分鐘、五小時、五個星期或五個月。"
 
 #: ../src/gnome-schedule.glade.h:52
-msgid "Show help"
-msgstr "顯示說明文件"
+msgid "Configure Scheduled Tasks"
+msgstr "設定已安排的工作"
 
 #: ../src/gnome-schedule.glade.h:53
-#, fuzzy
-msgid "Task description:"
-msgstr "描述(_R)："
+msgid "Edit a scheduled task"
+msgstr "ç·¨è¼¯ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:54
-#, fuzzy
-msgid "Task:"
-msgstr "工作(_T)"
+msgid "Delete a scheduled task"
+msgstr "åˆªé™¤ä¸€é …å·²å®‰æŽ’çš„å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:55
 #, fuzzy
-msgid "Templates"
-msgstr "模板(_T)："
+msgid "Run selected task"
+msgstr "è«‹é¸å–ä¸€é …å·¥ä½œ"
 
 #: ../src/gnome-schedule.glade.h:56
-msgid "Time expression help"
-msgstr "時間顯示方式之說明"
+msgid "Run task"
+msgstr ""
 
 #: ../src/gnome-schedule.glade.h:57
-msgid "Time:"
-msgstr ""
+#, fuzzy
+msgid "Templates"
+msgstr "模板(_T)："
 
 #: ../src/gnome-schedule.glade.h:58
-msgid "To:"
-msgstr "至："
+msgid "Change edit mode"
+msgstr ""
 
-#: ../src/gnome-schedule.glade.h:60 ../src/mainWindow.py:73
-#: ../src/examples/dump.py:57
-#, fuzzy
-msgid "X application"
-msgstr "關於這個應用程式"
+#: ../src/gnome-schedule.glade.h:59
+msgid "Choose the user whose tasks you want to modify"
+msgstr "請選擇您想變更哪個用戶的工作"
+
+#: ../src/gnome-schedule.glade.h:60
+msgid "Show help"
+msgstr "顯示說明文件"
 
 #: ../src/gnome-schedule.glade.h:61
-msgid "_User:"
-msgstr "用戶(_U)："
+#, fuzzy
+msgid "About Gnome-schedule"
+msgstr "關於 GNOME 工作排程"
 
 #: ../src/gnome-schedule.glade.h:62
-msgid "ls -l"
-msgstr ""
+msgid "Scheduled and active tasks"
+msgstr "已安排及現行的工作"
 
 #: ../src/gnome-schedule.py:66 ../src/scheduleapplet.py:67
 #: ../src/xwrapper.py:51
@@ -1110,23 +1117,23 @@ msgstr ""
 msgid "A task from a predefined template"
 msgstr ""
 
-#: ../src/atEditor.py:78
+#: ../src/atEditor.py:83
 msgid "Calendar"
 msgstr ""
 
-#: ../src/atEditor.py:511
+#: ../src/atEditor.py:515
 msgid ""
 "In one or both of the fields hour and minute there was entered a letter, or "
 "a number out of range. Remember an hour only has 60 minutes and a day only "
 "24 hours."
 msgstr ""
 
-#: ../src/atEditor.py:572
+#: ../src/atEditor.py:576
 #, python-format
 msgid "This is an invalid record! The problem could be: %s"
 msgstr "é€™é …ç´€éŒ„ç„¡æ•ˆï¼é€™å€‹å•é¡Œå¯èƒ½æ˜¯ï¼š%s"
 
-#: ../src/atEditor.py:592
+#: ../src/atEditor.py:596
 msgid ""
 "Note about working directory of executed tasks:\n"
 "\n"