[tasks] Mass update of translations from Moblin

From: Ross Burton <rburton src gnome org>
To: svn-commits-list gnome org
Subject: [tasks] Mass update of translations from Moblin
Date: Fri, 24 Jul 2009 15:41:05 +0000 (UTC)
commit c941fe90cb22c8460bbfb3f1bc05fd0efe785d2d
Author: Ross Burton <ross linux intel com>
Date:   Fri Jul 24 16:29:30 2009 +0100

    Mass update of translations from Moblin

 po/LINGUAS  |    1 +
 po/bg.po    |  470 +++++++++++++++++++++++++---
 po/ca.po    |  464 +++++++++++++++++++++++++---
 po/cs.po    |  469 ++++++++++++++++++++++++++---
 po/cy.po    |  465 +++++++++++++++++++++++++---
 po/da.po    |  431 ++++++++++++++++++++-----
 po/de.po    |    4 +-
 po/el.po    |  468 +++++++++++++++++++++++++---
 po/es.po    |   46 ++--
 po/et.po    |  469 ++++++++++++++++++++++++++---
 po/eu.po    |  468 +++++++++++++++++++++++++---
 po/fi.po    |  111 ++++---
 po/fr.po    |   69 ++---
 po/gl.po    |   42 ++--
 po/id.po    |  474 ++++++++++++++++++++++++++---
 po/it.po    |    6 +-
 po/ja.po    |   34 +--
 po/nb.po    |  396 ++++++++++++++++++-----
 po/nl.po    |  469 ++++++++++++++++++++++++++---
 po/pl.po    |  341 ++++++++++++++++-----
 po/pt.po    |  474 ++++++++++++++++++++++++++---
 po/pt_BR.po |    6 +-
 po/ro.po    |  441 ++++++++++++++++++++++----
 po/ru.po    |  999 ++++++++++++++++++++---------------------------------------
 po/sk.po    |  474 ++++++++++++++++++++++++++---
 po/sv.po    |   42 ++--
 po/th.po    |   45 ++--
 po/tr.po    |  469 ++++++++++++++++++++++++++---
 po/vi.po    |  469 ++++++++++++++++++++++++++---
 po/zh_CN.po |  498 +++++++++++++++++++++++++++++
 30 files changed, 7931 insertions(+), 1683 deletions(-)
---
diff --git a/po/LINGUAS b/po/LINGUAS
index 6a9fd03..f2c5e96 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -28,3 +28,4 @@ th
 tr
 vi
 zh_CN
+zh_TW
diff --git a/po/bg.po b/po/bg.po
index 90f9889..7bc4740 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,25 +3,26 @@
 # This file is distributed under the same license as the tasks package.
 # Vladimir "Kaladan" Petkov <kaladan gmail com>, 2007.
 # Vladimir Petkov <kaladan gmail com>, 2007.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-07 16:20+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-18 13:07+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan gmail com>\n"
 "Language-Team: Bulgarian <bg li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:200
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
 
@@ -29,92 +30,479 @@ msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
 msgid "To Do list"
 msgstr "Ð¢Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ñ?"
 
-#: ../src/koto-date-combo.c:58
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "Ð´Ð½ÐµÑ?"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "Ñ?Ñ?Ñ?Ðµ"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "Ð²Ñ?ÐµÑ?Ð°"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "Ð½Ñ?Ð¼Ð° Ð·Ð°Ð´Ð°Ð´ÐµÐ½Ð° Ð´Ð°Ñ?Ð°"
 
-#: ../src/koto-date-combo.c:346
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Ð?Ð½ÐµÑ?"
 
-#: ../src/koto-date-combo.c:349
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Ð?Ð¼Ðµ"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Ð?Ð¾Ð²Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Ð?ÐµÐ·"
 
-#: ../src/koto-priority-combo.c:109
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Ð?Ð¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Ð?Ð¾Ð²Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Ð?Ð¸Ñ?Ñ?Ðº"
 
-#: ../src/koto-priority-combo.c:111
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð°Ð»ÐµÐ½"
 
-#: ../src/koto-priority-combo.c:113
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Ð?Ð¸Ñ?Ð¾Ðº"
 
-#: ../src/koto-task-editor.c:89
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Ð?Ð¼Ðµ:"
 
-#: ../src/koto-task-editor.c:90
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
 
-#: ../src/koto-task-editor.c:91
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "Ð?_Ñ?Ð¸Ð¾Ñ?Ð¸Ñ?ÐµÑ?:"
 
-#: ../src/koto-task-editor.c:92
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "Ð?Ñ?Ð°Ð¹Ð½Ð° _Ð´Ð°Ñ?Ð°:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:94
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°:"
 
-#: ../src/koto-task-editor.c:95
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_Ð?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ:"
 
-#: ../src/koto-task-editor.c:411
-msgid "New Category"
-msgstr "Ð?Ð¾Ð²Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: ../src/koto-task-view.c:91
-msgid "today"
-msgstr "Ð´Ð½ÐµÑ?"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:93
-msgid "tomorrow"
-msgstr "Ñ?Ñ?Ñ?Ðµ"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:95
-msgid "yesterday"
-msgstr "Ð²Ñ?ÐµÑ?Ð°"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:136
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (ÐºÑ?Ð°ÐµÐ½ Ñ?Ñ?Ð¾Ðº Ð´Ð¾ %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
 
-#: ../src/koto-task-view.c:322
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Ð?ÐµÐ·"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Ð?Ð¾Ñ?Ð¾Ð²Ð¾"
 
-#: ../src/koto-task-view.c:329
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Ð?Ð¼Ðµ"
 
-#: ../src/gtk/main.c:162
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Ð¢Ñ?Ñ?Ð±Ð²Ð° Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ñ?"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+msgid "New task..."
+msgstr "Ð?Ð¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°..."
+
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ (%d)"
 
-#: ../src/gtk/main.c:249
-msgid "New task..."
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
 msgstr "Ð?Ð¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°..."
 
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Ð?Ð¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Ð?Ð¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (ÐºÑ?Ð°ÐµÐ½ Ñ?Ñ?Ð¾Ðº Ð´Ð¾ %s)"
+
 #~ msgid "_Add"
 #~ msgstr "_Afegeix"
diff --git a/po/ca.po b/po/ca.po
index e33a234..fb1b6da 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-07 16:20+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 01:03+0100\n"
 "Last-Translator: Jordi Mallach <jordi sindominio net>\n"
 "Language-Team: Catalan <tradgnome softcatala org\n"
@@ -19,7 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Gestor personal de tasques"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:200
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -27,92 +28,479 @@ msgstr "Tasques"
 msgid "To Do list"
 msgstr "Llista de coses a fer"
 
-#: ../src/koto-date-combo.c:58
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "avui"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "demÃ "
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "ahir"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "sense data establerta"
 
-#: ../src/koto-date-combo.c:346
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Avui"
 
-#: ../src/koto-date-combo.c:349
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Resum"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Categoria nova"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Cap"
 
-#: ../src/koto-priority-combo.c:109
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Tasca nova..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Categoria nova"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Baixa"
 
-#: ../src/koto-priority-combo.c:111
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/koto-priority-combo.c:113
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Alta"
 
-#: ../src/koto-task-editor.c:89
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Resum:"
 
-#: ../src/koto-task-editor.c:90
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Categoria:"
 
-#: ../src/koto-task-editor.c:91
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: ../src/koto-task-editor.c:92
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Venciment:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:94
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "AdreÃ§a _web:"
 
-#: ../src/koto-task-editor.c:95
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_DescripciÃ³:"
 
-#: ../src/koto-task-editor.c:411
-msgid "New Category"
-msgstr "Categoria nova"
-
-#: ../src/koto-task-view.c:91
-msgid "today"
-msgstr "avui"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:93
-msgid "tomorrow"
-msgstr "demÃ "
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:95
-msgid "yesterday"
-msgstr "ahir"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:136
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (venÃ§ %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
 
-#: ../src/koto-task-view.c:322
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Cap"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Tasques"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Feta"
 
-#: ../src/koto-task-view.c:329
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Resum"
 
-#: ../src/gtk/main.c:162
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Tasques"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Llista de coses a fer"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Categoria:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+msgid "New task..."
+msgstr "Tasca nova..."
+
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tasques (%d)"
 
-#: ../src/gtk/main.c:249
-msgid "New task..."
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
 msgstr "Tasca nova..."
 
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Tasca nova..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Tasca nova..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (venÃ§ %s)"
+
 #~ msgid "_Add"
 #~ msgstr "_Afegeix"
diff --git a/po/cs.po b/po/cs.po
index 56d6e73..361e3db 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 01:03+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 13:00+0100\n"
 "Last-Translator: VÃtÄ?zslav Kotrla <vitko post cz>\n"
 "Language-Team: Czech <cs li org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "OsobnÃ sprÃ¡vce ÃºkolÅ¯"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ã?koly"
 
@@ -27,86 +28,480 @@ msgstr "Ã?koly"
 msgid "To Do list"
 msgstr "Seznam pracovnÃch ÃºkolÅ¯"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "dnes"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "zÃtra"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "vÄ?era"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "datum nenastaveno"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Dnes"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Souhrn"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "Kategorie:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Å½Ã¡dnÃ©"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "NovÃ½ Ãºkol..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Kategorie:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "NÃzkÃ¡"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "NormÃ¡lnÃ"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "VysokÃ¡"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Souhrn:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "Kategorie:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Priorita:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "Splnit do:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "WWW adresa:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "Popis:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "dnes"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "zÃtra"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "vÄ?era"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (splnit do %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Å½Ã¡dnÃ©"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Ã?koly"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Souhrn"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Ã?koly"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Seznam pracovnÃch ÃºkolÅ¯"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "Kategorie:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "NovÃ½ Ãºkol..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "PÅ?id_at"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Ã?koly"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "NovÃ½ Ãºkol..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "NovÃ½ Ãºkol..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "NovÃ½ Ãºkol..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (splnit do %s)"
+
+#~ msgid "_Add"
+#~ msgstr "PÅ?id_at"
diff --git a/po/cy.po b/po/cy.po
index f77011d..9c03135 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.3\n"
-"POT-Creation-Date: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-06 22:13+0100\n"
 "Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Cymreag <dylunio gmail com>\n"
@@ -14,8 +15,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Rheolydd tasgau personol"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:200
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tasgau"
 
@@ -23,90 +24,476 @@ msgstr "Tasgau"
 msgid "To Do list"
 msgstr "Rhestr o Dasgau I'w Wneud"
 
-#: ../src/koto-date-combo.c:58
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "heddiw"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "yfory"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "ddoe"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "dim dyddiad wedi'i osod"
 
-#: ../src/koto-date-combo.c:346
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Heddiw"
 
-#: ../src/koto-date-combo.c:349
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Crynodeb"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Categori Newydd"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Dim"
 
-#: ../src/koto-priority-combo.c:109
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Tasg newydd..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Categori Newydd"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Isel"
 
-#: ../src/koto-priority-combo.c:111
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Arferol"
 
-#: ../src/koto-priority-combo.c:113
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Uchel"
 
-#: ../src/koto-task-editor.c:89
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "C_rynodeb:"
 
-#: ../src/koto-task-editor.c:90
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Categori:"
 
-#: ../src/koto-task-editor.c:91
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Blaenoriaeth:"
 
-#: ../src/koto-task-editor.c:92
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "D_yddiad Disgwyliedig:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:94
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "Cyfeiriad _WÃª"
 
-#: ../src/koto-task-editor.c:95
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_Disgrifiad:"
 
-#: ../src/koto-task-editor.c:411
-msgid "New Category"
-msgstr "Categori Newydd"
-
-#: ../src/koto-task-view.c:91
-msgid "today"
-msgstr "heddiw"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:93
-msgid "tomorrow"
-msgstr "yfory"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:95
-msgid "yesterday"
-msgstr "ddoe"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:136
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (disgwiliedig %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
 
-#: ../src/koto-task-view.c:322
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Dim"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Tasgau"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Wedi'i wneud"
 
-#: ../src/koto-task-view.c:329
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: ../src/gtk/main.c:162
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Tasgau"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Rhestr o Dasgau I'w Wneud"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Categori:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+msgid "New task..."
+msgstr "Tasg newydd..."
+
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tasgau (%d)"
 
-#: ../src/gtk/main.c:249
-msgid "New task..."
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Tasg newydd..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Tasg newydd..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
 msgstr "Tasg newydd..."
 
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (disgwiliedig %s)"
diff --git a/po/da.po b/po/da.po
index cb2dc78..23832e8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-05 23:36+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-08-24 21:27+0100\n"
 "Last-Translator: Kristian Poul Herkild <kristian herkild dk>\n"
 "Language-Team: da_DK <dansk dansk-gruppen>\n"
@@ -20,10 +20,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Personlig opgavehÃ¥ndtering"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:451
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:429
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Opgaver"
 
@@ -31,31 +29,250 @@ msgstr "Opgaver"
 msgid "To Do list"
 msgstr "Opgaveliste"
 
-#: ../libkoto/ical-util.c:58
-msgid "today"
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
 msgstr "i dag"
 
-#: ../libkoto/ical-util.c:60
-msgid "tomorrow"
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
 msgstr "i morgen"
 
-#: ../libkoto/ical-util.c:62
-msgid "yesterday"
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
 msgstr "i gÃ¥r"
 
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "Alle"
+
 #: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "ingen dato sat"
 
-#: ../libkoto/koto-date-combo.c:384
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Idag"
 
-#: ../libkoto/koto-date-combo.c:387
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Sammendrag"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+#, fuzzy
+msgid "Delete"
+msgstr "Slet opgave"
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Ny kategori"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr "Indtast navnet pÃ¥ den nye kategori:"
+
 #: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Ingen"
 
+#: ../libkoto/koto-meta-group.c:48
+msgid "New Group..."
+msgstr "Ny Gruppe..."
+
+#: ../libkoto/koto-no-category-group.c:32
+msgid "No Category"
+msgstr "Ingen kategori"
+
 #: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Lav"
@@ -92,166 +309,206 @@ msgstr "_Websted:"
 msgid "D_escription:"
 msgstr "D_escription:"
 
-#: ../libkoto/koto-task-editor-dialog.c:66
-#: ../src/gtk/main.c:342
-#: ../src/hildon/hildon-tasks.c:318
-#: ../src/omoko/openmoko-tasks.c:208
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Er du sikker pÃ¥, du Ã¸nsker at slette \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:69
-#: ../src/gtk/main.c:345
-#: ../src/hildon/hildon-tasks.c:321
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hvis du sletter en opgave gÃ¥r den tabt."
 
-#: ../libkoto/koto-task-editor-dialog.c:243
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, fuzzy, c-format
+msgid "Delete Task %s"
+msgstr "Slet opgave"
+
+#: ../libkoto/koto-task-editor-dialog.c:101
+#, fuzzy, c-format
+msgid "Edit Task %s"
+msgstr "Rediger opgave..."
+
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "Det_aljer"
 
-#: ../libkoto/koto-task-editor-dialog.c:298
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Noter</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:300
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Noter"
 
-#: ../libkoto/koto-task-editor-dialog.c:304
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Opgaver"
 
-#: ../libkoto/koto-task-view.c:111
-#, c-format
-msgid "%s (due %s)"
-msgstr "%s (senest %s)"
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+#, fuzzy
+msgid "Complete Task"
+msgstr "Slet opgave"
 
-#: ../libkoto/koto-task-view.c:372
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "FuldfÃ¸rt"
 
-#: ../libkoto/koto-task-view.c:379
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: ../libkoto/koto-all-group.c:28
-msgid "All"
-msgstr "Alle"
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:394
-msgid "New Category"
-msgstr "Ny kategori"
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:405
-msgid "Enter the name of the new category:"
-msgstr "Indtast navnet pÃ¥ den nye kategori:"
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
 
-#: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Ny Gruppe..."
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
 
-#: ../libkoto/koto-no-category-group.c:32
-msgid "No Category"
-msgstr "Ingen kategori"
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
 
-#: ../src/gtk/main.c:404
-#: ../src/hildon/hildon-tasks.c:380
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Er du sikker pÃ¥, du Ã¸nsker at slette alle fuldfÃ¸rte opgaver?"
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
 
-#: ../src/gtk/main.c:406
-#: ../src/hildon/hildon-tasks.c:382
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Sletning af fuldfÃ¸rte opgaver betyder at disse gÃ¥r tabt."
+#: ../src/gtk/main.c:424
+#, fuzzy
+msgid "Remove Completed"
+msgstr "Fje_rn fuldfÃ¸rte"
 
-#: ../src/gtk/main.c:436
-#: ../src/hildon/hildon-tasks.c:414
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
-"Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
-"Dette program er frit programmel. Du kan videredistribuere det eller Ã¦ndre det under betingelserne i GNU General Public License som udgives af Free Software Foundation; enten version 2 af licensen eller (hvis du Ã¸nsker det) enhver senere version.\n"
+"Dette program er frit programmel. Du kan videredistribuere det eller Ã¦ndre "
+"det under betingelserne i GNU General Public License som udgives af Free "
+"Software Foundation; enten version 2 af licensen eller (hvis du Ã¸nsker det) "
+"enhver senere version.\n"
 "\n"
-"Dette program distribueres i hÃ¥b om at programmet er nyttigt, men UDEN NOGEN GARANTI, ikke engang underforstÃ¥et garanti om at det er SALGBART eller er BRUGBART TIL ET BESTEMT FORMÃ?L. Se GNU General Public License for flere detaljer.\n"
+"Dette program distribueres i hÃ¥b om at programmet er nyttigt, men UDEN NOGEN "
+"GARANTI, ikke engang underforstÃ¥et garanti om at det er SALGBART eller er "
+"BRUGBART TIL ET BESTEMT FORMÃ?L. Se GNU General Public License for flere "
+"detaljer.\n"
 "\n"
-"Du burde have modtaget en kopi af GNU General Public License sammen med programmet; hvis ikke, sÃ¥ skriv til Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Du burde have modtaget en kopi af GNU General Public License sammen med "
+"programmet; hvis ikke, sÃ¥ skriv til Free Software Foundation, Inc. 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: ../src/gtk/main.c:457
-#: ../src/hildon/hildon-tasks.c:435
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr ""
 "David Nielsen <david lovesunix net>\n"
 "Kristian Poul Herkild <kristian herkild dk>"
 
-#: ../src/gtk/main.c:461
-#: ../src/hildon/hildon-tasks.c:439
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Pimlico-projektet"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:469
+#: ../src/gtk/main.c:479
 msgid "_Task"
 msgstr "_Opgave"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:473
-#: ../src/hildon/hildon-tasks.c:451
-msgid "_Mark Complete"
-msgstr "_MÃ¦rk fuldfÃ¸rte"
-
-#: ../src/gtk/main.c:475
-#: ../src/hildon/hildon-tasks.c:453
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "Fje_rn fuldfÃ¸rte"
 
-#: ../src/gtk/main.c:478
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
 msgid "_Help"
 msgstr "_HjÃ¦lp"
 
-#: ../src/gtk/main.c:566
-#: ../src/hildon/hildon-tasks.c:550
+#: ../src/gtk/main.c:492
+#, fuzzy
+msgid "Edit..."
+msgstr "Rediger opgave..."
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr "_MÃ¦rk fuldfÃ¸rte"
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Opgaveliste"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "Ka_tegori:"
 
-#: ../src/gtk/main.c:586
-#: ../src/hildon/hildon-tasks.c:570
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Ny opgave..."
 
-#: ../src/gtk/main.c:610
-#: ../src/hildon/hildon-tasks.c:594
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Opgaver (%d)"
 
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr "Er du sikker pÃ¥, du Ã¸nsker at slette alle fuldfÃ¸rte opgaver?"
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr "Sletning af fuldfÃ¸rte opgaver betyder at disse gÃ¥r tabt."
+
 #. Action name, stock ID, label, accelerator, tooltip, callback
 #. dummy
-#: ../src/hildon/hildon-tasks.c:448
+#: ../src/hildon/hildon-tasks.c:456
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: ../src/hildon/hildon-tasks.c:449
+#: ../src/hildon/hildon-tasks.c:457
 msgid "Edit Task..."
 msgstr "Rediger opgave..."
 
-#: ../src/hildon/hildon-tasks.c:452
+#: ../src/hildon/hildon-tasks.c:460
 msgid "Delete Task"
 msgstr "Slet opgave"
 
-#: ../src/hildon/hildon-tasks.c:454
+#: ../src/hildon/hildon-tasks.c:462
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../src/hildon/hildon-tasks.c:455
+#: ../src/hildon/hildon-tasks.c:463
 msgid "About"
 msgstr "Om"
 
-#: ../src/omoko/openmoko-tasks.c:177
+#: ../src/omoko/openmoko-tasks.c:186
 msgid "New task"
 msgstr "Ny opgave"
 
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (senest %s)"
diff --git a/po/de.po b/po/de.po
index 1ec8ec2..3581bc8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-15 09:17+0000\n"
-"PO-Revision-Date: 2009-07-20 16:25-0800\n"
-"Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
+"PO-Revision-Date: 2009-07-17 17:06-0800\n"
+"Last-Translator: GLSDEU_Andreas <andreasx machoy intel com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/po/el.po b/po/el.po
index 4116edb..4834d74 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 10:31+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 19:01+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg hellug gr>\n"
 "Language-Team: Greek <nls tux hellug gr>\n"
@@ -20,7 +20,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Î Ï?Î¿Ï?Ï?Ï?Î¹ÎºÏ?Ï? Î´Î¹Î±Ï?ÎµÎ¹Ï?Î¹Ï?Ï?Î®Ï? ÎµÏ?Î³Î±Ï?Î¹Ï?Î½"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Î?Ï?Î³Î±Ï?Î¯ÎµÏ?"
 
@@ -28,87 +29,480 @@ msgstr "Î?Ï?Î³Î±Ï?Î¯ÎµÏ?"
 msgid "To Do list"
 msgstr "Î?Î¯Ï?Ï?Î± ÎµÏ?Î³Î±Ï?Î¹Ï?Î½"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "Ï?Î®Î¼ÎµÏ?Î±"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "Î±Ï?Ï?Î¹Î¿"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "Ï?Î¸ÎµÏ?"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "Î´ÎµÎ½ Î¿Ï?Î¯Ï?Ï?Î·ÎºÎµ Î·Î¼ÎµÏ?Î¿Î¼Î·Î½Î¯Î±"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Î£Î®Î¼ÎµÏ?Î±"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Î ÎµÏ?Î¯Î»Î·Ï?Î·"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Î?Î±Ï?Î·Î³Î¿Ï?Î¯Î±:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Î?Î±Î½ÎÎ½Î±"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Î?ÎÎ± ÎµÏ?Î³Î±Ï?Î¯Î±..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Î?Î±Ï?Î·Î³Î¿Ï?Î¯Î±:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Î§Î±Î¼Î·Î»Î®"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Î?Î±Î½Î¿Î½Î¹ÎºÎ®"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Î¥Ï?Î·Î»Î®"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "Î ÎµÏ?Î¯_Î»Î·Ï?Î·:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Î?Î±Ï?Î·Î³Î¿Ï?Î¯Î±:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Î Ï?Î¿Ï?ÎµÏ?Î±Î¹Ï?Ï?Î·Ï?Î±:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "Î?Î±Ï?Î±Î»Î·ÎºÏ?Î¹ÎºÎ® _Î·Î¼ÎµÏ?Î¿Î¼Î·Î½Î¯Î±:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î· Î¹Ï?Ï?Î¿Ï?:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "Î ÎµÏ?Î¹Î³Ï?Î±_Ï?Î®:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "Ï?Î®Î¼ÎµÏ?Î±"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "Î±Ï?Ï?Î¹Î¿"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "Ï?Î¸ÎµÏ?"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (Î¼ÎÏ?Ï?Î¹ %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Î?Î±Î½ÎÎ½Î±"
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Î?Ï?Î³Î±Ï?Î¯ÎµÏ?"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Î?Î»Î¿ÎºÎ»Î·Ï?Ï?Î¸Î·ÎºÎµ"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Î ÎµÏ?Î¯Î»Î·Ï?Î·"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Î?Ï?Î³Î±Ï?Î¯ÎµÏ?"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Î?Î¯Ï?Ï?Î± ÎµÏ?Î³Î±Ï?Î¹Ï?Î½"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Î?Î±Ï?Î·Î³Î¿Ï?Î¯Î±:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Î?ÎÎ± ÎµÏ?Î³Î±Ï?Î¯Î±..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "Î _Ï?Î¿Ï?Î¸Î®ÎºÎ·"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Î?Ï?Î³Î±Ï?Î¯ÎµÏ?"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Î?ÎÎ± ÎµÏ?Î³Î±Ï?Î¯Î±..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Î?ÎÎ± ÎµÏ?Î³Î±Ï?Î¯Î±..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Î?ÎÎ± ÎµÏ?Î³Î±Ï?Î¯Î±..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (Î¼ÎÏ?Ï?Î¹ %s)"
 
+#~ msgid "_Add"
+#~ msgstr "Î _Ï?Î¿Ï?Î¸Î®ÎºÎ·"
diff --git a/po/es.po b/po/es.po
index ca8ab5d..0914ce6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,9 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=tasks&component=general\n"
-"POT-Creation-Date: 2009-03-28 03:24+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2009-06-21 10:42+0200\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
@@ -32,25 +31,25 @@ msgstr "Tareas"
 msgid "To Do list"
 msgstr "Listas de tareas"
 
-#: ../libkoto/ical-util.c:63
+#: ../libkoto/ical-util.c:62
 msgid "due today"
 msgstr "para hoy"
 
-#: ../libkoto/ical-util.c:65
+#: ../libkoto/ical-util.c:64
 msgid "due tomorrow"
 msgstr "para maÃ±ana"
 
-#: ../libkoto/ical-util.c:67
+#: ../libkoto/ical-util.c:66
 msgid "due yesterday"
 msgstr "para ayer"
 
-#: ../libkoto/ical-util.c:71
+#: ../libkoto/ical-util.c:70
 #, c-format
 msgid "due %A"
 msgstr "para el %A"
 
 #. Fallback to returning the preferred date representation
-#: ../libkoto/ical-util.c:75
+#: ../libkoto/ical-util.c:74
 #, c-format
 msgid "due %x"
 msgstr "para el %x"
@@ -253,11 +252,11 @@ msgstr "Insertar"
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:417
 msgid "New Category"
 msgstr "CategorÃa nueva"
 
-#: ../libkoto/koto-field-editor-factory.c:439
+#: ../libkoto/koto-field-editor-factory.c:428
 msgid "Enter the name of the new category:"
 msgstr "Introduzca el nombre de la categorÃa nueva:"
 
@@ -309,39 +308,39 @@ msgstr "DirecciÃ³n _web:"
 msgid "D_escription:"
 msgstr "D_escripciÃ³n:"
 
-#: ../libkoto/koto-task-editor-dialog.c:71 ../src/hildon/hildon-tasks.c:326
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Â¿EstÃ¡s seguro que deseas eliminar \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:74 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Si tÃº eliminas un item, se perderÃ¡ definitivamente."
 
-#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "Borrar tarea %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr "Editar tarea %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:283
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "Det_alles"
 
-#: ../libkoto/koto-task-editor-dialog.c:342
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Notas</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Notas"
 
-#: ../libkoto/koto-task-editor-dialog.c:348
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Tareas"
@@ -350,11 +349,11 @@ msgstr "%s - Tareas"
 msgid "Complete Task"
 msgstr "Tarea completa"
 
-#: ../libkoto/koto-task-view.c:440
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Hecho"
 
-#: ../libkoto/koto-task-view.c:447
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Resumen"
 
@@ -454,19 +453,18 @@ msgid "_Mark Complete"
 msgstr "_Marcar como terminada"
 
 #: ../src/gtk/main.c:621
-#| msgid "To Do list"
 msgid " - a to do list"
 msgstr ".-. una lista de tareas"
 
-#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_CategorÃa:"
 
-#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Tarea nueva..."
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tareas (%d)"
diff --git a/po/et.po b/po/et.po
index b7539a1..a7d2f4c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tasks HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 13:54+0200\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 23:18+0200\n"
 "Last-Translator: Priit Laes <amd store20 com>\n"
 "Language-Team: Estonian <gnome-et linux ee>\n"
@@ -23,7 +23,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Isiklik Ã¼lesandehaldur"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ã?lesanded"
 
@@ -31,86 +32,480 @@ msgstr "Ã?lesanded"
 msgid "To Do list"
 msgstr "TÃ¶Ã¶de loend"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "tÃ¤na"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "homme"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "eile"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "kuupÃ¤ev mÃ¤Ã¤ramata"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "TÃ¤na"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "KokkuvÃµte"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Kategooria:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Puudub"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Uus Ã¼lesanne..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Kategooria:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Madal"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Tavaline"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "KÃµrge"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_KokkuvÃµte:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Kategooria:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_TÃ¤htsus:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_TÃ¤htaeg:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Veebileht:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_Kirjeldus"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "tÃ¤na"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "homme"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "eile"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (tÃ¤htaeg %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Puudub"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Ã?lesanded"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Tehtud"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "KokkuvÃµte"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Ã?lesanded"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "TÃ¶Ã¶de loend"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Kategooria:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Uus Ã¼lesanne..."
 
-#. TODO: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Lisa"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Ã?lesanded"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Uus Ã¼lesanne..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Uus Ã¼lesanne..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Uus Ã¼lesanne..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (tÃ¤htaeg %s)"
+
+#~ msgid "_Add"
+#~ msgstr "_Lisa"
diff --git a/po/eu.po b/po/eu.po
index acea864..478adbe 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 01:03+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 13:30+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken mundurat net>\n"
 "Language-Team: Euskera <librezale librezale org>\n"
@@ -19,7 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Ataza kudeatzaile pertsonala"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Atazak"
 
@@ -27,87 +28,480 @@ msgstr "Atazak"
 msgid "To Do list"
 msgstr "Egitekoen zerrenda"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "gaur"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "bihar"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "atzo"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "data ezarri gabe"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Gaur"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Laburpena"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Kategoria:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Ataza berria..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Kategoria:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Baxua"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normala"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Altua"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Laburpena:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Kategoria:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Iraungite data:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Web helbidea:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_Deskripzioa:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "gaur"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "bihar"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "atzo"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (%s-(e)rako)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Bat ere ez"
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Atazak"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Eginda"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Laburpena"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Atazak"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Egitekoen zerrenda"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Kategoria:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Ataza berria..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Gehitu"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Atazak"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Ataza berria..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Ataza berria..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Ataza berria..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (%s-(e)rako)"
 
+#~ msgid "_Add"
+#~ msgstr "_Gehitu"
diff --git a/po/fi.po b/po/fi.po
index 8431e62..8ed4ad4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,5 +1,5 @@
 # Finnish translation for tasks
-# Copyright (c) 2008-2009 Timo Jyrinki
+# Copyright (c) 2008-2009 Timo Jyrinki 
 # This file is distributed under the same license as the tasks package.
 # Timo Jyrinki <timo jyrinki iki fi>, 2008-2009.
 #
@@ -7,23 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
-"PO-Revision-Date: 2009-07-20 16:25-0800\n"
-"Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"PO-Revision-Date: 2009-02-22 13:16+0200\n"
+"Last-Translator: Timo Jyrinki <timo jyrinki iki fi>\n"
 "Language-Team: Finnish <fi li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "HenkilÃ¶kohtainen tehtÃ¤vien hallinta"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:462
-#: ../src/gtk/main.c:620
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
 #: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "TehtÃ¤vÃ¤t"
@@ -179,8 +175,12 @@ msgid "^(?<task>.+) next (?<day>%s)$"
 msgstr "^(?<task>.+) seuraava (?<day>%s)$"
 
 #: ../libkoto/koto-date-parser.c:481
-msgid "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|sat|sun"
-msgstr "maanantai|tiistai|keskiviikko|torstai|perjantai|lauantai|sunnuntai|ma|ti|ke|to|pe|la|su"
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+"maanantai|tiistai|keskiviikko|torstai|perjantai|lauantai|sunnuntai|ma|ti|ke|"
+"to|pe|la|su"
 
 #. Translators: just translate this|on|by|due to contain relevant words in
 #. your language, moving the day block is required.
@@ -192,25 +192,34 @@ msgstr "^(?<task>.+) (tÃ¤mÃ¤n kuun|ajankohtana|ennen|mennessÃ¤) (?<day>\\w+)$"
 #. and month expressions as suitable
 #: ../libkoto/koto-date-parser.c:494
 msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+"^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana) (?<day>\\d{1,2})/(?<month>\\d"
+"{1,2})$"
 
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language.
 #: ../libkoto/koto-date-parser.c:499
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)?$"
+msgstr ""
+"^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)?$"
 
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language, and move the month block if required.
 #: ../libkoto/koto-date-parser.c:504
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)? (?<month>\\w+)$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)? (?"
+"<month>\\w+)$"
 
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language, and move the month block if required.
 #: ../libkoto/koto-date-parser.c:509
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)?$ (?<month>\\w+)"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+"^(?<task>.+) (?:ennen|mennessÃ¤|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)?$ (?"
+"<month>\\w+)"
 
 #. Translators: just translate this|on|by|due to contain relevant words in
 #. your language
@@ -303,20 +312,17 @@ msgstr "_WWW-osoite:"
 msgid "D_escription:"
 msgstr "_Kuvaus:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70
-#: ../src/hildon/hildon-tasks.c:326
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Haluatko varmasti poistaa kohteen \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73
-#: ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Jos poistat kohteen, se menetetÃ¤Ã¤n pysyvÃ¤sti."
 
-#: ../libkoto/koto-task-editor-dialog.c:83
-#: ../src/gtk/main.c:382
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "Poista tehtÃ¤vÃ¤ %s"
@@ -343,8 +349,7 @@ msgstr "Muistii_npanot"
 msgid "%s - Tasks"
 msgstr "%s - tehtÃ¤vÃ¤t"
 
-#: ../libkoto/koto-task-view.c:78
-#: ../src/gtk/main.c:361
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
 msgid "Complete Task"
 msgstr "TehtÃ¤vÃ¤ valmis"
 
@@ -387,30 +392,43 @@ msgstr "LisÃ¤Ã¤ tehtÃ¤vÃ¤ %s"
 msgid "Remove Completed"
 msgstr "Poistaminen onnistui"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
-"Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
-"TehtÃ¤vÃ¤t on vapaa ohjelma; voit levittÃ¤Ã¤ sitÃ¤ edelleen ja/tai muokata sitÃ¤ GNU:n GPL-lisenssin sallimilla tavoilla siten kuin Free Software Foundation on sen mÃ¤Ã¤ritellyt; voit halutessasi kÃ¤yttÃ¤Ã¤ lisenssin versiota 2 taikka mitÃ¤ tahansa tÃ¤mÃ¤n jÃ¤lkeen ilmestynyttÃ¤ versiota.\n"
+"TehtÃ¤vÃ¤t on vapaa ohjelma; voit levittÃ¤Ã¤ sitÃ¤ edelleen ja/tai muokata sitÃ¤ "
+"GNU:n GPL-lisenssin sallimilla tavoilla siten kuin Free Software Foundation "
+"on sen mÃ¤Ã¤ritellyt; voit halutessasi kÃ¤yttÃ¤Ã¤ lisenssin versiota 2 taikka "
+"mitÃ¤ tahansa tÃ¤mÃ¤n jÃ¤lkeen ilmestynyttÃ¤ versiota.\n"
 "\n"
-"TehtÃ¤vÃ¤t-ohjelmaa levitetÃ¤Ã¤n siinÃ¤ toivossa, ettÃ¤ siitÃ¤ on hyÃ¶tyÃ¤, mutta ILMAN MITÃ?Ã?N TAKUUTA; jopa ilman konkludenttista takuuta MYYNTIKELPOISUUDESTA TAI SOVELTUMISESTA TIETTYYN ERITYISEEN TARKOITUKSEEN. Yksityiskohtien osalta katso GNU:n GPL-lisenssiÃ¤.\n"
+"TehtÃ¤vÃ¤t-ohjelmaa levitetÃ¤Ã¤n siinÃ¤ toivossa, ettÃ¤ siitÃ¤ on hyÃ¶tyÃ¤, mutta "
+"ILMAN MITÃ?Ã?N TAKUUTA; jopa ilman konkludenttista takuuta "
+"MYYNTIKELPOISUUDESTA TAI SOVELTUMISESTA TIETTYYN ERITYISEEN TARKOITUKSEEN. "
+"Yksityiskohtien osalta katso GNU:n GPL-lisenssiÃ¤.\n"
 "\n"
-"Sinun olisi pitÃ¤nyt saada kopio GNU:n GPL-lisenssistÃ¤ tÃ¤mÃ¤n ohjelman mukana; jos et sitÃ¤ saanut, niin lÃ¤hetÃ¤ kirje Free Software Foundation, Inc. :lle, 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA."
+"Sinun olisi pitÃ¤nyt saada kopio GNU:n GPL-lisenssistÃ¤ tÃ¤mÃ¤n ohjelman mukana; "
+"jos et sitÃ¤ saanut, niin lÃ¤hetÃ¤ kirje Free Software Foundation, Inc. :lle, "
+"51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA."
 
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Timo Jyrinki https://launchpad.net/~timo-jyrinki";
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Pimlico-projekti"
 
@@ -419,8 +437,7 @@ msgstr "Pimlico-projekti"
 msgid "_Task"
 msgstr "_TehtÃ¤vÃ¤"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "_Poisto onnistui"
 
@@ -437,27 +454,24 @@ msgid "Edit..."
 msgstr "Muokkaa..."
 
 #. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
 msgid "_Mark Complete"
 msgstr "_Merkitse valmiiksi"
 
 #: ../src/gtk/main.c:621
+#, fuzzy
 msgid " - a to do list"
-msgstr "- tehtÃ¤vÃ¤luettelo"
+msgstr "TehtÃ¤vÃ¤luettelo"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_Luokka:"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Uusi tehtÃ¤vÃ¤..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "TehtÃ¤vÃ¤t (%d)"
@@ -498,4 +512,3 @@ msgstr "Uusi tehtÃ¤vÃ¤"
 
 #~ msgid "%s (due %s)"
 #~ msgstr "%s (tavoite %s)"
-
diff --git a/po/fr.po b/po/fr.po
index e49eb48..143c2cc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,16 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
-"PO-Revision-Date: 2009-07-20 16:26-0800\n"
-"Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"PO-Revision-Date: 2009-07-22 23:19-0800\n"
+"Last-Translator: LoÃ¯c Dufresne de Virel <loic dufresne de virel intel com>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
@@ -56,7 +53,7 @@ msgstr "pour %A"
 #: ../libkoto/ical-util.c:74
 #, c-format
 msgid "due %x"
-msgstr "pour %x"
+msgstr "pour le %x"
 
 #: ../libkoto/koto-all-group.c:28
 msgid "All"
@@ -79,53 +76,53 @@ msgstr "Jamais"
 #. including abbreviations, separated by |
 #: ../libkoto/koto-date-parser.c:80
 msgid "monday|mon"
-msgstr "lundi|lun"
+msgstr "lundi|lun|lun."
 
 #: ../libkoto/koto-date-parser.c:81
 msgid "tuesday|tue"
-msgstr "mardi|mar"
+msgstr "mardi|mar|mar."
 
 #: ../libkoto/koto-date-parser.c:82
 msgid "wednesday|wed"
-msgstr "mercredi|mer"
+msgstr "mercredi|mer|mer."
 
 #: ../libkoto/koto-date-parser.c:83
 msgid "thursday|thu"
-msgstr "jeudi|jeu"
+msgstr "jeudi|jeu|jeu."
 
 #: ../libkoto/koto-date-parser.c:84
 msgid "friday|fri"
-msgstr "vendredi|ven"
+msgstr "vendredi|ven|ven."
 
 #: ../libkoto/koto-date-parser.c:85
 msgid "saturday|sat"
-msgstr "samedi|sam"
+msgstr "samedi|sam|sam."
 
 #: ../libkoto/koto-date-parser.c:86
 msgid "sunday|sun"
-msgstr "dimanche|dim"
+msgstr "dimanche|dim|dim."
 
 #. Translators: these strings should have every common form for month names
 #. including abbreviations, separated by |
 #: ../libkoto/koto-date-parser.c:101
 msgid "january|jan"
-msgstr "janvier|jan"
+msgstr "janvier|jan|janv."
 
 #: ../libkoto/koto-date-parser.c:102
 msgid "february|feb"
-msgstr "fÃ©vrier|fÃ©v"
+msgstr "fÃ©vrier|fÃ©v|fÃ©v."
 
 #: ../libkoto/koto-date-parser.c:103
 msgid "march|mar"
-msgstr "mars|mar"
+msgstr "mars|mar."
 
 #: ../libkoto/koto-date-parser.c:104
 msgid "april|apr"
-msgstr "avril|avr"
+msgstr "avril|avr|avr."
 
 #: ../libkoto/koto-date-parser.c:105
 msgid "may"
-msgstr "mai|mai"
+msgstr "mai"
 
 #: ../libkoto/koto-date-parser.c:106
 msgid "june|jun"
@@ -133,7 +130,7 @@ msgstr "juin|jui"
 
 #: ../libkoto/koto-date-parser.c:107
 msgid "july|jul"
-msgstr "juillet|jul"
+msgstr "juillet|jul|juil."
 
 #: ../libkoto/koto-date-parser.c:108
 msgid "august|aug"
@@ -141,19 +138,19 @@ msgstr "aoÃ»t|aoÃ»"
 
 #: ../libkoto/koto-date-parser.c:109
 msgid "september|sept|sep"
-msgstr "septembre|sep|sept"
+msgstr "septembre|sep|sept."
 
 #: ../libkoto/koto-date-parser.c:110
 msgid "october|oct"
-msgstr "octobre|oct"
+msgstr "octobre|oct|oct."
 
 #: ../libkoto/koto-date-parser.c:111
 msgid "november|nov"
-msgstr "novembre|nov"
+msgstr "novembre|nov|nov."
 
 #: ../libkoto/koto-date-parser.c:112
 msgid "december|dec"
-msgstr "dÃ©cembre|dÃ©c"
+msgstr "dÃ©cembre|dÃ©c|dÃ©c."
 
 #.
 #. Translators: WARNING: scary strings ahead.  If you don't understand regular
@@ -180,7 +177,7 @@ msgstr "^(?<task>.+) hier$"
 #: ../libkoto/koto-date-parser.c:480
 #, c-format
 msgid "^(?<task>.+) next (?<day>%s)$"
-msgstr "^(?<task>.+) prochain (?<day>%s)$"
+msgstr "^(?<task>.+) (?<day>%s) prochain$"
 
 #: ../libkoto/koto-date-parser.c:481
 msgid "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|sat|sun"
@@ -216,7 +213,7 @@ msgstr "^(?<task>.+) (?:pour|prÃ©vu|pour le)? (?<day>\\d{1,2})(?:er|e)? (?<month
 #. words in your language, and move the month block if required.
 #: ../libkoto/koto-date-parser.c:509
 msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:pour|prÃ©vu|pour le)? (?<month>\\w+) (?<day>\\d{1,2})(?:er|e)?$"
+msgstr "^(?<task>.+) (?:pour|prÃ©vu|pour le)? (?<day>\\d{1,2})(?:er|e)? (?<month>\\w+) $"
 
 #. Translators: just translate this|on|by|due to contain relevant words in
 #. your language
@@ -267,11 +264,11 @@ msgstr "Aucune"
 
 #: ../libkoto/koto-meta-group.c:48
 msgid "New Group..."
-msgstr "Nouveau groupe..."
+msgstr "Nouvelle catÃ©gorie..."
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
-msgstr "Pas de catÃ©gorie"
+msgstr "Sans catÃ©gorie"
 
 #: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
@@ -291,7 +288,7 @@ msgstr "_RÃ©sumÃ©Â :"
 
 #: ../libkoto/koto-task-editor.c:56
 msgid "Ca_tegory:"
-msgstr "Ca_tÃ©gorieÂ :"
+msgstr "_CatÃ©gorieÂ :"
 
 #: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
@@ -303,7 +300,7 @@ msgstr "Ã?_chÃ©anceÂ :"
 
 #: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
-msgstr "_Adresse WebÂ :"
+msgstr "Adresse _WebÂ :"
 
 #: ../libkoto/koto-task-editor.c:60
 msgid "D_escription:"
@@ -314,7 +311,7 @@ msgstr "D_escriptionÂ :"
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Ã?tes-vous sÃ»r de vouloir supprimer \"%s\"Â ?"
+msgstr "Ã?tes-vous sÃ»r de vouloir supprimer Â«Â %sÂ Â»Â ?"
 
 #: ../libkoto/koto-task-editor-dialog.c:73
 #: ../src/hildon/hildon-tasks.c:329
@@ -429,11 +426,11 @@ msgstr "_TÃ¢che"
 #: ../src/gtk/main.c:481
 #: ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
-msgstr "_Supprimer les tÃ¢ches accomplies"
+msgstr "Supprimer les tÃ¢ches _accomplies"
 
 #: ../src/gtk/main.c:484
 msgid "_Edit"
-msgstr "_Edition"
+msgstr "Ã?_dition"
 
 #: ../src/gtk/main.c:486
 msgid "_Help"
@@ -453,17 +450,17 @@ msgstr "_Marquer comme accomplie"
 msgid " - a to do list"
 msgstr " - une liste de tÃ¢ches"
 
-#: ../src/gtk/main.c:739
+#: ../src/gtk/main.c:742
 #: ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_CatÃ©gorieÂ :"
 
-#: ../src/gtk/main.c:764
+#: ../src/gtk/main.c:767
 #: ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Nouvelle tÃ¢che..."
 
-#: ../src/gtk/main.c:788
+#: ../src/gtk/main.c:791
 #: ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
diff --git a/po/gl.po b/po/gl.po
index ea4db32..9fe5be3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks-master-po-gl-8889\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-26 20:36+0200\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2009-05-25 12:27+0200\n"
 "Last-Translator: AntÃ³n MÃ©ixome <meixome mancomun org>\n"
 "Language-Team: Galician <gnome mancomun org>\n"
@@ -33,25 +33,25 @@ msgstr "Tarefas"
 msgid "To Do list"
 msgstr "Lista de cousas por facer"
 
-#: ../libkoto/ical-util.c:63
+#: ../libkoto/ical-util.c:62
 msgid "due today"
 msgstr "vence hoxe"
 
-#: ../libkoto/ical-util.c:65
+#: ../libkoto/ical-util.c:64
 msgid "due tomorrow"
 msgstr "vence maÃ±Ã¡"
 
-#: ../libkoto/ical-util.c:67
+#: ../libkoto/ical-util.c:66
 msgid "due yesterday"
 msgstr "venceu onte"
 
-#: ../libkoto/ical-util.c:71
+#: ../libkoto/ical-util.c:70
 #, c-format
 msgid "due %A"
 msgstr "vence %A"
 
 #. Fallback to returning the preferred date representation
-#: ../libkoto/ical-util.c:75
+#: ../libkoto/ical-util.c:74
 #, c-format
 msgid "due %x"
 msgstr "vence %x"
@@ -255,11 +255,11 @@ msgstr "Inserir"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:417
 msgid "New Category"
 msgstr "Nova categorÃa"
 
-#: ../libkoto/koto-field-editor-factory.c:439
+#: ../libkoto/koto-field-editor-factory.c:428
 msgid "Enter the name of the new category:"
 msgstr "Insira o nome da nova categorÃa:"
 
@@ -311,39 +311,39 @@ msgstr "Enderezo _Web:"
 msgid "D_escription:"
 msgstr "_DescriciÃ³n:"
 
-#: ../libkoto/koto-task-editor-dialog.c:71 ../src/hildon/hildon-tasks.c:326
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Esta seguro que quere eliminar \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:74 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Se elimina o elemento, perderase permanentemente."
 
-#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "Eliminar tarefa %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr "Editar tarefa %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:283
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "Det_alles"
 
-#: ../libkoto/koto-task-editor-dialog.c:342
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Notas</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Notas"
 
-#: ../libkoto/koto-task-editor-dialog.c:348
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Tarefas"
@@ -352,11 +352,11 @@ msgstr "%s - Tarefas"
 msgid "Complete Task"
 msgstr "Completar tarefa"
 
-#: ../libkoto/koto-task-view.c:489
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Feita"
 
-#: ../libkoto/koto-task-view.c:496
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Resumo"
 
@@ -459,15 +459,15 @@ msgstr "_Marcar completadas"
 msgid " - a to do list"
 msgstr " - unha lista de tarefas"
 
-#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_CategorÃa:"
 
-#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Nova tarefa..."
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tarefas (%d)"
diff --git a/po/id.po b/po/id.po
index f70f7f4..c8d8175 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,25 +1,26 @@
 # Indonesian translation of tasks.
 # Copyright (C) 2007 Free Software Foundation
 # This file is distributed under the same license as the tasks package.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-02 20:03+0700\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-02 21:36+0700\n"
 "Last-Translator: Arief M Utama <arief utama gmail com>\n"
 "Language-Team: Indonesian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "Daftar tugas pribadi"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tugas-tugas"
 
@@ -27,87 +28,480 @@ msgstr "Tugas-tugas"
 msgid "To Do list"
 msgstr "Daftar tugas"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "hari ini"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "esok"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "kemarin"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "tanggal belum dipilih"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Ringkasan"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Kategori:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Tidak ada"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Tugas baru..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Kategori:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Rendah"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Tinggi"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "Ringka_san:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Kategori:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Prioritas:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "Jat_uh Tempo:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "Alamat _Web:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "Pen_jelasan:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "hari ini"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "esok"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "kemarin"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (hingga %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Tidak ada"
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Tugas-tugas"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Selesai"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Ringkasan"
 
-#: ../src/gtk/main.c:173
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Tugas-tugas"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Daftar tugas"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Kategori:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Tugas baru..."
 
-#. TODO: Use GTK stock label
-#: ../src/gtk/main.c:178
-msgid "_Add"
-msgstr "T_ambah"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Tugas-tugas"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Tugas baru..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Tugas baru..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Tugas baru..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (hingga %s)"
 
+#~ msgid "_Add"
+#~ msgstr "T_ambah"
diff --git a/po/it.po b/po/it.po
index 7759dbc..ca922f8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tasks 0.4\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2009-07-10 15:36+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-22 09:17+0000\n"
 "PO-Revision-Date: 2009-07-15 22:33+0200\n"
 "Last-Translator: Flavia Weisghizzi <flavia weisghizzi it>\n"
 "Language-Team: Italian <tp lists linux it>\n"
@@ -455,7 +454,6 @@ msgid "_Mark Complete"
 msgstr "_Segna come completata"
 
 #: ../src/gtk/main.c:621
-#| msgid "To Do list"
 msgid " - a to do list"
 msgstr " - un elenco di attivitÃ  da svolgere"
 
diff --git a/po/ja.po b/po/ja.po
index 80bc0f4..5979af4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -170,70 +170,66 @@ msgstr "12æ??|12æ??"
 #. Translators: just translate "today"
 #: ../libkoto/koto-date-parser.c:468
 msgid "^(?<task>.+) today$"
-msgstr "^(?<task>.+) ä»?æ?¥$"
+msgstr "^(?<task>.+)ï¼?ä»?æ?¥$"
 
 #. Translators: just translate "tomorrow"
 #: ../libkoto/koto-date-parser.c:472
 msgid "^(?<task>.+) tomorrow$"
-msgstr "^(?<task>.+) æ??æ?¥$"
+msgstr "^(?<task>.+)ï¼?æ??æ?¥$"
 
 #. Translators: just translate "yesterday"
 #: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) yesterday$"
-msgstr "^(?<task>.+) æ?¨æ?¥$"
+msgstr "^(?<task>.+)ï¼?æ?¨æ?¥$"
 
-# unable to provide translation for unclear and contatnate string
+# shorter vesion of day does not work in sentence
 #. Translators: just translate "next"
 #: ../libkoto/koto-date-parser.c:480
 #, c-format
 msgid "^(?<task>.+) next (?<day>%s)$"
-msgstr "^(?<task>.+) next (?<day>%s)$"
+msgstr "^(?<task>.+)ï¼?æ¬¡ã?®(?<day>%s)$"
 
+# shorter vesion of day does not work in sentence
 #: ../libkoto/koto-date-parser.c:481
 msgid "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|sat|sun"
 msgstr "æ??æ??æ?¥|ç?«æ??æ?¥|æ°´æ??æ?¥|æ?¨æ??æ?¥|é??æ??æ?¥|å??æ??æ?¥|æ?¥æ??æ?¥|æ??|ç?«|æ°´|æ?¨|é??|å??|æ?¥"
 
-# unable to provide translation for unclear and contatnate string
 #. Translators: just translate this|on|by|due to contain relevant words in
 #. your language, moving the day block is required.
 #: ../libkoto/koto-date-parser.c:489
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
-msgstr "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr "^(?<task>.+)ï¼?(ä»?é?±|æ¬¡ã?®|æ¬¡)ï¼? (?<day>\\w+)$"
 
-# unable to provide translation for unclear and contatnate string
 #. Translators: replace by|due|on with suitable words, and re-order the day
 #. and month expressions as suitable
 #: ../libkoto/koto-date-parser.c:494
 msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr "^(?<task>.+) (?:æ¬¡|æ??é??|æ¬¡ã?®) (?<month>\\d{1,2})/(?<day>\\d{1,2})$"
 
-# unable to provide translation for unclear and contatnate string
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language.
 #: ../libkoto/koto-date-parser.c:499
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr "^(?<task>.+)ï¼?(?:æ¬¡|æ??é??|æ¬¡ã?®)ï¼?? (?<day>\\d{1,2})(?:|||)?$"
 
-# unable to provide translation for unclear and contatnate string
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language, and move the month block if required.
 #: ../libkoto/koto-date-parser.c:504
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr "^(?<task>.+) (?:æ¬¡|æ??é??|æ¬¡ã?®)? (?<day>\\d{1,2})(?:|||)? (?<month>\\w+)$"
 
-# unable to provide translation for unclear and contatnate string
 #. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
 #. words in your language, and move the month block if required.
 #: ../libkoto/koto-date-parser.c:509
 msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr "^(?<task>.+) (?:æ¬¡|æ??é??|æ¬¡ã?®)? (?<month>\\w+) (?<day>\\d{1,2})(?:|||)?$"
 
 # unable to provide translation for unclear and contatnate string
 #. Translators: just translate this|on|by|due to contain relevant words in
 #. your language
 #: ../libkoto/koto-date-parser.c:514
 msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
-msgstr "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr "^(?<task>.+) (?:æ¬¡|æ??é??|æ¬¡ã?®)? (?<digits>[\\d/-]+)$"
 
 # unable to provide translation for unclear and contatnate string
 #. Translators: just translate this|on|by|due to contain relevant words in
@@ -241,7 +237,7 @@ msgstr "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 #. English, w34 means "week 34".
 #: ../libkoto/koto-date-parser.c:520
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr "^(?<task>.+) (?:æ¬¡|æ??é??|æ¬¡ã?®)? w(?<week>\\d{1,2})$"
 
 # unable to provide translation for unclear and contatnate string
 #. Translators: just translate in ... days to contain relevant words in your
@@ -249,7 +245,7 @@ msgstr "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 #. translated.
 #: ../libkoto/koto-date-parser.c:526
 msgid "^(?<task>.+) in (?<days>\\d+) days?$"
-msgstr "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr "^(?<days>\\d+)æ?¥ä»¥å??ã?«(?<task>.+) ?$"
 
 # unable to provide translation for unclear and contatnate string
 #. Translators: just translate in ... weeksto contain relevant words in your
@@ -257,7 +253,7 @@ msgstr "^(?<task>.+) in (?<days>\\d+) days?$"
 #. translated.
 #: ../libkoto/koto-date-parser.c:532
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
-msgstr "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr "^(?<weeks>\\d+)é?±é??ä»¥å??ã?«(?<task>.+)?$"
 
 #: ../libkoto/koto-entry.c:98
 msgid "Insert"
diff --git a/po/nb.po b/po/nb.po
index 8e90e28..672aa36 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-15 12:47+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-11-15 12:51+0100\n"
 "Last-Translator: Espen Stefansen <espens svn gnome org>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb lister ping uio no>\n"
@@ -19,10 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Personlig oppgavehÃ¥ndterer"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:441
-#: ../src/gtk/main.c:495
-#: ../src/hildon/hildon-tasks.c:429
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -30,31 +28,250 @@ msgstr "Oppgaver"
 msgid "To Do list"
 msgstr "Â«MÃ¥ gjÃ¸reÂ»-liste"
 
-#: ../libkoto/ical-util.c:58
-msgid "today"
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
 msgstr "idag"
 
-#: ../libkoto/ical-util.c:60
-msgid "tomorrow"
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
 msgstr "imorgen"
 
-#: ../libkoto/ical-util.c:62
-msgid "yesterday"
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
 msgstr "igÃ¥r"
 
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "Alle"
+
 #: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "ingen dato satt"
 
-#: ../libkoto/koto-date-combo.c:384
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Idag"
 
-#: ../libkoto/koto-date-combo.c:387
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Sammendrag"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+#, fuzzy
+msgid "Delete"
+msgstr "Slett oppgave"
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Ny kategori"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr "Skriv inn navn pÃ¥ den nye kategorien:"
+
 #: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Ingen"
 
+#: ../libkoto/koto-meta-group.c:48
+msgid "New Group..."
+msgstr "Ny gruppe..."
+
+#: ../libkoto/koto-no-category-group.c:32
+msgid "No Category"
+msgstr "Ingen kategori"
+
 #: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Lav"
@@ -91,196 +308,203 @@ msgstr "_Nett-adresse:"
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
 
-#: ../libkoto/koto-task-editor-dialog.c:71
-#: ../src/hildon/hildon-tasks.c:318
-#: ../src/omoko/openmoko-tasks.c:208
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Er du sikker pÃ¥ at du vil slette Â«%sÂ»?"
 
-#: ../libkoto/koto-task-editor-dialog.c:74
-#: ../src/hildon/hildon-tasks.c:321
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hvis du sletter et innslag, sÃ¥ er det borte for godt."
 
-#: ../libkoto/koto-task-editor-dialog.c:84
-#: ../src/gtk/main.c:361
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "Slett oppgave %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr "Rediger oppgave %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:279
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "Det_aljer"
 
-#: ../libkoto/koto-task-editor-dialog.c:338
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Notater</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:340
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Notater"
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - oppgaver"
 
-#: ../libkoto/koto-task-view.c:78
-#: ../src/gtk/main.c:340
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
 msgid "Complete Task"
 msgstr "FullfÃ¸r oppgave"
 
-#: ../libkoto/koto-task-view.c:119
-#, c-format
-msgid "%s (due %s)"
-msgstr "%s (senest %s)"
-
-#: ../libkoto/koto-task-view.c:399
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../libkoto/koto-task-view.c:406
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Sammendrag"
 
-#: ../libkoto/koto-all-group.c:28
-msgid "All"
-msgstr "Alle"
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:422
-msgid "New Category"
-msgstr "Ny kategori"
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:433
-msgid "Enter the name of the new category:"
-msgstr "Skriv inn navn pÃ¥ den nye kategorien:"
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
 
-#: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Ny gruppe..."
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
 
-#: ../libkoto/koto-no-category-group.c:32
-msgid "No Category"
-msgstr "Ingen kategori"
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
 
-#: ../src/gtk/main.c:200
+#: ../src/gtk/main.c:205
 #, c-format
 msgid "Add task %s"
 msgstr "Legg til oppgave %s"
 
-#: ../src/gtk/main.c:403
+#: ../src/gtk/main.c:424
 msgid "Remove Completed"
 msgstr "Fjern fullfÃ¸rte"
 
-#: ../src/gtk/main.c:426
-#: ../src/hildon/hildon-tasks.c:414
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
-"Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
-"Tasks er fri programvare. Du kan redistribuere og/eller endre programmet under betingelsene gitt i GNU General Public License som utgitt av Free Software Foundation; enten versjon 2 av lisensen, eller (hvis du Ã¸nsker det) enhver senere versjon.\n"
+"Tasks er fri programvare. Du kan redistribuere og/eller endre programmet "
+"under betingelsene gitt i GNU General Public License som utgitt av Free "
+"Software Foundation; enten versjon 2 av lisensen, eller (hvis du Ã¸nsker det) "
+"enhver senere versjon.\n"
 "\n"
-"Tasks distribueres i hÃ¥p om at programmet er nyttig, men UTEN NOEN GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET BESTEMT FORMÃ?L. Se GNU General Public License for detaljer.\n"
+"Tasks distribueres i hÃ¥p om at programmet er nyttig, men UTEN NOEN GARANTI, "
+"ikke engang implisitt garanti om at det er SALGBART eller PASSER ET BESTEMT "
+"FORMÃ?L. Se GNU General Public License for detaljer.\n"
 "\n"
-"Du skal ha mottatt en kopi av GNU General Public License sammen med Tasks. Hvis ikke sÃ¥ skriv til Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Du skal ha mottatt en kopi av GNU General Public License sammen med Tasks. "
+"Hvis ikke sÃ¥ skriv til Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:435
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr "Espen Stefansen <espenas gmail com>"
 
-#: ../src/gtk/main.c:451
-#: ../src/hildon/hildon-tasks.c:439
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Pimlico-prosjektet"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:459
+#: ../src/gtk/main.c:479
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../src/gtk/main.c:461
-#: ../src/hildon/hildon-tasks.c:453
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "_Fjern fullfÃ¸rte"
 
-#: ../src/gtk/main.c:464
+#: ../src/gtk/main.c:484
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/gtk/main.c:466
+#: ../src/gtk/main.c:486
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtk/main.c:472
+#: ../src/gtk/main.c:492
 msgid "Edit..."
 msgstr "Rediger ..."
 
 #. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:474
-#: ../src/hildon/hildon-tasks.c:451
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
 msgid "_Mark Complete"
 msgstr "_Marker som fullfÃ¸rt"
 
-#: ../src/gtk/main.c:576
-#: ../src/hildon/hildon-tasks.c:550
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Â«MÃ¥ gjÃ¸reÂ»-liste"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: ../src/gtk/main.c:601
-#: ../src/hildon/hildon-tasks.c:570
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Ny oppgave ..."
 
-#: ../src/gtk/main.c:625
-#: ../src/hildon/hildon-tasks.c:594
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Oppgaver (%d)"
 
-#: ../src/hildon/hildon-tasks.c:380
+#: ../src/hildon/hildon-tasks.c:388
 msgid "Are you sure you want to delete all completed tasks?"
 msgstr "Er du sikker pÃ¥ at du vil slette alle fullfÃ¸rte oppgaver?"
 
-#: ../src/hildon/hildon-tasks.c:382
+#: ../src/hildon/hildon-tasks.c:390
 msgid "Deleting completed tasks means they are permanently lost."
 msgstr "Ã? slette fullfÃ¸rte oppgaver vil si at de er slettet for godt."
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
 #. dummy
-#: ../src/hildon/hildon-tasks.c:448
+#: ../src/hildon/hildon-tasks.c:456
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: ../src/hildon/hildon-tasks.c:449
+#: ../src/hildon/hildon-tasks.c:457
 msgid "Edit Task..."
 msgstr "Rediger oppgave ..."
 
-#: ../src/hildon/hildon-tasks.c:452
+#: ../src/hildon/hildon-tasks.c:460
 msgid "Delete Task"
 msgstr "Slett oppgave"
 
-#: ../src/hildon/hildon-tasks.c:454
+#: ../src/hildon/hildon-tasks.c:462
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../src/hildon/hildon-tasks.c:455
+#: ../src/hildon/hildon-tasks.c:463
 msgid "About"
 msgstr "Om"
 
-#: ../src/omoko/openmoko-tasks.c:177
+#: ../src/omoko/openmoko-tasks.c:186
 msgid "New task"
 msgstr "Ny oppgave"
 
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (senest %s)"
+
 #~ msgid "_Add"
 #~ msgstr "_Legg till"
-
diff --git a/po/nl.po b/po/nl.po
index 9b5b67a..7dab117 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 11:47+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-02 22:27+0100 \n"
 "Last-Translator: Wouter Bolsterlee <wbolster gnome org>\n"
 "Language-Team: Dutch <nl li org\n"
@@ -21,7 +21,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Persoonlijk taakbeheer"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Taken"
 
@@ -29,86 +30,480 @@ msgstr "Taken"
 msgid "To Do list"
 msgstr "Takenlijst"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "vandaag"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "morgen"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "gisteren"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "geen datum ingesteld"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Samenvatting"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Categorie:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Geen"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Nieuwe taakâ?¦"
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Categorie:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Laag"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Hoog"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Samenvatting:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Categorie:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Verloopdatum:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Website:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_Beschrijving:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "vandaag"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "morgen"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "gisteren"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (verloopdatum: %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Geen"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Taken"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Afgerond"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Taken"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Takenlijst"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Categorie:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Nieuwe taakâ?¦"
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Toevoegen"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Taken"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Nieuwe taakâ?¦"
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Nieuwe taakâ?¦"
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Nieuwe taakâ?¦"
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (verloopdatum: %s)"
+
+#~ msgid "_Add"
+#~ msgstr "_Toevoegen"
diff --git a/po/pl.po b/po/pl.po
index d6f5afe..c228ade 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-07 18:54+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2008-02-07 18:58+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski gmail com>\n"
 "Language-Team: Tomasz Dominikowski (Aviary.pl) <dominikowski gmail com>\n"
@@ -16,16 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "MenedÅ¼er prywatnych zadaÅ?"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:441
-#: ../src/gtk/main.c:495
-#: ../src/hildon/hildon-tasks.c:429
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -33,18 +32,32 @@ msgstr "Zadania"
 msgid "To Do list"
 msgstr "Lista zadaÅ?"
 
-#: ../libkoto/ical-util.c:58
-msgid "today"
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
 msgstr "dzisiaj"
 
-#: ../libkoto/ical-util.c:60
-msgid "tomorrow"
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
 msgstr "jutro"
 
-#: ../libkoto/ical-util.c:62
-msgid "yesterday"
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
 msgstr "wczoraj"
 
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
 #: ../libkoto/koto-all-group.c:28
 msgid "All"
 msgstr "Wszystkie"
@@ -53,14 +66,187 @@ msgstr "Wszystkie"
 msgid "no date set"
 msgstr "data nieustalona"
 
-#: ../libkoto/koto-date-combo.c:384
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../libkoto/koto-date-combo.c:387
+#: ../libkoto/koto-date-combo.c:412
 msgid "Never"
 msgstr "Nigdy"
 
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Podsumowanie"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
 #: ../libkoto/koto-entry.c:98
 msgid "Insert"
 msgstr "Wstaw"
@@ -69,11 +255,11 @@ msgstr "Wstaw"
 msgid "Delete"
 msgstr "UsuÅ?"
 
-#: ../libkoto/koto-field-editor-factory.c:422
+#: ../libkoto/koto-field-editor-factory.c:417
 msgid "New Category"
 msgstr "Nowa kategoria"
 
-#: ../libkoto/koto-field-editor-factory.c:433
+#: ../libkoto/koto-field-editor-factory.c:428
 msgid "Enter the name of the new category:"
 msgstr "ProszÄ? wprowadziÄ? nazwÄ? nowej kategorii:"
 
@@ -125,61 +311,52 @@ msgstr "_Adres URL:"
 msgid "D_escription:"
 msgstr "_Opis:"
 
-#: ../libkoto/koto-task-editor-dialog.c:71
-#: ../src/hildon/hildon-tasks.c:318
-#: ../src/omoko/openmoko-tasks.c:211
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Na pewno usunÄ?Ä? \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:74
-#: ../src/hildon/hildon-tasks.c:321
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "JeÅ?li element zostanie usuniÄ?ty, zostanie ostatecznie utracony."
 
-#: ../libkoto/koto-task-editor-dialog.c:84
-#: ../src/gtk/main.c:361
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "UsuÅ? zadanie %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr "Modyfikuj zadanie %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:279
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "_SzczegÃ³Å?y"
 
-#: ../libkoto/koto-task-editor-dialog.c:338
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Notatki</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:340
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Notatki"
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Zadania"
 
-#: ../libkoto/koto-task-view.c:78
-#: ../src/gtk/main.c:340
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
 msgid "Complete Task"
 msgstr "ZakoÅ?cz zadanie"
 
-#: ../libkoto/koto-task-view.c:119
-#, c-format
-msgid "%s (due %s)"
-msgstr "%s (termin %s)"
-
-#: ../libkoto/koto-task-view.c:399
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Wykonane"
 
-#: ../libkoto/koto-task-view.c:406
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Podsumowanie"
 
@@ -205,120 +382,136 @@ msgstr "PonÃ³w"
 msgid "Original Sample"
 msgstr "Pierwotny wzÃ³r"
 
-#: ../src/gtk/main.c:200
+#: ../src/gtk/main.c:205
 #, c-format
 msgid "Add task %s"
 msgstr "Dodaj zadanie %s"
 
-#: ../src/gtk/main.c:403
+#: ../src/gtk/main.c:424
 msgid "Remove Completed"
 msgstr "UsuÅ? ukoÅ?czone"
 
-#: ../src/gtk/main.c:426
-#: ../src/hildon/hildon-tasks.c:414
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
-"Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
-"Tasks is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:435
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr "Tomasz Dominikowski <dominikowski gmail com>"
 
-#: ../src/gtk/main.c:451
-#: ../src/hildon/hildon-tasks.c:439
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Projekt Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:459
+#: ../src/gtk/main.c:479
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: ../src/gtk/main.c:461
-#: ../src/hildon/hildon-tasks.c:453
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "_UsuÅ? ukoÅ?czone"
 
-#: ../src/gtk/main.c:464
+#: ../src/gtk/main.c:484
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/gtk/main.c:466
+#: ../src/gtk/main.c:486
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtk/main.c:472
+#: ../src/gtk/main.c:492
 msgid "Edit..."
 msgstr "Modyfikuj..."
 
 #. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:474
-#: ../src/hildon/hildon-tasks.c:451
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
 msgid "_Mark Complete"
 msgstr "Zaznacz jako _ukoÅ?czone"
 
-#: ../src/gtk/main.c:576
-#: ../src/hildon/hildon-tasks.c:550
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Lista zadaÅ?"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "Ka_tegoria:"
 
-#: ../src/gtk/main.c:601
-#: ../src/hildon/hildon-tasks.c:570
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Nowe zadanie..."
 
-#: ../src/gtk/main.c:625
-#: ../src/hildon/hildon-tasks.c:594
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Zadania (%d)"
 
-#: ../src/hildon/hildon-tasks.c:380
+#: ../src/hildon/hildon-tasks.c:388
 msgid "Are you sure you want to delete all completed tasks?"
 msgstr "Na pewno usunÄ?Ä? wszystkie ukoÅ?czone zadanie?"
 
-#: ../src/hildon/hildon-tasks.c:382
+#: ../src/hildon/hildon-tasks.c:390
 msgid "Deleting completed tasks means they are permanently lost."
 msgstr "UsuniÄ?cie ukoÅ?czonych zadaÅ? spowoduje ich ostatecznÄ? utratÄ?."
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
 #. dummy
-#: ../src/hildon/hildon-tasks.c:448
+#: ../src/hildon/hildon-tasks.c:456
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: ../src/hildon/hildon-tasks.c:449
+#: ../src/hildon/hildon-tasks.c:457
 msgid "Edit Task..."
 msgstr "Modyfikuj zadanie..."
 
-#: ../src/hildon/hildon-tasks.c:452
+#: ../src/hildon/hildon-tasks.c:460
 msgid "Delete Task"
 msgstr "UsuÅ? zadanie"
 
-#: ../src/hildon/hildon-tasks.c:454
+#: ../src/hildon/hildon-tasks.c:462
 msgid "Quit"
 msgstr "ZakoÅ?cz"
 
-#: ../src/hildon/hildon-tasks.c:455
+#: ../src/hildon/hildon-tasks.c:463
 msgid "About"
 msgstr "O programie"
 
-#: ../src/omoko/openmoko-tasks.c:180
+#: ../src/omoko/openmoko-tasks.c:186
 msgid "New task"
 msgstr "Nowe zadanie"
 
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (termin %s)"
+
 #~ msgid "Uncategorised"
 #~ msgstr "Bez kategorii"
+
 #~ msgid "_Add"
 #~ msgstr "Dod_aj"
-
diff --git a/po/pt.po b/po/pt.po
index ea24770..b4c404f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,25 +2,26 @@
 # Copyright Â© 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the tasks package.
 # Carlos Lisboa <carloslisboa gmail com>, 2007.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 01:03+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-02 10:53+0000\n"
 "Last-Translator: Carlos Lisboa <carloslisboa gmail com>\n"
 "Language-Team: Portuguese <traduz debianpt org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "Gestor pessoal de tarefas"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -28,87 +29,480 @@ msgstr "Tarefas"
 msgid "To Do list"
 msgstr "Lista de tarefas a realizar"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "hoje"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "amanhÃ£"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "ontem"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "sem data estabelecida"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Hoje"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Resumo"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Categoria:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Nova tarefa..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Categoria:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Baixa"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Alta"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Resumo:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Categoria:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Finaliza em:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "EndereÃ§o _Web:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_DescriÃ§Ã£o:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "hoje"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "amanhÃ£"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "ontem"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (para %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Nenhum"
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Tarefas"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "ConcluÃda"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Resumo"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Tarefas"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Lista de tarefas a realizar"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Categoria:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Nova tarefa..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Adicionar"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Tarefas"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Nova tarefa..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Nova tarefa..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Nova tarefa..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (para %s)"
 
+#~ msgid "_Add"
+#~ msgstr "_Adicionar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8f7f78..d4db99d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,15 +10,13 @@ msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-15 09:17+0000\n"
-"PO-Revision-Date: 2009-07-20 16:52-0800\n"
-"Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
+"PO-Revision-Date: 2009-07-16 11:33-0800\n"
+"Last-Translator: GLSPTB_Gabor <gaborx k becht intel com>\n"
 "Language-Team: Portuguese/Brazil <gnome-l10n-br listas cipsga org br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
diff --git a/po/ro.po b/po/ro.po
index c5ea30f..a5d2aaf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,22 +10,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-29 04:05+0300\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-05-29 04:40+0300\n"
 "Last-Translator: Eddy PetriÈ?or <eddy petrisor gmail com>\n"
 "Language-Team: Romanian <debian-l10n-romanian lists debian org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "Manager personal de sarcini"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:405 ../src/gtk/main.c:463
-#: ../src/omoko/openmoko-tasks.c:389 ../src/omoko/openmoko-tasks.c:482
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Sarcini"
 
@@ -33,118 +34,372 @@ msgstr "Sarcini"
 msgid "To Do list"
 msgstr "Lista Nu uita "
 
-#: ../libkoto/ical-util.c:58
-msgid "today"
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
 msgstr "azi"
 
-#: ../libkoto/ical-util.c:60
-msgid "tomorrow"
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
 msgstr "mÃ¢ine"
 
-#: ../libkoto/ical-util.c:62
-msgid "yesterday"
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
 msgstr "ieri"
 
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "Toate"
+
 #: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "datÄ? nestabilitÄ?"
 
-#: ../libkoto/koto-date-combo.c:384
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Azi"
 
-#: ../libkoto/koto-date-combo.c:387 ../libkoto/koto-group-store.c:154
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Sumar"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Categorie nouÄ?"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
 # XXX: is this the cat
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "nici una"
 
-#: ../libkoto/koto-group-store.c:146
-msgid "All"
-msgstr "Toate"
-
-#: ../libkoto/koto-group-store.c:162
+#: ../libkoto/koto-meta-group.c:48
 msgid "New Group..."
 msgstr "Grup nou..."
 
-#: ../libkoto/koto-priority-combo.c:111
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Categorie nouÄ?"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "MicÄ?"
 
-#: ../libkoto/koto-priority-combo.c:113
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libkoto/koto-priority-combo.c:115
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Mare"
 
-#: ../libkoto/koto-task-editor.c:98
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Sumar:"
 
-#: ../libkoto/koto-task-editor.c:99
+#: ../libkoto/koto-task-editor.c:56
 msgid "Ca_tegory:"
 msgstr "Ca_tegorie:"
 
-#: ../libkoto/koto-task-editor.c:100
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Prioritate:"
 
-#: ../libkoto/koto-task-editor.c:101
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "DatÄ? li_mitÄ?:"
 
-#: ../libkoto/koto-task-editor.c:102
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "AdresÄ? de _web:"
 
-#: ../libkoto/koto-task-editor.c:103
+#: ../libkoto/koto-task-editor.c:60
 msgid "D_escription:"
 msgstr "D_escriere:"
 
-#: ../libkoto/koto-task-editor.c:457
-msgid "New Category"
-msgstr "Categorie nouÄ?"
-
-#: ../libkoto/koto-task-editor-dialog.c:63 ../src/gtk/main.c:296
-#: ../src/omoko/openmoko-tasks.c:277
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Sigur doriÈ?i sÄ? È?tergeÈ?i â??%sâ???"
 
-#: ../libkoto/koto-task-editor-dialog.c:66 ../src/gtk/main.c:299
-#: ../src/omoko/openmoko-tasks.c:280
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "DacÄ? È?tergeÈ?i un element, este pierdut definitiv."
 
-#: ../libkoto/koto-task-editor-dialog.c:273
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
+msgid "Delete Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:101
+#, c-format
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+# XXX: is this the cat
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "nici una"
+
 # ?oare?
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, c-format
 msgid "%s - Tasks"
 msgstr "%s - Tasks"
 
-#: ../libkoto/koto-task-view.c:109
-#, c-format
-msgid "%s (due %s)"
-msgstr "%s (termen %s)"
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
 
-#: ../libkoto/koto-task-view.c:321
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Gata"
 
-#: ../libkoto/koto-task-view.c:328
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Sumar"
 
-#: ../src/gtk/main.c:358 ../src/omoko/openmoko-tasks.c:342
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Sigur doriÈ?i sÄ? È?tergeÈ?i toate sarcinile terminate?"
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
 
-#: ../src/gtk/main.c:360 ../src/omoko/openmoko-tasks.c:344
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "DacÄ? È?tergeÈ?i sarcini terminate le veÈ?i pierde definitiv."
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
 
-#: ../src/gtk/main.c:390 ../src/omoko/openmoko-tasks.c:374
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+#, fuzzy
+msgid "Remove Completed"
+msgstr "È?terge ce e _terminat"
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
 "Tasks is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -160,54 +415,106 @@ msgid ""
 "Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
 "Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
-"Tasks este software liber; Ã®l puteÈ?i redistribui È?i/sau modifica Ã®n termenii licenÈ?ei GNU General Public License cum a fost publicat de Free Software "
-"Foundation; fie versiunea 2 a licenÈ?ei, fie (la opÈ?iunea dumneavoatstrÄ?) orice altÄ? versiune ulterioarÄ?.\n"
+"Tasks este software liber; Ã®l puteÈ?i redistribui È?i/sau modifica Ã®n termenii "
+"licenÈ?ei GNU General Public License cum a fost publicat de Free Software "
+"Foundation; fie versiunea 2 a licenÈ?ei, fie (la opÈ?iunea dumneavoatstrÄ?) "
+"orice altÄ? versiune ulterioarÄ?.\n"
 "\n"
-"Tasks este distribuit Ã®n speranÈ?a cÄ? va fi de folos, dar FÄ?RÄ? NICI UN FEL DE GARANÈ?IE; chiar È?i fÄ?rÄ? orice garanÈ?ie de POTRIVIRE LA VREUN ANUME SCOP. A se vedea LicenÈ?a GNU General Public License pentru mai multe detalii.\n"
+"Tasks este distribuit Ã®n speranÈ?a cÄ? va fi de folos, dar FÄ?RÄ? NICI UN FEL DE "
+"GARANÈ?IE; chiar È?i fÄ?rÄ? orice garanÈ?ie de POTRIVIRE LA VREUN ANUME SCOP. A "
+"se vedea LicenÈ?a GNU General Public License pentru mai multe detalii.\n"
 "\n"
-"Ar fi trebuit sÄ? fi primit o copie a licenÈ?ei GNU General Public License Ã®mpreunÄ? Tasks; dacÄ? nu, scrieÈ?i cÄ?tre Free Software Foundation, Inc., 51 Franklin St, "
-"Fifth Floor, Boston, MA 0110-1301, USA"
+"Ar fi trebuit sÄ? fi primit o copie a licenÈ?ei GNU General Public License "
+"Ã®mpreunÄ? Tasks; dacÄ? nu, scrieÈ?i cÄ?tre Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
 
-#: ../src/gtk/main.c:411 ../src/omoko/openmoko-tasks.c:395
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr "Eddy PetriÈ?or <eddy petrisor gmail com>"
 
-#: ../src/gtk/main.c:415
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Proiectul Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:434
+#: ../src/gtk/main.c:479
 msgid "_Task"
 msgstr "_SarcinÄ?"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:438
-msgid "_Mark Complete"
-msgstr "_MarcheazÄ? ca terminat"
-
-#: ../src/gtk/main.c:440
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "È?terge ce e _terminat"
 
-#: ../src/gtk/main.c:443
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../src/gtk/main.c:521
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr "_MarcheazÄ? ca terminat"
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Lista Nu uita "
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: ../src/gtk/main.c:541
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "SarcinÄ? nouÄ?..."
 
-#: ../src/gtk/main.c:565 ../src/omoko/openmoko-tasks.c:221
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Sarcini (%d)"
 
-#: ../src/omoko/openmoko-tasks.c:127
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr "Sigur doriÈ?i sÄ? È?tergeÈ?i toate sarcinile terminate?"
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr "DacÄ? È?tergeÈ?i sarcini terminate le veÈ?i pierde definitiv."
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "SarcinÄ? nouÄ?"
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "SarcinÄ? nouÄ?..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
 msgid "New task"
 msgstr "SarcinÄ? nouÄ?"
 
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (termen %s)"
diff --git a/po/ru.po b/po/ru.po
index d692d2b..bdfc4ad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,17 +3,12 @@
 # This file is distributed under the same license as the Tasks package.
 # Andrey Fedoseev <andrey fedoseev gmail com>, 2007
 #
-#: libkoto/koto-date-combo.c:353 libkoto/koto-group-store.c:100
-#: libkoto/koto-hint-entry.c:61 libkoto/koto-hint-entry.c:166
-#: libkoto/koto-hint-entry.c:207 libkoto/koto-task-editor.c:167
-#: libkoto/koto-task-editor.c:301 libkoto/koto-task-store.c:79
-#: libkoto/koto-task-summary.c:57
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Tasks 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-15 23:57+0600\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-06-15 23:57+0600\n"
 "Last-Translator: Andrey Fedoseev <andrey fedoseev gmail com>\n"
 "Language-Team: Russian <ru li org>\n"
@@ -21,626 +16,390 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libkoto/ical-util.c:58 libkoto/ical-util.c:101
-msgid "today"
+#: ../data/tasks.desktop.in.h:1
+msgid "Personal task manager"
+msgstr ""
+
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
+msgid "Tasks"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
+
+#: ../data/tasks.desktop.in.h:3
+msgid "To Do list"
+msgstr ""
+
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
 msgstr "Ñ?ÐµÐ³Ð¾Ð´Ð½Ñ?"
 
-#: libkoto/ical-util.c:60 libkoto/ical-util.c:105
-msgid "tomorrow"
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
 msgstr "Ð·Ð°Ð²Ñ?Ñ?Ð°"
 
-#: libkoto/ical-util.c:62 libkoto/ical-util.c:109
-msgid "yesterday"
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
 msgstr "Ð²Ñ?ÐµÑ?Ð°"
 
-#: libkoto/ical-util.c:66
-#, c-format
-msgid "%A"
-msgstr "%A"
+#: ../libkoto/ical-util.c:70
+#, fuzzy, c-format
+msgid "due %A"
+msgstr "Ð? %s"
 
-#: libkoto/ical-util.c:70 libkoto/koto-date-combo.c:59
-#, c-format
-msgid "%x"
-msgstr "%x"
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, fuzzy, c-format
+msgid "due %x"
+msgstr "Ð? %s"
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "Ð?Ñ?Ðµ"
 
-#: libkoto/ical-util.c:81
-msgid "BAD WEEKDAY"
-msgstr "Ð?Ð?Ð?Ð?Ð Ð?Ð«Ð? Ð?Ð?Ð?Ð¬ Ð?Ð?Ð?Ð?Ð?Ð?"
+#: ../libkoto/koto-date-combo.c:62
+msgid "no date set"
+msgstr "Ð´Ð°Ñ?Ð° Ð½Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½Ð°"
+
+#: ../libkoto/koto-date-combo.c:409
+msgid "Today"
+msgstr "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ?"
 
-#: libkoto/ical-util.c:81
-msgid "Monday"
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+#, fuzzy
+msgid "monday|mon"
 msgstr "Ð?Ð¾Ð½ÐµÐ´ÐµÐ»Ñ?Ð½Ð¸Ðº"
 
-#: libkoto/ical-util.c:81
-msgid "Tuesday"
+#: ../libkoto/koto-date-parser.c:81
+#, fuzzy
+msgid "tuesday|tue"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð½Ð¸Ðº"
 
-#: libkoto/ical-util.c:81
-msgid "Wednesday"
+#: ../libkoto/koto-date-parser.c:82
+#, fuzzy
+msgid "wednesday|wed"
 msgstr "Ð¡Ñ?ÐµÐ´Ð°"
 
-#: libkoto/ical-util.c:82
-msgid "Thursday"
+#: ../libkoto/koto-date-parser.c:83
+#, fuzzy
+msgid "thursday|thu"
 msgstr "Ð§ÐµÑ?Ð²ÐµÑ?Ð³"
 
-#: libkoto/ical-util.c:82
-msgid "Friday"
+#: ../libkoto/koto-date-parser.c:84
+#, fuzzy
+msgid "friday|fri"
 msgstr "Ð?Ñ?Ñ?Ð½Ð¸Ñ?Ð°"
 
-#: libkoto/ical-util.c:82
-msgid "Saturday"
+#: ../libkoto/koto-date-parser.c:85
+#, fuzzy
+msgid "saturday|sat"
 msgstr "Ð¡Ñ?Ð±Ð±Ð¾Ñ?Ð°"
 
-#: libkoto/ical-util.c:82
-msgid "Sunday"
+#: ../libkoto/koto-date-parser.c:86
+#, fuzzy
+msgid "sunday|sun"
 msgstr "Ð?Ð¾Ñ?ÐºÑ?ÐµÑ?ÐµÐ½Ñ?Ðµ"
 
-#: libkoto/ical-util.c:91
-msgid "C"
-msgstr "C"
-
-#: libkoto/ical-util.c:97
-msgid "05/01/01"
-msgstr "05/01/01"
-
-#: libkoto/koto-date-combo.c:62
-msgid "no date set"
-msgstr "Ð´Ð°Ñ?Ð° Ð½Ðµ Ñ?ÐºÐ°Ð·Ð°Ð½Ð°"
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
 
-#: libkoto/koto-date-combo.c:223 libkoto/koto-date-combo.c:332
-#: libkoto/koto-date-combo.c:429
-msgid "date"
-msgstr "Ð´Ð°Ñ?Ð°"
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
 
-#: libkoto/koto-date-combo.c:369
-msgid "button-release-event"
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
 msgstr ""
 
-#: libkoto/koto-date-combo.c:384
-msgid "Today"
-msgstr "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ?"
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
 
-#: libkoto/koto-date-combo.c:385 libkoto/koto-date-combo.c:388
-#: src/gtk/main.c:549 src/omoko/openmoko-tasks.c:457
-#: src/omoko/openmoko-tasks.c:462
-msgid "clicked"
+#: ../libkoto/koto-date-parser.c:105
+msgid "may"
 msgstr ""
 
-#: libkoto/koto-date-combo.c:387 libkoto/koto-group-store.c:158
-msgid "None"
-msgstr "Ð?ÐµÐ· Ð´Ð°Ñ?Ñ?"
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
 
-#: libkoto/koto-date-combo.c:395
-msgid "day-selected"
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
 msgstr ""
 
-#: libkoto/koto-date-combo.c:396
-msgid "month-changed"
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
 msgstr ""
 
-#: libkoto/koto-group-combo.c:72
-#, c-format
-msgid ": unhandled group type %d"
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
 msgstr ""
 
-#: libkoto/koto-group-combo.c:109 libkoto/koto-priority-combo.c:80
-#: libkoto/koto-task-view.c:138
-msgid "text"
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
 msgstr ""
 
-#: libkoto/koto-group-combo.c:124 libkoto/koto-priority-combo.c:67
-#: libkoto/koto-task-editor.c:550 libkoto/koto-task-view.c:349
-msgid "model"
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
 msgstr ""
 
-#: libkoto/koto-group-combo.c:204 libkoto/koto-priority-combo.c:64
-#: libkoto/koto-task-editor.c:151 libkoto/koto-task-editor.c:203
-#: libkoto/koto-task-editor.c:272 libkoto/koto-task-editor.c:341
-#: libkoto/koto-task-editor.c:492 src/gtk/main.c:550
-#: src/omoko/openmoko-tasks.c:533
-msgid "changed"
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
 msgstr ""
 
-#: libkoto/koto-group-filter-model.c:131
-msgid "child-model"
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:64 libkoto/koto-task-editor.c:503
-#: libkoto/koto-task-store.c:151
-msgid ","
-msgstr ","
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
 
-#: libkoto/koto-group-store.c:146
-msgid "All"
-msgstr "Ð?Ñ?Ðµ"
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
 
-#: libkoto/koto-group-store.c:150
-msgid "Uncategorised"
-msgstr "Ð?ÐµÐ· ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
 
-#: libkoto/koto-group-store.c:166
-msgid "New Group..."
-msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð³Ñ?Ñ?Ð¿Ð¿Ð°..."
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
 
-#: libkoto/koto-group-store.c:170
-#, c-format
-msgid "Unhandled KotoGroupStoreType %d"
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:214 libkoto/koto-group-store.c:255
-msgid "type"
-msgstr "Ñ?Ð¸Ð¿"
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
 
-#: libkoto/koto-group-store.c:220 libkoto/koto-group-store.c:256
-#: libkoto/koto-task-store.c:309 libkoto/koto-task-store.c:354
-msgid "calview"
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:279 libkoto/koto-task-store.c:382
-msgid "objects-added"
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:280 libkoto/koto-task-store.c:383
-msgid "objects-modified"
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:418 libkoto/koto-group-store.c:421
-#: libkoto/koto-group-store.c:426 libkoto/koto-group-store.c:427
-msgid "Foo"
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:419 libkoto/koto-group-store.c:422
-#: libkoto/koto-group-store.c:428
-msgid "Bar"
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:423 libkoto/koto-group-store.c:425
-msgid "Flob"
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:427
-msgid "foo"
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
-#: libkoto/koto-group-store.c:428
-msgid "baR"
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
 msgstr ""
 
-#: libkoto/koto-hint-entry.c:166 libkoto/koto-hint-entry.c:191
-msgid "hint"
+#: ../libkoto/koto-entry.c:125
+#, fuzzy
+msgid "Delete"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?"
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
 msgstr ""
 
-#: libkoto/koto-priority-combo.c:71
+#: ../libkoto/koto-meta-group.c:46
+msgid "None"
+msgstr "Ð?ÐµÐ· Ð´Ð°Ñ?Ñ?"
+
+#: ../libkoto/koto-meta-group.c:48
+msgid "New Group..."
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð³Ñ?Ñ?Ð¿Ð¿Ð°..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Ð?Ð¸Ð·ÐºÐ¸Ð¹"
 
-#: libkoto/koto-priority-combo.c:73
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Ð?Ð¾Ñ?Ð¼Ð°Ð»Ñ?Ð½Ñ?Ð¹"
 
-#: libkoto/koto-priority-combo.c:75
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Ð?Ñ?Ñ?Ð¾ÐºÐ¸Ð¹"
 
-#: libkoto/koto-task.c:27
-msgid "KotoTask"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:58
-msgid "KotoTaskEditor:Field"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:59
-msgid "KotoTaskEditor:Property"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:60
-msgid "KotoTaskEditor:Widget"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:98
-msgid "show-summary"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:98
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Ð?Ð°Ð´Ð°Ñ?Ð°:"
 
-#: libkoto/koto-task-editor.c:99
-msgid "show-category"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:99
+#: ../libkoto/koto-task-editor.c:56
 msgid "Ca_tegory:"
 msgstr "Ð?_Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
 
-#: libkoto/koto-task-editor.c:100
-msgid "show-priority"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:100
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Ð?Ñ?Ð¸Ð¾Ñ?Ð¸Ñ?ÐµÑ?:"
 
-#: libkoto/koto-task-editor.c:101 src/omoko/openmoko-tasks.c:562
-msgid "show-due-date"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:101
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Ð?Ñ?Ð¿Ð¾Ð»Ð½Ð¸Ñ?Ñ? Ðº:"
 
-#: libkoto/koto-task-editor.c:102 src/omoko/openmoko-tasks.c:562
-msgid "show-web-address"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:102
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "Ð?_ÐµÐ±-Ð°Ð´Ñ?ÐµÑ?:"
 
-#: libkoto/koto-task-editor.c:103
-msgid "show-description"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:103
+#: ../libkoto/koto-task-editor.c:60
 msgid "D_escription:"
 msgstr "_Ð?Ð¿Ð¸Ñ?Ð°Ð½Ð¸Ðµ:"
 
-#: libkoto/koto-task-editor.c:124 libkoto/koto-task-editor.c:224
-#: libkoto/koto-task-editor.c:232
-msgid " property not set"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:137 libkoto/koto-task-editor.c:248
-msgid "NO"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:176
-#, c-format
-msgid "TODO: open URL %s"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:192
-msgid "stock_internet"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:200
-msgid "icon-released"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:292
-msgid "Child widget was not GtkTextView"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:396
-msgid "notify::date"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:457
-msgid "New Category"
-msgstr "Ð?Ð¾Ð²Ð°Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?"
-
-#: libkoto/koto-task-editor.c:472
-msgid "TODO: revert old group"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:478
-#, c-format
-msgid "Unhandled group type %d"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:536
-#, c-format
-msgid "Field data for %s doesn't define set_value"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:680 libkoto/koto-task-editor-dialog.c:114
-#: libkoto/koto-task-editor-dialog.c:138 libkoto/koto-task-editor-dialog.c:200
-#: libkoto/koto-task-editor-dialog.c:283 src/gtk/main.c:201
-#: src/omoko/openmoko-tasks.c:110
-msgid "groups"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:685 libkoto/koto-task-editor-dialog.c:188
-#: libkoto/koto-task-editor-dialog.c:271 libkoto/koto-task-summary.c:204
-#: src/gtk/main.c:202 src/omoko/openmoko-tasks.c:83
-#: src/omoko/openmoko-tasks.c:111
-msgid "task"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:690 libkoto/koto-task-editor-dialog.c:107
-#: libkoto/koto-task-editor-dialog.c:194
-msgid "dirty"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:718
-msgid "homogeneous"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:719
-msgid "row-spacing"
-msgstr ""
-
-#: libkoto/koto-task-editor.c:720
-msgid "column-spacing"
-msgstr ""
-
-#: libkoto/koto-task-editor-dialog.c:63 src/gtk/main.c:296
-#: src/omoko/openmoko-tasks.c:277
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ð?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ?, Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? \"%s\"?"
 
-#: libkoto/koto-task-editor-dialog.c:66 src/gtk/main.c:299
-#: src/omoko/openmoko-tasks.c:280
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Ð?Ñ?Ð»Ð¸ Ð²Ñ? Ñ?Ð´Ð°Ð»Ð¸Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÑ?, Ð¾Ð½ Ð±Ñ?Ð´ÐµÑ? Ñ?Ñ?Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð°Ð²Ñ?ÐµÐ³Ð´Ð°."
 
-#: libkoto/koto-task-editor-dialog.c:75 src/gtk/main.c:308 src/gtk/main.c:336
-#: src/omoko/openmoko-tasks.c:289 src/omoko/openmoko-tasks.c:320
-#, c-format
-msgid "Cannot remove object: %s"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?: %s"
-
-#: libkoto/koto-task-editor-dialog.c:80 libkoto/koto-task-editor-dialog.c:235
-#: src/gtk/main.c:197
-msgid "response"
-msgstr ""
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, fuzzy, c-format
+msgid "Delete Task %s"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?"
 
-#: libkoto/koto-task-editor-dialog.c:87 src/omoko/openmoko-tasks.c:89
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "Cannot modify object: %s"
-msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?: %s"
-
-#: libkoto/koto-task-editor-dialog.c:206 libkoto/koto-task-editor-dialog.c:293
-#: src/gtk/main.c:200
-msgid "cal"
+msgid "Edit Task %s"
 msgstr ""
 
-#: libkoto/koto-task-editor-dialog.c:218
-msgid "title"
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
 msgstr ""
 
-#: libkoto/koto-task-editor-dialog.c:218 src/gtk/main.c:405 src/gtk/main.c:463
-#: src/omoko/openmoko-tasks.c:389 src/omoko/openmoko-tasks.c:482
-msgid "Tasks"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
-
-#: libkoto/koto-task-editor-dialog.c:219
-msgid "has-separator"
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
 msgstr ""
 
-#: libkoto/koto-task-editor-dialog.c:273
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Ð?ÐµÐ· Ð´Ð°Ñ?Ñ?"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Ð?Ð°Ð´Ð°Ñ?Ð¸"
 
-#: libkoto/koto-task-store.c:239
-#, c-format
-msgid "Cannot find iter for removed UID %s"
-msgstr ""
-
-#: libkoto/koto-task-store.c:381 src/gtk/main.c:478
-#: src/omoko/openmoko-tasks.c:495
-msgid "koto-ecal"
-msgstr ""
-
-#: libkoto/koto-task-store.c:384
-msgid "objects-removed"
-msgstr ""
-
-#: libkoto/koto-task-store.c:387
-msgid "koto-ecal not set on cal_view, cannot commit changes"
-msgstr ""
-
-#: libkoto/koto-task-store.c:414
-#, c-format
-msgid ": cannot modify object: %s"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:70 libkoto/koto-task-summary.c:88
-#: libkoto/koto-task-summary.c:98
-msgid "\n"
-msgstr "\n"
-
-#: libkoto/koto-task-summary.c:86
-#, c-format
-msgid "Due %s"
-msgstr "Ð? %s"
-
-#: libkoto/koto-task-summary.c:132
-#, c-format
-msgid ": TODO: open URL %s"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:223
-msgid "wrap-mode"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:224
-msgid "editable"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:225
-msgid "cursor-visible"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:226 libkoto/koto-task-summary.c:247
-msgid "left-margin"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:227 libkoto/koto-task-summary.c:248
-msgid "right-margin"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:234
-msgid "summary"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:235
-msgid "scale"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:236 libkoto/koto-task-summary.c:242
-#: libkoto/koto-task-view.c:148
-msgid "weight"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:237 libkoto/koto-task-summary.c:255
-msgid "pixels-above-lines"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:238 libkoto/koto-task-summary.c:243
-msgid "pixels-below-lines"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:241
-msgid "due"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:246
-msgid "description"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:251
-msgid "url"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:253
-msgid "foreground"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:253
-msgid "blue"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:254
-msgid "underline"
-msgstr ""
-
-#: libkoto/koto-task-summary.c:258
-msgid "event"
-msgstr ""
-
-#: libkoto/koto-task-view.c:109
-#, c-format
-msgid "%s (due %s)"
-msgstr "%s (Ðº %s)"
-
-#: libkoto/koto-task-view.c:141
-msgid "strikethrough"
-msgstr ""
-
-#: libkoto/koto-task-view.c:144
-msgid "foreground-gdk"
-msgstr ""
-
-#: libkoto/koto-task-view.c:193
-msgid "priority-low"
-msgstr ""
-
-#: libkoto/koto-task-view.c:196
-msgid "priority-normal"
-msgstr ""
-
-#: libkoto/koto-task-view.c:199
-msgid "priority-high"
-msgstr ""
-
-#: libkoto/koto-task-view.c:202
-msgid "priority-done"
-msgstr ""
-
-#: libkoto/koto-task-view.c:292 libkoto/koto-task-view.c:350
-msgid "base-model"
-msgstr ""
-
-#: libkoto/koto-task-view.c:292
-msgid "Base model"
-msgstr ""
-
-#: libkoto/koto-task-view.c:298 libkoto/koto-task-view.c:351
-msgid "filter"
-msgstr ""
-
-#: libkoto/koto-task-view.c:298
-msgid "Filter"
-msgstr ""
-
-#: libkoto/koto-task-view.c:321
-msgid "toggled"
-msgstr ""
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+#, fuzzy
+msgid "Complete Task"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?"
 
-#: libkoto/koto-task-view.c:322
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr ""
 
-#: libkoto/koto-task-view.c:323
-msgid "active"
-msgstr ""
-
-#: libkoto/koto-task-view.c:329
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr ""
 
-#: libkoto/koto-task-view.c:333
-msgid "ellipsize"
-msgstr ""
-
-#: src/gtk/main.c:94
-msgid "Got clicked with empty text"
-msgstr ""
-
-#: src/gtk/main.c:105
-msgid "+!"
-msgstr ""
-
-#: src/gtk/main.c:109
-msgid "-"
-msgstr ""
-
-#: src/gtk/main.c:152 src/omoko/openmoko-tasks.c:147
+#: ../libkoto/koto-undo-action.c:60
 #, c-format
-msgid ": cannot create task: %s"
-msgstr ""
-
-#: src/gtk/main.c:224
-msgid ": cannot get iterator for path"
+msgid "Undo %s"
 msgstr ""
 
-#: src/gtk/main.c:253
-msgid "TODO: No task selected, EditTask should be disabled"
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
 msgstr ""
 
-#: src/gtk/main.c:268 src/omoko/openmoko-tasks.c:252
-msgid "TODO: No task selected, CompleteTask should be disabled"
-msgstr ""
-
-#: src/gtk/main.c:289 src/omoko/openmoko-tasks.c:270
-msgid "TODO: No task selected, DeleteTask should be disabled"
-msgstr ""
-
-#: src/gtk/main.c:358 src/omoko/openmoko-tasks.c:342
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr ""
+#: ../libkoto/koto-undo-action.c:84
+#, fuzzy, c-format
+msgid "Redo %s"
+msgstr "Ð? %s"
 
-#: src/gtk/main.c:360 src/omoko/openmoko-tasks.c:344
-msgid "Deleting completed tasks means they are permanently lost."
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
 msgstr ""
 
-#: src/gtk/main.c:381 src/omoko/openmoko-tasks.c:365
-msgid "Ross Burton <ross openedhand com>"
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
 msgstr ""
 
-#: src/gtk/main.c:384 src/omoko/openmoko-tasks.c:368
-msgid "Andreas Nilsson <andreas andreasn se>"
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
 msgstr ""
 
-#: src/gtk/main.c:385 src/omoko/openmoko-tasks.c:369
-msgid "Jakub Steiner <jimmac ximian com>"
-msgstr ""
+#: ../src/gtk/main.c:424
+#, fuzzy
+msgid "Remove Completed"
+msgstr "Ð£_Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ñ?Ðµ"
 
-#: src/gtk/main.c:390 src/omoko/openmoko-tasks.c:374
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
 msgid ""
 "Tasks is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -657,232 +416,132 @@ msgid ""
 "Fifth Floor, Boston, MA 0110-1301, USA"
 msgstr ""
 
-#: src/gtk/main.c:405 src/omoko/openmoko-tasks.c:389
-msgid "name"
-msgstr ""
-
-#: src/gtk/main.c:406 src/omoko/openmoko-tasks.c:390
-msgid "version"
-msgstr ""
-
-#: src/gtk/main.c:407 src/omoko/openmoko-tasks.c:391
-msgid "logo-icon-name"
-msgstr ""
-
-#: src/gtk/main.c:407 src/gtk/main.c:486 src/omoko/openmoko-tasks.c:391
-#: src/omoko/openmoko-tasks.c:503
-msgid "tasks"
-msgstr ""
-
-#: src/gtk/main.c:408 src/omoko/openmoko-tasks.c:392
-msgid "copyright"
-msgstr ""
-
-#: src/gtk/main.c:408 src/omoko/openmoko-tasks.c:392
-msgid "Copyright Â© 2007 OpenedHand Ltd"
-msgstr ""
-
-#: src/gtk/main.c:409 src/omoko/openmoko-tasks.c:393
-msgid "authors"
-msgstr ""
-
-#: src/gtk/main.c:410 src/omoko/openmoko-tasks.c:394
-msgid "artists"
-msgstr ""
-
-#: src/gtk/main.c:411 src/omoko/openmoko-tasks.c:395
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr ""
 
-#: src/gtk/main.c:412 src/omoko/openmoko-tasks.c:396
-msgid "license"
-msgstr ""
-
-#: src/gtk/main.c:413 src/omoko/openmoko-tasks.c:397
-msgid "wrap-license"
-msgstr ""
-
-#: src/gtk/main.c:414 src/omoko/openmoko-tasks.c:398
-msgid "website"
-msgstr ""
-
-#: src/gtk/main.c:414
-msgid "http://pimlico-project.org";
-msgstr ""
-
-#: src/gtk/main.c:415
-msgid "website-label"
-msgstr ""
-
-#: src/gtk/main.c:415
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr ""
 
-#: src/gtk/main.c:434
-msgid "TasksMenu"
-msgstr ""
-
-#: src/gtk/main.c:434
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
 msgid "_Task"
 msgstr "_Ð?Ð°Ð´Ð°Ñ?Ð°"
 
-#: src/gtk/main.c:435
-msgid "NewTask"
-msgstr ""
-
-#: src/gtk/main.c:436
-msgid "EditTask"
-msgstr ""
-
-#: src/gtk/main.c:436
-msgid "<control>e"
-msgstr ""
-
-#: src/gtk/main.c:438
-msgid "CompleteTask"
-msgstr ""
-
-#: src/gtk/main.c:438
-msgid "_Mark Complete"
-msgstr "_Ð?Ñ?Ð¼ÐµÑ?Ð¸Ñ?Ñ? ÐºÐ°Ðº Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ðµ"
-
-#: src/gtk/main.c:438
-msgid "<control>d"
-msgstr ""
-
-#: src/gtk/main.c:439
-msgid "DeleteTask"
-msgstr ""
-
-#: src/gtk/main.c:439
-msgid "<control>Delete"
-msgstr ""
-
-#: src/gtk/main.c:440
-msgid "PurgeTasks"
-msgstr ""
-
-#: src/gtk/main.c:440
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "Ð£_Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ñ?Ðµ"
 
-#: src/gtk/main.c:441
-msgid "Quit"
-msgstr ""
-
-#: src/gtk/main.c:443
-msgid "HelpMenu"
+#: ../src/gtk/main.c:484
+msgid "_Edit"
 msgstr ""
 
-#: src/gtk/main.c:443
+#: ../src/gtk/main.c:486
 msgid "_Help"
 msgstr "_Ð¡Ð¿Ñ?Ð°Ð²ÐºÐ°"
 
-#: src/gtk/main.c:444
-msgid "About"
+#: ../src/gtk/main.c:492
+msgid "Edit..."
 msgstr ""
 
-#: src/gtk/main.c:459 src/omoko/openmoko-tasks.c:478
-msgid "UTF-8"
-msgstr ""
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr "_Ð?Ñ?Ð¼ÐµÑ?Ð¸Ñ?Ñ? ÐºÐ°Ðº Ð²Ñ?Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ðµ"
 
-#: src/gtk/main.c:470 src/omoko/openmoko-tasks.c:487
-msgid "Cannot get system tasks"
+#: ../src/gtk/main.c:621
+msgid " - a to do list"
 msgstr ""
 
-#: src/gtk/main.c:473 src/omoko/openmoko-tasks.c:490
-#, c-format
-msgid "Cannot open calendar: %s"
-msgstr ""
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
 
-#: src/gtk/main.c:475 src/omoko/openmoko-tasks.c:492
-msgid "#t"
-msgstr ""
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+msgid "New task..."
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°..."
 
-#: src/gtk/main.c:476 src/omoko/openmoko-tasks.c:493
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
-msgid "Cannot get calendar view: %s"
-msgstr ""
+msgid "Tasks (%d)"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ (%d)"
 
-#: src/gtk/main.c:490 src/omoko/openmoko-tasks.c:507
-msgid "destroy"
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
 msgstr ""
 
-#: src/gtk/main.c:495
-msgid "Actions"
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
 msgstr ""
 
-#: src/gtk/main.c:502
-msgid "/tasks-ui.xml"
-msgstr ""
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°"
 
-#: src/gtk/main.c:504
-#, c-format
-msgid "Cannot load UI: %s"
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°..."
+
+#: ../src/hildon/hildon-tasks.c:460
+#, fuzzy
+msgid "Delete Task"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?"
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
 msgstr ""
 
-#: src/gtk/main.c:510
-msgid "add-widget"
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
 msgstr ""
 
-#: src/gtk/main.c:521
-msgid "_Category:"
-msgstr "_Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?:"
+#: ../src/omoko/openmoko-tasks.c:186
+msgid "New task"
+msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°"
 
-#: src/gtk/main.c:537
-msgid "row-activated"
-msgstr ""
+#~ msgid "%A"
+#~ msgstr "%A"
 
-#: src/gtk/main.c:541
-msgid "New task..."
-msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°..."
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: src/gtk/main.c:565 src/omoko/openmoko-tasks.c:221
-#, c-format
-msgid "Tasks (%d)"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ (%d)"
+#~ msgid "BAD WEEKDAY"
+#~ msgstr "Ð?Ð?Ð?Ð?Ð Ð?Ð«Ð? Ð?Ð?Ð?Ð¬ Ð?Ð?Ð?Ð?Ð?Ð?"
 
-#: src/omoko/openmoko-tasks.c:127 src/omoko/openmoko-tasks.c:427
-msgid "New task"
-msgstr "Ð?Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°"
+#~ msgid "C"
+#~ msgstr "C"
 
-#: src/omoko/openmoko-tasks.c:398
-msgid "http://projects.o-hand.com/tasks";
-msgstr ""
+#~ msgid "05/01/01"
+#~ msgstr "05/01/01"
 
-#: src/omoko/openmoko-tasks.c:429 src/omoko/openmoko-tasks.c:435
-#: src/omoko/openmoko-tasks.c:441
-msgid "activate"
-msgstr ""
+#~ msgid "date"
+#~ msgstr "Ð´Ð°Ñ?Ð°"
 
-#: src/omoko/openmoko-tasks.c:433
-msgid "Delete task"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ñ?"
+#~ msgid ","
+#~ msgstr ","
 
-#: src/omoko/openmoko-tasks.c:439
-msgid "Close"
-msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?"
+#~ msgid "Uncategorised"
+#~ msgstr "Ð?ÐµÐ· ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ð¸"
 
-#: src/omoko/openmoko-tasks.c:508
-msgid "delete-event"
-msgstr ""
+#~ msgid "type"
+#~ msgstr "Ñ?Ð¸Ð¿"
 
-#: src/omoko/openmoko-tasks.c:512
-msgid "row-inserted"
-msgstr ""
+#~ msgid "Cannot remove object: %s"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ?Ð´Ð°Ð»Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?: %s"
 
-#: src/omoko/openmoko-tasks.c:513
-msgid "row-changed"
-msgstr ""
+#~ msgid "Cannot modify object: %s"
+#~ msgstr "Ð?ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ð¾Ð±Ñ?ÐµÐºÑ?: %s"
 
-#: src/omoko/openmoko-tasks.c:514
-msgid "row-deleted"
-msgstr ""
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: src/omoko/openmoko-tasks.c:553
-msgid "gtk-theme-name"
-msgstr ""
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (Ðº %s)"
 
-#: src/omoko/openmoko-tasks.c:553
-msgid "openmoko-standard"
-msgstr ""
+#~ msgid "Close"
+#~ msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ñ?"
diff --git a/po/sk.po b/po/sk.po
index 74ebc6c..f31f0df 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,25 +2,26 @@
 # Copyright Â© 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the tasks package.
 # Adam Sloboda <otaznik gmail com>, 2007.
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 15:20+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 15:37+0100\n"
 "Last-Translator: Adam Sloboda <otaznik gmail com>\n"
 "Language-Team: Slovak <sk-i18n linux sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
 msgstr "OsobnÃ½ sprÃ¡vca Ãºloh"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ã?lohy"
 
@@ -28,87 +29,480 @@ msgstr "Ã?lohy"
 msgid "To Do list"
 msgstr "Zoznam Ãºloh"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "dnes"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "zajtra"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "vÄ?era"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "dÃ¡tum nenastavenÃ½"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "Dnes"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Zhrnutie"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_KategÃ³ria:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Å½iaden"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "NovÃ¡ Ãºloha..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_KategÃ³ria:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "NÃzka"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "NormÃ¡lna"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "VysokÃ¡"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_Zhrnutie:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_KategÃ³ria:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "_Priorita:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "SplniÅ¥ _do:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_WWW strÃ¡nka:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "P_opis:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "dnes"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "zajtra"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "vÄ?era"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (do %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Å½iaden"
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "Ã?lohy"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Hotovo"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Zhrnutie"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "Ã?lohy"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Zoznam Ãºloh"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_KategÃ³ria:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "NovÃ¡ Ãºloha..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Pridaj"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "Ã?lohy"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "NovÃ¡ Ãºloha..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "NovÃ¡ Ãºloha..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "NovÃ¡ Ãºloha..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (do %s)"
 
+#~ msgid "_Add"
+#~ msgstr "_Pridaj"
diff --git a/po/sv.po b/po/sv.po
index 51e807f..8f99ccc 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,13 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-20 16:54+0200\n"
-"PO-Revision-Date: 2009-04-20 16:54+0100\n"
-"Last-Translator: Daniel Nylander <po danielnylander se>\n"
+"POT-Creation-Date: 2009-07-15 09:17+0000\n"
+"PO-Revision-Date: 2009-07-22 07:54-0800\n"
+"Last-Translator: GLSSVE_GMartinson <gmartinson gmail com>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n!=1;\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/tasks.desktop.in.h:1
 msgid "Personal task manager"
@@ -31,25 +33,25 @@ msgstr "Aktiviteter"
 msgid "To Do list"
 msgstr "Att gÃ¶ra-lista"
 
-#: ../libkoto/ical-util.c:63
+#: ../libkoto/ical-util.c:62
 msgid "due today"
 msgstr "fÃ¤rdig idag"
 
-#: ../libkoto/ical-util.c:65
+#: ../libkoto/ical-util.c:64
 msgid "due tomorrow"
 msgstr "fÃ¤rdig imorgon"
 
-#: ../libkoto/ical-util.c:67
+#: ../libkoto/ical-util.c:66
 msgid "due yesterday"
 msgstr "fÃ¤rdig igÃ¥r"
 
-#: ../libkoto/ical-util.c:71
+#: ../libkoto/ical-util.c:70
 #, c-format
 msgid "due %A"
 msgstr "fÃ¤rdig %A"
 
 #. Fallback to returning the preferred date representation
-#: ../libkoto/ical-util.c:75
+#: ../libkoto/ical-util.c:74
 #, c-format
 msgid "due %x"
 msgstr "fÃ¤rdig %x"
@@ -246,11 +248,11 @@ msgstr "Infoga"
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:417
 msgid "New Category"
 msgstr "Ny kategori"
 
-#: ../libkoto/koto-field-editor-factory.c:439
+#: ../libkoto/koto-field-editor-factory.c:428
 msgid "Enter the name of the new category:"
 msgstr "Ange namnet pÃ¥ nya kategorin:"
 
@@ -302,42 +304,42 @@ msgstr "_Webbadress:"
 msgid "D_escription:"
 msgstr "_Beskrivning:"
 
-#: ../libkoto/koto-task-editor-dialog.c:71
+#: ../libkoto/koto-task-editor-dialog.c:70
 #: ../src/hildon/hildon-tasks.c:326
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ã?r du sÃ¤ker pÃ¥ att du vill ta bort \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:74
+#: ../libkoto/koto-task-editor-dialog.c:73
 #: ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr "Om du tar bort ett objekt sÃ¥ fÃ¶rsvinner det fÃ¶r alltid."
 
-#: ../libkoto/koto-task-editor-dialog.c:84
+#: ../libkoto/koto-task-editor-dialog.c:83
 #: ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "Ta bort aktiviteten %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr "Redigera aktiviteten %s"
 
-#: ../libkoto/koto-task-editor-dialog.c:283
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr "Det_aljer"
 
-#: ../libkoto/koto-task-editor-dialog.c:342
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr "<b>_Anteckningar</b>"
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr "_Anteckningar"
 
-#: ../libkoto/koto-task-editor-dialog.c:348
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr "%s - Aktiviteter"
@@ -347,11 +349,11 @@ msgstr "%s - Aktiviteter"
 msgid "Complete Task"
 msgstr "FÃ¤rdig aktivitet"
 
-#: ../libkoto/koto-task-view.c:440
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "FÃ¤rdig"
 
-#: ../libkoto/koto-task-view.c:447
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Sammanfattning"
 
diff --git a/po/th.po b/po/th.po
index 0c07c17..7e4f08d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=tasks&component=general\n"
-"POT-Creation-Date: 2009-04-24 07:02+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2009-04-28 11:27+0700\n"
 "Last-Translator: Sira Nokyoongtong <gumaraa gmail com>\n"
 "Language-Team: Thai <thai-l10n googlegroups com>\n"
@@ -29,25 +28,25 @@ msgstr "à¸ à¸²à¸£à¸?à¸´à¸?"
 msgid "To Do list"
 msgstr "à¸?à¸²à¸?à¸?à¸µà¹?à¸?à¸°à¸?à¸³"
 
-#: ../libkoto/ical-util.c:63
+#: ../libkoto/ical-util.c:62
 msgid "due today"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¸£à¹?à¸?à¸§à¸±à¸?à¸?à¸µà¹?"
 
-#: ../libkoto/ical-util.c:65
+#: ../libkoto/ical-util.c:64
 msgid "due tomorrow"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¸£à¹?à¸?à¸?à¸£à¸¸à¹?à¸?à¸?à¸µà¹?"
 
-#: ../libkoto/ical-util.c:67
+#: ../libkoto/ical-util.c:66
 msgid "due yesterday"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¸£à¹?à¸?à¹?à¸¡à¸·à¹?à¸à¸§à¸²à¸?"
 
-#: ../libkoto/ical-util.c:71
+#: ../libkoto/ical-util.c:70
 #, c-format
 msgid "due %A"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¸£à¹?à¸? %A"
 
 #. Fallback to returning the preferred date representation
-#: ../libkoto/ical-util.c:75
+#: ../libkoto/ical-util.c:74
 #, c-format
 msgid "due %x"
 msgstr "à¸?à¸³à¸«à¸?à¸?à¹?à¸ªà¸£à¹?à¸? %x"
@@ -248,11 +247,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:417
 msgid "New Category"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:439
+#: ../libkoto/koto-field-editor-factory.c:428
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -304,39 +303,39 @@ msgstr ""
 msgid "D_escription:"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:71 ../src/hildon/hildon-tasks.c:326
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
 #: ../src/omoko/openmoko-tasks.c:217
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:74 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:84 ../src/gtk/main.c:382
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:102
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
 msgid "Edit Task %s"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:283
+#: ../libkoto/koto-task-editor-dialog.c:282
 msgid "Det_ails"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:342
+#: ../libkoto/koto-task-editor-dialog.c:341
 msgid "<b>_Notes</b>"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:344
+#: ../libkoto/koto-task-editor-dialog.c:343
 msgid "_Notes"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:348
+#: ../libkoto/koto-task-editor-dialog.c:347
 #, c-format
 msgid "%s - Tasks"
 msgstr ""
@@ -345,11 +344,11 @@ msgstr ""
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:489
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:496
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr ""
 
@@ -439,15 +438,15 @@ msgstr ""
 msgid " - a to do list"
 msgstr ""
 
-#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr ""
 
-#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr ""
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index ace1ec7..f19427d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 01:03+0100\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 01:03+0100\n"
 "Last-Translator: Tuyan Ozipek <tuyan 4inarow net>\n"
 "Language-Team: Turkce <>\n"
@@ -19,7 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "KiÅ?isel GÃ¶rev DÃ¼zenleyici"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "GÃ¶revler"
 
@@ -27,86 +28,480 @@ msgstr "GÃ¶revler"
 msgid "To Do list"
 msgstr "YapÄ±lacaklar Listesi"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "bugÃ¼n"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "yarÄ±n"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "dÃ¼n"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "tarih atanmamÄ±Å?"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "BugÃ¼n"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "Ã?zet"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_Kategori:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "Yok"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "Yeni GÃ¶rev..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_Kategori:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "DÃ¼Å?Ã¼k"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "YÃ¼ksek"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "Ã?_zet:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_Kategori:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "Ã?_ncelik:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "_Son Tarih:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "_Web Adresi:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_AÃ§Ä±klama:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "bugÃ¼n"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "yarÄ±n"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "dÃ¼n"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (%s e kadar)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "Yok"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "GÃ¶revler"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Bitti"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "Ã?zet"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "GÃ¶revler"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "YapÄ±lacaklar Listesi"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_Kategori:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Yeni GÃ¶rev..."
 
-#. FIXME: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "_Ekle"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "GÃ¶revler"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "Yeni GÃ¶rev..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "Yeni GÃ¶rev..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "Yeni GÃ¶rev..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (%s e kadar)"
+
+#~ msgid "_Add"
+#~ msgstr "_Ekle"
diff --git a/po/vi.po b/po/vi.po
index aa61de3..27ee9e1 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-01 23:32+0700\n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
 "PO-Revision-Date: 2007-03-01 23:38+0700\n"
 "Last-Translator: Nguyá»?n ThÃ¡i Ngá»?c Duy <pclouds gmail com>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
@@ -19,7 +19,8 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "TrÃ¬nh quáº£n lÃ½ cÃ´ng viá»?c cÃ¡ nhÃ¢n"
 
-#: ../data/tasks.desktop.in.h:2
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "CÃ´ng viá»?c"
 
@@ -27,86 +28,480 @@ msgstr "CÃ´ng viá»?c"
 msgid "To Do list"
 msgstr "Danh sÃ¡ch cÃ´ng viá»?c"
 
-#: ../src/koto-date-combo.c:40
+#: ../libkoto/ical-util.c:62
+#, fuzzy
+msgid "due today"
+msgstr "hÃ´m nay"
+
+#: ../libkoto/ical-util.c:64
+#, fuzzy
+msgid "due tomorrow"
+msgstr "ngÃ y mai"
+
+#: ../libkoto/ical-util.c:66
+#, fuzzy
+msgid "due yesterday"
+msgstr "hÃ´m qua"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr ""
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr ""
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:62
 msgid "no date set"
 msgstr "chÆ°a Ä?áº·t ngÃ y"
 
-#: ../src/koto-date-combo.c:328
+#: ../libkoto/koto-date-combo.c:409
 msgid "Today"
 msgstr "HÃ´m nay"
 
-#: ../src/koto-date-combo.c:331
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr ""
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr ""
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:105
+#, fuzzy
+msgid "may"
+msgstr "TÃ³m táº¯t"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr ""
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr ""
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr ""
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr ""
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr ""
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr ""
+
+#: ../libkoto/koto-field-editor-factory.c:417
+#, fuzzy
+msgid "New Category"
+msgstr "_PhÃ¢n loáº¡i:"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr ""
+
+#: ../libkoto/koto-meta-group.c:46
 msgid "None"
 msgstr "KhÃ´ng"
 
-#: ../src/koto-priority-combo.c:91
+#: ../libkoto/koto-meta-group.c:48
+#, fuzzy
+msgid "New Group..."
+msgstr "CÃ´ng viá»?c má»?i..."
+
+#: ../libkoto/koto-no-category-group.c:32
+#, fuzzy
+msgid "No Category"
+msgstr "_PhÃ¢n loáº¡i:"
+
+#: ../libkoto/koto-priority-combo.c:71
 msgid "Low"
 msgstr "Tháº¥p"
 
-#: ../src/koto-priority-combo.c:93
+#: ../libkoto/koto-priority-combo.c:73
 msgid "Normal"
 msgstr "BÃ¬nh thÆ°á»?ng"
 
-#: ../src/koto-priority-combo.c:95
+#: ../libkoto/koto-priority-combo.c:75
 msgid "High"
 msgstr "Cao"
 
-#: ../src/koto-task-editor.c:65
+#: ../libkoto/koto-task-editor.c:55
 msgid "_Summary:"
 msgstr "_TÃ³m táº¯t:"
 
-#. TODO: replace with combo
-#: ../src/koto-task-editor.c:68
-msgid "_Category:"
+#: ../libkoto/koto-task-editor.c:56
+#, fuzzy
+msgid "Ca_tegory:"
 msgstr "_PhÃ¢n loáº¡i:"
 
-#: ../src/koto-task-editor.c:70
+#: ../libkoto/koto-task-editor.c:57
 msgid "_Priority:"
 msgstr "Ä?á»? Æ°_u tiÃªn:"
 
-#: ../src/koto-task-editor.c:71
+#: ../libkoto/koto-task-editor.c:58
 msgid "D_ue Date:"
 msgstr "NgÃ y _xong:"
 
-#. TODO: add button to open URL
-#: ../src/koto-task-editor.c:73
+#: ../libkoto/koto-task-editor.c:59
 msgid "_Web Address:"
 msgstr "Ä?á»?a chá»? _Web:"
 
-#: ../src/koto-task-editor.c:74
-msgid "_Description:"
+#: ../libkoto/koto-task-editor.c:60
+#, fuzzy
+msgid "D_escription:"
 msgstr "_MÃ´ táº£:"
 
-#: ../src/koto-task-view.c:71
-msgid "today"
-msgstr "hÃ´m nay"
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
 
-#: ../src/koto-task-view.c:73
-msgid "tomorrow"
-msgstr "ngÃ y mai"
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr ""
 
-#: ../src/koto-task-view.c:75
-msgid "yesterday"
-msgstr "hÃ´m qua"
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr ""
 
-#: ../src/koto-task-view.c:113
+#: ../libkoto/koto-task-editor-dialog.c:101
 #, c-format
-msgid "%s (due %s)"
-msgstr "%s (háº¿t háº¡n %s)"
+msgid "Edit Task %s"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr ""
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr ""
 
-#: ../src/koto-task-view.c:266
+#: ../libkoto/koto-task-editor-dialog.c:343
+#, fuzzy
+msgid "_Notes"
+msgstr "KhÃ´ng"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, fuzzy, c-format
+msgid "%s - Tasks"
+msgstr "CÃ´ng viá»?c"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr ""
+
+#: ../libkoto/koto-task-view.c:477
 msgid "Done"
 msgstr "Xong"
 
-#: ../src/koto-task-view.c:273
+#: ../libkoto/koto-task-view.c:484
 msgid "Summary"
 msgstr "TÃ³m táº¯t"
 
-#: ../src/gtk/main.c:175
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr ""
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr ""
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr ""
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr ""
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+#, fuzzy
+msgid "_Task"
+msgstr "CÃ´ng viá»?c"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr ""
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr ""
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr ""
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr ""
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr ""
+
+#: ../src/gtk/main.c:621
+#, fuzzy
+msgid " - a to do list"
+msgstr "Danh sÃ¡ch cÃ´ng viá»?c"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "_PhÃ¢n loáº¡i:"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "CÃ´ng viá»?c má»?i..."
 
-#. TODO: Use GTK stock label
-#: ../src/gtk/main.c:180
-msgid "_Add"
-msgstr "T_hÃªm"
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, fuzzy, c-format
+msgid "Tasks (%d)"
+msgstr "CÃ´ng viá»?c"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr ""
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+#, fuzzy
+msgid "New Task"
+msgstr "CÃ´ng viá»?c má»?i..."
+
+#: ../src/hildon/hildon-tasks.c:457
+#, fuzzy
+msgid "Edit Task..."
+msgstr "CÃ´ng viá»?c má»?i..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr ""
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr ""
+
+#: ../src/omoko/openmoko-tasks.c:186
+#, fuzzy
+msgid "New task"
+msgstr "CÃ´ng viá»?c má»?i..."
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (háº¿t háº¡n %s)"
+
+#~ msgid "_Add"
+#~ msgstr "T_hÃªm"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..6c60511
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,498 @@
+# tasks
+# Copyright Intel(C) 2009
+# This file is distributed under the same license as the PACKAGE package.
+# Zhu Yanhai <yanhai zhu linux intel com>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: tasks 0.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"PO-Revision-Date: 2009-07-24 21:47+0700\n"
+"Last-Translator: Zhu Yanhai <yanhai zhu linux intel com>\n"
+"Language-Team: Zhu Yanhai <yanhai zhu linux intel com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../data/tasks.desktop.in.h:1
+msgid "Personal task manager"
+msgstr "ä¸ªäººä»»å?¡ç®¡ç??"
+
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
+#: ../src/hildon/hildon-tasks.c:437
+msgid "Tasks"
+msgstr "ä»»å?¡"
+
+#: ../data/tasks.desktop.in.h:3
+msgid "To Do list"
+msgstr "ä»»å?¡å??è¡¨"
+
+#: ../libkoto/ical-util.c:62
+msgid "due today"
+msgstr "ä»?å¤©å?°æ??"
+
+#: ../libkoto/ical-util.c:64
+msgid "due tomorrow"
+msgstr "æ??å¤©å?°æ??"
+
+#: ../libkoto/ical-util.c:66
+msgid "due yesterday"
+msgstr "æ?¨å¤©å?°æ??"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr "%A å?°æ??"
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr "%x å?°æ??"
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "å?¨é?¨"
+
+#: ../libkoto/koto-date-combo.c:62
+msgid "no date set"
+msgstr "æ²¡æ??è®¾ç½®æ?¥æ??"
+
+#: ../libkoto/koto-date-combo.c:409
+msgid "Today"
+msgstr "ä»?å¤©"
+
+#: ../libkoto/koto-date-combo.c:412
+msgid "Never"
+msgstr "ä»?ä¸?"
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr "æ??æ??ä¸?ï½?ä¸?"
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr "æ??æ??äº?ï½?äº?"
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr "æ??æ??ä¸?ï½?ä¸?"
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr "æ??æ??å??ï½?å??"
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr "æ??æ??äº?ï½?äº?"
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr "æ??æ??å?ï½?å?"
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr "æ??æ??æ?¥ï½?æ?¥"
+
+#. Translators: these strings should have every common form for month names
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:101
+msgid "january|jan"
+msgstr "1æ??ï½?1æ??"
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr "2æ??ï½?2æ??"
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr "3æ??ï½?3æ??"
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr "4æ??ï½?4æ??"
+
+#: ../libkoto/koto-date-parser.c:105
+msgid "may"
+msgstr "5æ??"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr "6æ??ï½?6æ??"
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr "7æ??ï½?7æ??"
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr "8æ??ï½?8æ??"
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr "9æ??ï½?9æ??"
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr "10æ??ï½?10æ??"
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr "11æ??ï½?11æ??"
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr "12æ??ï½?12æ??"
+
+#.
+#. Translators: WARNING: scary strings ahead.  If you don't understand regular
+#. expressions then skip these, otherwise
+#. http://www.burtonini.com/blog/computers/tasks-2008-10-01-21-17 has some
+#. details about how this works.
+#.
+#. Translators: just translate "today"
+#: ../libkoto/koto-date-parser.c:468
+msgid "^(?<task>.+) today$"
+msgstr "^(?<task>.+) ä»?å¤©$"
+
+#. Translators: just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:472
+msgid "^(?<task>.+) tomorrow$"
+msgstr "^(?<task>.+) æ??å¤©$"
+
+#. Translators: just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) yesterday$"
+msgstr "^(?<task>.+) æ?¨å¤©$"
+
+#. Translators: just translate "next"
+#: ../libkoto/koto-date-parser.c:480
+#, c-format
+msgid "^(?<task>.+) next (?<day>%s)$"
+msgstr "^(?<task>.+) ä¸?ä¸? (?<day>%s)$"
+
+#: ../libkoto/koto-date-parser.c:481
+msgid ""
+"monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|"
+"sat|sun"
+msgstr "æ??æ??ä¸?|æ??æ??äº?|æ??æ??ä¸?|æ??æ??å??|æ??æ??äº?|æ??æ??å?|æ??æ??æ?¥|ä¸?|äº?|ä¸?|å??|äº?|å?|æ?¥|"
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:489
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr ""
+
+#. Translators: replace by|due|on with suitable words, and re-order the day
+#. and month expressions as suitable
+#: ../libkoto/koto-date-parser.c:494
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language.
+#: ../libkoto/koto-date-parser.c:499
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:504
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+
+#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
+#. words in your language, and move the month block if required.
+#: ../libkoto/koto-date-parser.c:509
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language
+#: ../libkoto/koto-date-parser.c:514
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr ""
+
+#. Translators: just translate this|on|by|due to contain relevant words in
+#. your language and replace the w with whatever shortcut indicated "week". In
+#. English, w34 means "week 34".
+#: ../libkoto/koto-date-parser.c:520
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr ""
+
+#. Translators: just translate in ... days to contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:526
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr ""
+
+#. Translators: just translate in ... weeksto contain relevant words in your
+#. language. Remember the trailing ? is part of the regular expression to be
+#. translated.
+#: ../libkoto/koto-date-parser.c:532
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr ""
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr "æ??å?¥"
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr "å? é?¤"
+
+#: ../libkoto/koto-field-editor-factory.c:417
+msgid "New Category"
+msgstr "æ?°ç±»å?«"
+
+#: ../libkoto/koto-field-editor-factory.c:428
+msgid "Enter the name of the new category:"
+msgstr "è¯·è¾?å?¥æ?°ç±»å?«ç??å??å?ï¼?"
+
+#: ../libkoto/koto-meta-group.c:46
+msgid "None"
+msgstr "æ? "
+
+#: ../libkoto/koto-meta-group.c:48
+msgid "New Group..."
+msgstr "æ?°ç¾¤ç»?..."
+
+#: ../libkoto/koto-no-category-group.c:32
+msgid "No Category"
+msgstr "æ? å??ç±»"
+
+#: ../libkoto/koto-priority-combo.c:71
+msgid "Low"
+msgstr "ä½?"
+
+#: ../libkoto/koto-priority-combo.c:73
+msgid "Normal"
+msgstr "æ?®é??"
+
+#: ../libkoto/koto-priority-combo.c:75
+msgid "High"
+msgstr "é«?"
+
+#: ../libkoto/koto-task-editor.c:55
+msgid "_Summary:"
+msgstr "æ??è¦?(_S):"
+
+#: ../libkoto/koto-task-editor.c:56
+msgid "Ca_tegory:"
+msgstr "å??ç±»(_T):"
+
+#: ../libkoto/koto-task-editor.c:57
+msgid "_Priority:"
+msgstr "ä¼?å??çº§(_P):"
+
+#: ../libkoto/koto-task-editor.c:58
+msgid "D_ue Date:"
+msgstr "å?°æ??æ?¥æ??(_U)ï¼?"
+
+#: ../libkoto/koto-task-editor.c:59
+msgid "_Web Address:"
+msgstr "ç½?å??(_W):"
+
+#: ../libkoto/koto-task-editor.c:60
+msgid "D_escription:"
+msgstr "æ??è¿°(_D):"
+
+#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
+#: ../src/omoko/openmoko-tasks.c:217
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "ä½ ç¡®å®?è¦?å? é?¤ \"%s\" å??ï¼?"
+
+#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+msgid "If you delete an item, it is permanently lost."
+msgstr "å¦?æ??ä½ å? é?¤ä¸?é¡¹ç??è¯?ï¼?å®?ä¼?æ°¸ä¹?å¤±å?»ã??"
+
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr "å? é?¤ä»»å?¡ %s"
+
+#: ../libkoto/koto-task-editor-dialog.c:101
+#, c-format
+msgid "Edit Task %s"
+msgstr "ç¼?è¾?ä»»å?¡ %s"
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr "ç»?è?? (_a)"
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr "<b>è®°å½? (_N)</b>"
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+msgid "_Notes"
+msgstr "è®°å½?(_N)"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, c-format
+msgid "%s - Tasks"
+msgstr "%s - ä»»å?¡"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr "ä»»å?¡å·²å®?æ??"
+
+#: ../libkoto/koto-task-view.c:477
+msgid "Done"
+msgstr "å®?æ??"
+
+#: ../libkoto/koto-task-view.c:484
+msgid "Summary"
+msgstr "æ??è¦?"
+
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr "æ?¤é?? %s"
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr "æ?¤é??"
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr "é??å?? %s"
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr "é??å??"
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr "å??å§?æ ·æ?¬"
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr "æ?°å? ä»»å?¡ %s"
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr "å? é?¤å®?æ??ä»»å?¡(_R)"
+
+#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+msgid ""
+"Tasks is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version.\n"
+"\n"
+"Tasks is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"Tasks; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
+"Fifth Floor, Boston, MA 0110-1301, USA"
+msgstr ""
+"è¿?ä¸?ç¨?åº?æ?¯è?ªç?±è½¯ä»¶ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è½¯ä»¶å?ºé??ä¼?å?ºç??ç?? GNUé??ç?¨å?¬å?±è®¸å?¯è¯?æ?¡æ¬¾æ?¥ä¿®æ?¹å??é??æ?°å??å¸?è¿?ä¸?ç¨?åº?ã??\n"
+"æ??è??ç?¨è®¸å?¯è¯?ç??ç¬¬äº?ç??ï¼?æ??è??(æ ¹æ?®ä½ ç??é??æ?©)ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
+"\n"
+"å??å¸?è¿?ä¸?ç¨?åº?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²¡æ??ä»»ä½?æ??ä¿?ã??\n"
+"ç??è?³æ²¡æ??é??å??ç?¹å®?ç?®ç??ç??é??å?«ç??æ??ä¿?ã??\n"
+"æ?´è¯¦ç»?ç??æ??å?µè¯·å??é??GNUé??ç?¨å?¬å?±è®¸å?¯è¯?ã??"
+
+#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+msgid "translator-credits"
+msgstr "Zhu Yanhai <yanhai zhu linux intel com>"
+
+#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+msgid "The Pimlico Project"
+msgstr "Pimlicoè®¡å??"
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:479
+msgid "_Task"
+msgstr "ä»»å?¡(_T)"
+
+#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+msgid "_Remove Completed"
+msgstr "å? é?¤å®?æ??ä»»å?¡(_R)"
+
+#: ../src/gtk/main.c:484
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
+
+#: ../src/gtk/main.c:486
+msgid "_Help"
+msgstr "å¸®å?©(_H)"
+
+#: ../src/gtk/main.c:492
+msgid "Edit..."
+msgstr "ç¼?è¾?..."
+
+#. TODO: turn this action into a toggle action
+#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+msgid "_Mark Complete"
+msgstr "æ ?è®°ä¸ºå·²å®?æ??(_M)"
+
+#: ../src/gtk/main.c:621
+msgid " - a to do list"
+msgstr "- å¾?å??äº?é¡¹"
+
+#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+msgid "_Category:"
+msgstr "å??ç±»(_T):"
+
+#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+msgid "New task..."
+msgstr "æ?°å»ºä»»å?¡..."
+
+#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#, c-format
+msgid "Tasks (%d)"
+msgstr "ä»»å?¡ (%d)"
+
+#: ../src/hildon/hildon-tasks.c:388
+msgid "Are you sure you want to delete all completed tasks?"
+msgstr "ä½ ç¡®å®?è¦?å? é?¤æ??æ??å®?æ??ç??ä»»å?¡å??ï¼?"
+
+#: ../src/hildon/hildon-tasks.c:390
+msgid "Deleting completed tasks means they are permanently lost."
+msgstr "å? é?¤å®?æ??ç??ä»»å?¡æ??å?³ç??ä½ æ? æ³?å??æ?¾å??å®?ä»¬ã??"
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#. dummy
+#: ../src/hildon/hildon-tasks.c:456
+msgid "New Task"
+msgstr "æ?°å»ºä»»å?¡"
+
+#: ../src/hildon/hildon-tasks.c:457
+msgid "Edit Task..."
+msgstr "ç¼?è¾?ä»»å?¡..."
+
+#: ../src/hildon/hildon-tasks.c:460
+msgid "Delete Task"
+msgstr "å? é?¤ä»»å?¡"
+
+#: ../src/hildon/hildon-tasks.c:462
+msgid "Quit"
+msgstr "é??å?º"
+
+#: ../src/hildon/hildon-tasks.c:463
+msgid "About"
+msgstr "å?³äº?"
+
+#: ../src/omoko/openmoko-tasks.c:186
+msgid "New task"
+msgstr "æ?°ä»»å?¡"
+
+#~ msgid "%s (due %s)"
+#~ msgstr "%s (%s å?°æ??)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]