GNOME.org
 

[tasks] Forced translation update and purge

commit f0afa43efd297c846c8b6705c9f453378737a77d
Author: Ross Burton <ross linux intel com>
Date:   Tue Oct 11 15:14:53 2011 +0100

    Forced translation update and purge

 po/ar.po          |   88 +-----
 po/ast.po         |  213 +++++--------
 po/bg.po          |  206 +++++--------
 po/ca.po          |   96 +-----
 po/ca valencia po |  108 ++-----
 po/cs.po          |   93 +-----
 po/cy.po          |  203 +++++-------
 po/da.po          |   87 +-----
 po/de.po          |  121 +------
 po/el.po          |  206 +++++--------
 po/es.po          |  113 +------
 po/et.po          |  206 +++++--------
 po/eu.po          |   92 +-----
 po/fi.po          |  237 ++++++--------
 po/fr.po          |  108 +------
 po/gl.po          |   96 +-----
 po/hu.po          |   86 +-----
 po/id.po          |  115 ++-----
 po/it.po          |  150 ++-------
 po/ja.po          |  221 +++++--------
 po/ko.po          |  220 +++++--------
 po/nb.po          |   90 +-----
 po/nl.po          |  206 +++++--------
 po/pa.po          |  109 ++-----
 po/pl.po          |  146 +++------
 po/pt.po          |  206 +++++--------
 po/pt_BR.po       |  113 +------
 po/ro.po          |  115 ++-----
 po/ru.po          |   98 ++-----
 po/sk.po          |   96 +-----
 po/sl.po          |  950 +++++++++++++++++++++++++----------------------------
 po/sv.po          |  105 +-----
 po/th.po          |  195 +++++-------
 po/tr.po          |  206 +++++--------
 po/vi.po          |  206 +++++--------
 po/zh_CN.po       |   88 +-----
 po/zh_TW.po       |  223 +++++--------
 37 files changed, 1939 insertions(+), 4278 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index bcf97de..09dcb0b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-18 17:23+0200\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-02-18 17:23+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny eglug org>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
 "X-Generator: Virtaal 0.6.1\n"
@@ -23,7 +23,6 @@ msgid "Personal task manager"
 msgstr "ÙØÙØ ÙÙÙÙØÙ ØÙØØØÙØ"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "ØÙÙÙØÙ"
 
@@ -305,13 +304,12 @@ msgstr "ØÙÙØÙ ØÙÙ_Ø:"
 msgid "D_escription:"
 msgstr "ØÙÙ_ØÙ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "ØØØ ØØÙØ ØÙØØÙØ ÙØÙÙÙÙØ ØÙÙ ØÙØØØ."
 
@@ -393,11 +391,11 @@ msgstr ""
 "ÙØØÙ ÙØØ ØÙØØÙØÙØ ØÙÙ ØÙ ØÙØÙØØØ ÙÙØÙØ ÙÙ ØÙÙØÙÙÙØØ ØØØØ http://www.gnu.org/";
 "licenses/old-licenses/gpl-2.0.html"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "ØØÙØ ØØÙÙ <khaledhosny eglug org>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "ÙØØÙØ ØÙÙÙÙÙÙ"
 
@@ -406,7 +404,7 @@ msgstr "ÙØØÙØ ØÙÙÙÙÙÙ"
 msgid "_Task"
 msgstr "_ÙÙÙÙØ"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Ø_ØØÙ ØÙÙÙØÙ ØÙÙÙÙØØØ"
 
@@ -422,8 +420,7 @@ msgstr "Ù_ØØØØØ"
 msgid "Edit..."
 msgstr "ØØÙØ..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "Ø_ØÙØ ØØÙØÙØØØ"
 
@@ -431,78 +428,15 @@ msgstr "Ø_ØÙØ ØØÙØÙØØØ"
 msgid " - a to do list"
 msgstr " - ÙØØÙØ ØÙØ ÙØØ ØÙÙÙ"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "ØÙ_ÙØØ:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "ÙÙÙÙØ ØØÙØØ..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "ØÙÙÙØÙ ØÙØÙ ØØÙØØÙ ÙÙ ÙÙÙÙÙ ØØØØØØØÙØ."
-
-#: ../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 ""
-"ÂØÙÙÙØÙÂ ØØÙØÙØ ØØØØ ÙÙÙÙÙ ØÙØÙØÙØ Ù/ØÙ ØØØÙÙÙØ ØØØ ØÙÙØ ØØØØ ØÙÙ ØÙØÙÙÙÙØ "
-"ÙÙØ ÙØØØÙØ ÙØØØØ ØÙØØØÙØ ØÙØØØØ ØÙØØØØØ ØÙØØÙÙ ØÙ ØÙ ØØØØØ ØØØØ (ØØØ "
-"ØØØØÙ).\n"
-"\n"
-"ØÙØØ ÂØÙÙÙØÙÂ ØÙÙ ØÙÙ ØÙ ØÙÙÙ ÙÙÙØØØ ÙÙÙÙ ØÙÙ ØÙØ ØÙØÙØØØ ØÙØ ÙÙ ØÙÙ ØÙØÙØØ "
-"ÙØØÙÙØ ØÙØØÙØÙØ ÙÙØØÙÙÙ ØÙ ØÙÙÙØØÙØ ÙØØØ ÙØÙÙ. ØÙØØ ÙØ ØØØØ ØÙÙ ØÙØÙÙÙÙØ "
-"ÙÙØÙØ ÙÙ ØÙØÙØØÙÙ.\n"
-"\n"
-"ÙÙ ØÙÙÙØØØ ØÙÙ ØÙÙÙØ ÙØØØ ÙÙ ØØØØ ØÙÙ ØÙØÙÙÙÙØ ÙØ ÙØØ ØÙØØÙØÙØØ ØØØ ÙÙ ÙØØØ "
-"ÙØØ ÙØÙØØ ØÙÙ ÙØØØØ ØÙØØÙØÙØØ ØÙØØØ\n"
-"Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA \n"
-"02111-1307, USA."
-
-#. 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 "ÙÙÙÙØ ØØÙØØ"
diff --git a/po/ast.po b/po/ast.po
index ddfa8fb..8b9a1ac 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: upstream-translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-06-10 19:44+0100\n"
 "Last-Translator: astur <malditoastur gmail com>\n"
 "Language-Team: Softastur <alministradores softastur org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,10 +22,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Xestor personal de xeres"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:462
-#: ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Xeres"
 
@@ -63,11 +61,16 @@ msgstr "Toes"
 msgid "no date set"
 msgstr "ensin fecha afitada"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "GÃei"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "pa maÃana"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "EnxamÃs"
 
@@ -157,85 +160,85 @@ msgstr "avientu|avi"
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr "^(?<task>.+) gÃei$"
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr "^(?<task>.+) maÃana$"
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr "^(?<task>.+) ayeri$"
 
-#. Translators: just translate "next"
-#: ../libkoto/koto-date-parser.c:480
-#, c-format
-msgid "^(?<task>.+) next (?<day>%s)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+#, fuzzy
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr "^(?<task>.+) siguiente (?<day>%s)$"
 
-#: ../libkoto/koto-date-parser.c:481
-msgid "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|fri|sat|sun"
-msgstr "llunes|martes|miÃrcoles|xueves|vienres|sÃbadu|domingu|llu|mar|miÃ|xue|vie|sÃb|dom"
-
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr "^(?<task>.+) (esti|en|por|pa) (?<day>\\w+)$"
 
-#. Translators: replace by|due|on with suitable words, and re-order the day
-#. and month expressions as suitable
-#: ../libkoto/koto-date-parser.c:494
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:por|pa|en) (?<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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr "^(?<task>.+) (?:por|pa|en)? (?<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+)$"
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr "^(?<task>.+) (?:por|pa|en)? (?<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)?$"
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr "^(?<task>.+) (?:por|pa|en)? (?<month>\\w+) (?<day>\\d{1,2})(?:Â)?$"
 
-#. Translators: just translate this|on|by|due to contain relevant words in
-#. your language
-#: ../libkoto/koto-date-parser.c:514
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 msgstr "^(?<task>.+) (?:por|pa|en)? (?<digits>[\\d/-]+)$"
 
-#. 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:por|pa|en)? s(?<week>\\d{1,2})$"
 
-#. 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 msgid "^(?<task>.+) in (?<days>\\d+) days?$"
 msgstr "^(?<task>.+) en (?<days>\\d+) dÃes?$"
 
-#. 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr "^(?<task>.+) en (?<weeks>\\d+) selmanes?$"
 
@@ -247,11 +250,11 @@ msgstr "Inxertar"
 msgid "Delete"
 msgstr "Desaniciar"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "Nueva categorÃa"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "Escribi'l nome de la nueva categorÃa:"
 
@@ -260,8 +263,9 @@ msgid "None"
 msgstr "DengÃn"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Nueva categorÃa..."
+#, fuzzy
+msgid "New Category..."
+msgstr "Nueva categorÃa"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -304,19 +308,15 @@ msgid "D_escription:"
 msgstr "D_escripciÃ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 "ÂDaveres quies desaniciar \"%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 "Si desanicies un elementu, va perdese definitivamente."
 
-#: ../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 "Desaniciar xera %s"
@@ -343,16 +343,15 @@ msgstr "_Notes"
 msgid "%s - Tasks"
 msgstr "%s - Xeres"
 
-#: ../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 "Xera completa"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Fecho"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Resume"
 
@@ -387,110 +386,58 @@ msgstr "Amestar xera %s"
 msgid "Remove Completed"
 msgstr "Quitar completaes"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 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"
-"\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"
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Astur <malditoastur gmail com>, 2010"
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "El proyeutu Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "_Xera"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Desaniciar completaes"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "_Aida"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "Editar..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_ConseÃar como terminada"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr " - una llista de xeres"
 
-#: ../src/gtk/main.c:742
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_CategorÃa:"
 
-#: ../src/gtk/main.c:767
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nueva xera..."
 
-#: ../src/gtk/main.c:791
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Xeres (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "ÂDaveres quies desaniciar toles xeres completaes?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Desaniciar les xeres completaes significa que van perdese dafechu."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nueva xera"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Editar xera..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Desaniciar xera"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Colar"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Tocante a"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nueva xera"
-
diff --git a/po/bg.po b/po/bg.po
index 7bc4740..251af8f 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,8 +22,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "ÐÐÐÐÑÐ"
 
@@ -64,11 +64,16 @@ msgstr ""
 msgid "no date set"
 msgstr "ÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐ"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "ÐÐÐÑ"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "ÑÑÑÐ"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -159,89 +164,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -253,11 +253,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "ÐÐÐÐ ÐÐÑÐÐÐÑÐÑ"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr "ÐÐÐ"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐ..."
+msgid "New Category..."
+msgstr "ÐÐÐÐ ÐÐÑÐÐÐÑÐÑ"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -313,13 +313,12 @@ msgstr "_ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÐ:"
 msgid "D_escription:"
 msgstr "_ÐÐÐÑÐÐÐÐ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -355,11 +354,11 @@ msgstr "ÐÐÐÐÑÐ"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "ÐÐÐ"
 
@@ -394,115 +393,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "ÐÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_ÐÐÑÐÐÐÑÐÑ:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐ..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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
-#, 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 7d2bfa2..aa6577d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-17 17:03+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-11-15 09:00+0100\n"
 "Last-Translator: Jordi Estrada <jordi estrada gmail com>\n"
 "Language-Team: Catalan <tradgnome softcatala org>\n"
@@ -23,7 +23,6 @@ msgid "Personal task manager"
 msgstr "Gestor personal de tasques"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -305,13 +304,12 @@ msgstr "AdreÃa _web:"
 msgid "D_escription:"
 msgstr "D_escripciÃ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Segur que voleu suprimir Â%sÂ?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Si suprimiu un element es perdrà definitivament."
 
@@ -393,11 +391,11 @@ msgstr ""
 "Aquest programa ve amb ABSOLUTAMENT CAP GARANTIA; per a mÃs detalls, visiteu "
 "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Jordi Estrada <jordi estrada gmail com>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "El projecte Pimlico"
 
@@ -406,7 +404,7 @@ msgstr "El projecte Pimlico"
 msgid "_Task"
 msgstr "_Tasca"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Suprimeix les completades"
 
@@ -422,8 +420,7 @@ msgstr "_Ajuda"
 msgid "Edit..."
 msgstr "Edita..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marca com a completada"
 
@@ -431,88 +428,15 @@ msgstr "_Marca com a completada"
 msgid " - a to do list"
 msgstr " - un organitzador de coses a fer"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Tasca nova..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tasques (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Segur que voleu suprimir totes les tasques completades?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Si suprimiu les tasques completades es perdran definitivament."
-
-#: ../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 ""
-"Aquest programa Ãs programari lliure; podeu redistribuir-lo i/o modificar-lo "
-"sota els termes de la LlicÃncia PÃblica General GNU tal com ha estat "
-"publicada per la Free Software Foundation; ja sigui la versià 2 de la "
-"LlicÃncia o bà (si ho preferiu) qualsevol altra versià posterior. \n"
-"\n"
-"Aquest programa es distribueix amb l'expectativa que serà Ãtil, perà SENSE "
-"CAP GARANTIA; ni tan sols la garantia implÃcita de COMERCIABILITAT o "
-"ADEQUACIÃ PER UN PROPÃSIT PARTICULAR. Vegeu la LlicÃncia PÃblica General GNU "
-"per obtenir-ne mÃs detalls.\n"
-"\n"
-"HaurÃeu d'haver rebut una cÃpia de la LlicÃncia PÃblica General GNU "
-"juntament amb aquest programa; en cas contrari, consulteu <http://www.gnu.";
-"org/licenses/>."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Tasca nova"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Edita la tasca..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Suprimeix la tasca"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Surt"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Quant a"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Tasca nova"
-
-#~ msgid "New Group..."
-#~ msgstr "Grup nou..."
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (venà %s)"
-
-#~ msgid "_Add"
-#~ msgstr "_Afegeix"
diff --git a/po/ca valencia po b/po/ca valencia po
index ad923d2..978b801 100644
--- a/po/ca valencia po
+++ b/po/ca valencia po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-04-20 10:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Gestor personal de tasques"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:644
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -266,7 +265,6 @@ msgstr "Cap"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-#| msgid "New Category"
 msgid "New Category..."
 msgstr "Categoria nova"
 
@@ -313,13 +311,12 @@ msgstr "AdreÃa _web:"
 msgid "D_escription:"
 msgstr "_DescripciÃ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -394,119 +391,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "Tasques"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:645
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "Llista de coses a fer"
 
-#: ../src/gtk/main.c:763 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Tasca nova..."
 
-#: ../src/gtk/main.c:812 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tasques (%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
-#, 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..."
-
-#, fuzzy
-#~ msgid "New Group..."
-#~ 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 b622a7b..6addd77 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,16 +8,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-10-28 19:22+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-10-29 11:21+0200\n"
 "Last-Translator: Marek Äernockà <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -27,7 +26,6 @@ msgid "Personal task manager"
 msgstr "Osobnà sprÃvce ÃkolÅ"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ãkoly"
 
@@ -309,13 +307,12 @@ msgstr "_Webovà adresa:"
 msgid "D_escription:"
 msgstr "_Popis:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Opravdu chcete smazat â%sâ?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Pokud poloÅku smaÅete, nenÃvratnÄ o ni pÅijdete."
 
@@ -397,11 +394,11 @@ msgstr ""
 "Tento program je dodÃvÃn bez JAKÃCHKOLIV ZÃRUK; vÃce najdete na http://www.";
 "gnu.org/licenses/old-licenses/gpl-2.0.html"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Marek Äernockà <marek manet cz>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Projekt Pimlico"
 
@@ -410,7 +407,7 @@ msgstr "Projekt Pimlico"
 msgid "_Task"
 msgstr "Ã_kol"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Sma_zat dokonÄenÃ"
 
@@ -426,8 +423,7 @@ msgstr "_NÃpovÄda"
 msgid "Edit..."
 msgstr "Upravitâ"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_OznaÄit jako dokonÄenÃ"
 
@@ -435,80 +431,15 @@ msgstr "_OznaÄit jako dokonÄenÃ"
 msgid " - a to do list"
 msgstr " - seznam ÃkolÅ"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Novà Ãkolâ"
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Ãkoly (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Opravdu chcete smazat vÅechny dokonÄenà Ãkoly?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "SmazÃnà dokonÄenÃch ÃkolÅ znamenÃ, Åe o nÄ nenÃvratnÄ pÅijdete"
-
-#: ../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 ""
-"Aplikace Tasks je svobodnà software: MÅÅete ji dÃle ÅÃÅit a/nebo upravovat "
-"za podmÃnek licence GNU General Public License v podobÄ, v jakà ji vydala "
-"Free Software Foundation, a to buÄ ve verzi 2 tÃto licence nebo (dle vaÅÃ "
-"volby) v libovolnà novÄjÅà verzi.\n"
-"\n"
-"Aplikace Tasks je ÅÃÅena ve vÃÅe, Åe bude uÅiteÄnÃ, ale BEZ JAKÃCHKOLIV "
-"ZÃRUK, a to i bez pÅedpoklÃdanà zÃruky na PRODEJNOST nebo VHODNOST PRO "
-"KONKRÃTNà ÃÄEL. VÃce podrobnostà najdete pÅÃmo v licenci GNU General Public "
-"License.\n"
-"\n"
-"Spolu s tÃmto programem byste mÄli obdrÅet kopii licence GNU General Public "
-"License. Pokud se tak nestalo, napiÅte na Free Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Novà Ãkol"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Upravit Ãkolâ"
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Smazat Ãkol"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "UkonÄit"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "O aplikaci"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Novà Ãkol"
-
diff --git a/po/cy.po b/po/cy.po
index 9c03135..f30cdd9 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,8 +16,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Rheolydd tasgau personol"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Tasgau"
 
@@ -58,11 +58,16 @@ msgstr ""
 msgid "no date set"
 msgstr "dim dyddiad wedi'i osod"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Heddiw"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "yfory"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -153,89 +158,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr ""
 
-#. Translators: just translate "next"
-#: ../libkoto/koto-date-parser.c:480
-#, c-format
-msgid "^(?<task>.+) next (?<day>%s)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 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
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -247,11 +247,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "Categori Newydd"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -261,8 +261,8 @@ msgstr "Dim"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "Tasg newydd..."
+msgid "New Category..."
+msgstr "Categori Newydd"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -307,13 +307,12 @@ msgstr "Cyfeiriad _WÃ"
 msgid "D_escription:"
 msgstr "_Disgrifiad:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -349,11 +348,11 @@ msgstr "Tasgau"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Wedi'i wneud"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Crynodeb"
 
@@ -388,112 +387,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "Tasgau"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "Rhestr o Dasgau I'w Wneud"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categori:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Tasg newydd..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tasgau (%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
-#, 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 65b0d4b..040e928 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-19 23:16+0200\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-09-18 18:29+0200\n"
 "Last-Translator: Joe Hansen <joedalton2 yahoo dk>\n"
 "Language-Team: Danish <dansk dansk-gruppen dk>\n"
@@ -23,7 +23,6 @@ msgid "Personal task manager"
 msgstr "Personlig opgavehÃndtering"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Opgaver"
 
@@ -309,13 +308,12 @@ msgstr "_Websted:"
 msgid "D_escription:"
 msgstr "D_escription:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hvis du sletter en opgave gÃr den tabt."
 
@@ -397,7 +395,7 @@ msgstr ""
 "Med dette program fÃlger INGEN GARANTI OVERHOVEDET; for detaljer sà besÃg "
 "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "David Nielsen <david lovesunix net>\n"
@@ -407,7 +405,7 @@ msgstr ""
 "Dansk-gruppen <dansk dansk-gruppen dk>\n"
 "Mere info: http://www.dansk-gruppen.dk";
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico-projektet"
 
@@ -416,7 +414,7 @@ msgstr "Pimlico-projektet"
 msgid "_Task"
 msgstr "_Opgave"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Fje_rn fuldfÃrte"
 
@@ -432,8 +430,7 @@ msgstr "_HjÃlp"
 msgid "Edit..."
 msgstr "Rediger..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_MÃrk fuldfÃrte"
 
@@ -441,79 +438,15 @@ msgstr "_MÃrk fuldfÃrte"
 msgid " - a to do list"
 msgstr " - en opgaveliste"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "Ka_tegori:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Ny opgave..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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."
-
-#: ../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 ""
-"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"
-"\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."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Ny opgave"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Rediger opgave..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Slet opgave"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Afslut"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Om"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Ny opgave"
diff --git a/po/de.po b/po/de.po
index 740dcf7..dcb8f10 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-10-14 13:47+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-10-25 20:54+0100\n"
 "Last-Translator: Mario BlÃttermann <mariobl gnome org>\n"
 "Language-Team: German <gnome-de gnome org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,6 @@ msgid "Personal task manager"
 msgstr "PersÃnliche Aufgaben Verwaltung"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -318,13 +317,12 @@ msgstr "_Webseite:"
 msgid "D_escription:"
 msgstr "_Beschreibung:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "MÃchten Sie Â%s wirklich lÃschen?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Wenn Sie einen Eintrag lÃschen, ist er fÃr immer verloren."
 
@@ -400,19 +398,19 @@ msgstr "Erledigte lÃschen"
 
 #: ../src/gtk/main.c:448
 msgid ""
-"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://www.";
-"gnu.org/licenses/old-licenses/gpl-2.0.html"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
 "Dieses Programm wird OHNE JEGLICHE GEWÃHRLEISTUNG geliefert. Details finden "
 "Sie auf http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Andreas Machoy <andreasx machoy intel com>\n"
 "Mario BlÃttermann <mariobl gnome org>nund andere â"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Das Pimlico Projekt"
 
@@ -421,7 +419,7 @@ msgstr "Das Pimlico Projekt"
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "E_rledigte lÃschen"
 
@@ -437,8 +435,7 @@ msgstr "_Hilfe"
 msgid "Edit..."
 msgstr "Bearbeiten â"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "Als erledigt _markieren"
 
@@ -446,105 +443,15 @@ msgstr "Als erledigt _markieren"
 msgid " - a to do list"
 msgstr "- eine Aufgabenliste"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategorie:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Neue Aufgabe â"
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Aufgaben (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Sind Sie sicher, dass Sie alle erledigten Aufgaben lÃschen wollen?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Erledigte Aufgaben lÃschen bedeutet, dass sie fÃr immer verloren sind."
-
-#: ../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 ""
-"Tasks ist freie Software, Sie kÃnnen sie weitergeben und/oder\n"
-" verÃndern solange Sie sich an die Regeln der GNU General Public License\n"
-" halten, so wie sie von der Free Software Foundation festgelegt wurden;\n"
-" entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder "
-"folgenden Lizenz.\n"
-" \n"
-" Tasks wurde mit dem Ziel verÃffentlicht, dass Sie es nÃtzlich finden,\n"
-" jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie\n"
-" der VERKAUFBARKEIT oder der NUTZBARKEIT FÃR EINEN SPEZIELLEN ZWECK.\n"
-" Schauen Sie fÃr weitere Informationen bitte in der GNU General Public "
-"License (GNU GPL) nach.\n"
-" \n"
-" Mit Tasks sollten Sie auÃerdem eine Kopie der GNU General Public License "
-"erhalten\n"
-" haben. Wenn dem nicht so ist, so schreiben Sie bitte an die\n"
-"Free Software Foundation, Inc.,\n"
-" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Neue Aufgabe"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Aufgabe bearbeiten â"
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Aufgabe lÃschen"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Beenden"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Info"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Neue Aufgabe"
-
-#~ msgid ""
-#~ "Tasks\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Tasks\n"
-#~ "\n"
-
-#~ msgid "New Group..."
-#~ msgstr "Neue Gruppe â"
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "Montag|Dienstag|Mittwoch|Donnerstag|Freitag|Samstag|Sonntag|Mo|Di|Mi|Do|Fr|"
-#~ "Sa|So"
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (fertig bis %s)"
-
-#~ msgid "_Add"
-#~ msgstr "_HinzufÃgen"
diff --git a/po/el.po b/po/el.po
index 4834d74..84fe284 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +21,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "ÎÏÎÎÏÎÎÏ"
 
@@ -63,11 +63,16 @@ msgstr ""
 msgid "no date set"
 msgstr "ÎÎÎ ÎÏÎÏÏÎÎÎ ÎÎÎÏÎÎÎÎÎÎ"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "ÎÎÎÎÏÎ"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "ÎÏÏÎÎ"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -158,89 +163,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -252,12 +252,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_ÎÎÏÎÎÎÏÎÎ:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr "ÎÎÎÎÎÎ"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "ÎÎÎ ÎÏÎÎÏÎÎ..."
+msgid "New Category..."
+msgstr "_ÎÎÏÎÎÎÏÎÎ:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -313,13 +313,12 @@ msgstr "_ÎÎÎÏÎÏÎÏÎ ÎÏÏÎÏ:"
 msgid "D_escription:"
 msgstr "ÎÎÏÎÎÏÎ_ÏÎ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -355,11 +354,11 @@ msgstr "ÎÏÎÎÏÎÎÏ"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "ÎÎÎÎÎÎÏÏÎÎÎÎ"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "ÎÎÏÎÎÎÏÎ"
 
@@ -394,115 +393,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "ÎÏÎÎÏÎÎÏ"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "ÎÎÏÏÎ ÎÏÎÎÏÎÏÎ"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_ÎÎÏÎÎÎÏÎÎ:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "ÎÎÎ ÎÏÎÎÏÎÎ..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 685e6b4..aa89791 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-10-14 13:47+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-10-14 19:31+0200\n"
 "Last-Translator: Jorge GonzÃlez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃol <gnome-es-list gnome org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,6 @@ msgid "Personal task manager"
 msgstr "Gestor personal de tareas"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -308,13 +307,12 @@ msgstr "DirecciÃn _web:"
 msgid "D_escription:"
 msgstr "D_escripciÃn:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Si eliminas un elemento, se perderà definitivamente."
 
@@ -396,11 +394,11 @@ msgstr ""
 "\"Este programa viene SIN NINGUNA GARANTÃA; para obtener mÃs detalles visite "
 "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Jorge GonzÃlez <jorgegonz svn gnome org>, 2009"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "El proyecto Pimlico"
 
@@ -409,7 +407,7 @@ msgstr "El proyecto Pimlico"
 msgid "_Task"
 msgstr "_Tarea"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Borrar terminadas"
 
@@ -425,8 +423,7 @@ msgstr "_Ayuda"
 msgid "Edit..."
 msgstr "Editarâ"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marcar como terminada"
 
@@ -434,101 +431,15 @@ msgstr "_Marcar como terminada"
 msgid " - a to do list"
 msgstr ".-. una lista de tareas"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_CategorÃa:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nueva tareaâ"
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tareas (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "ÂEstÃs seguro de que quieres eliminar todas las tareas terminadas?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr ""
-"Borrar las tareas terminadas significa que se perderÃn definitivamente."
-
-#: ../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 ""
-"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"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nueva tarea"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Editar tareaâ"
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Borrar tarea"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Salir"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Acerca de"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nueva tarea "
-
-#~| msgid "Tasks"
-#~ msgid ""
-#~ "Tasks\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Tareas\n"
-#~ "\n"
-
-#~ msgid "New Group..."
-#~ msgstr "Nueva categorÃa..."
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "lunes|martes|miÃrcoles|jueves|viernes|sÃbado|domingo|lun|mar|mie|jue|vie|"
-#~ "sÃb|dom"
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (para %s)"
diff --git a/po/et.po b/po/et.po
index a7d2f4c..2e0c4a8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tasks HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,8 +24,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Isiklik Ãlesandehaldur"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Ãlesanded"
 
@@ -66,11 +66,16 @@ msgstr ""
 msgid "no date set"
 msgstr "kuupÃev mÃÃramata"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "TÃna"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "homme"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -161,89 +166,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -255,12 +255,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_Kategooria:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -270,8 +270,8 @@ msgstr "Puudub"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "Uus Ãlesanne..."
+msgid "New Category..."
+msgstr "_Kategooria:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -316,13 +316,12 @@ msgstr "_Veebileht:"
 msgid "D_escription:"
 msgstr "_Kirjeldus"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -358,11 +357,11 @@ msgstr "Ãlesanded"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Tehtud"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "KokkuvÃte"
 
@@ -397,115 +396,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "Ãlesanded"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "TÃÃde loend"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategooria:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Uus Ãlesanne..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 0e3f483..984016f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu_to_be_translate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-19 16:46+0100\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-11-19 16:51+0100\n"
 "Last-Translator: IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,6 @@ msgid "Personal task manager"
 msgstr "Ataza kudeatzaile pertsonala"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Atazak"
 
@@ -306,13 +306,12 @@ msgstr "_Web helbidea:"
 msgid "D_escription:"
 msgstr "_Deskripzioa:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ziur zaude \"%s\" ezabatzea nahi duzula?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Elementu bat ezabaten baduzu, betirako galduko da."
 
@@ -394,11 +393,11 @@ msgstr ""
 "Programa honek ez du INOLAKO BERMERIK; xehetasun gehiagorako ikus http://www.";
 "gnu.org/licenses/old-licenses/gpl-2.0.html"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "IÃaki LarraÃaga Murgoitio <dooteo euskalgnu org>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico proiektua"
 
@@ -407,7 +406,7 @@ msgstr "Pimlico proiektua"
 msgid "_Task"
 msgstr "_Ataza"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Kendu burututakoak"
 
@@ -423,8 +422,7 @@ msgstr "_Laguntza"
 msgid "Edit..."
 msgstr "Editatu..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Markatu eginda gisa"
 
@@ -432,83 +430,15 @@ msgstr "_Markatu eginda gisa"
 msgid " - a to do list"
 msgstr " - atazen zerrenda"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Ataza berria..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Atazak (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Ziur zaude burutako ataza denak ezabatzea nahi dituzula?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr ""
-"Burututako atazak ezabatzeak hauek betirako galdu egingo direla adierazten "
-"du."
-
-#: ../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 ""
-"Tasks software librea da; birbana eta/edo alda dezakezu Software Foundation-"
-"ek argitaratutako GNU Lizentzia Publiko Orokorraren 2. bertsioan, edo "
-"(nahiago baduzu) beste berriago batean, jasotako baldintzak betez gero.\n"
-"\n"
-"Tasks erabilgarria izango delakoan banatzen da, baina, INOLAKO BERMERIK "
-"GABE; era berean, ez da bermatzen beraren EGOKITASUNA MERKATURATZEKO edo "
-"HELBURU PARTIKULARRETARAKO ERABILTZEKO. Argibide gehiago nahi izanez gero, "
-"ikus GNU Lizentzia Publiko Orokorra.\n"
-"\n"
-"Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko "
-"zenuen; hala ez bada, idatzi hona: ree Software Foundation, Inc., 51 "
-"Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Ataza berria"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Editatu ataza..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Ezabatu ataza"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Irten"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Honi buruz"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Ataza berria"
-
-#~ msgid "New Group..."
-#~ msgstr "Talde berria..."
diff --git a/po/fi.po b/po/fi.po
index 992e691..1dd5257 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2009-07-24 14:46-0800\n"
 "Last-Translator: Omar Antila <oantila ptiglobal com>\n"
 "Language-Team: Finnish <fi li org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,10 +23,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "HenkilÃkohtainen tehtÃvienhallinta"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:462
-#: ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "TehtÃvÃt"
 
@@ -64,11 +62,16 @@ msgstr "Kaikki"
 msgid "no date set"
 msgstr "pÃivÃystà ei asetettu"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "TÃnÃÃn"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "huomenna"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "Ei koskaan"
 
@@ -158,85 +161,92 @@ msgstr "joulukuu|jou"
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr "^(?<task>.+) tÃnÃÃn$"
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr "^(?<task>.+) huomenna$"
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr "^(?<task>.+) eilen$"
 
-#. Translators: just translate "next"
-#: ../libkoto/koto-date-parser.c:480
-#, c-format
-msgid "^(?<task>.+) next (?<day>%s)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+#, fuzzy
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 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"
-
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr "^(?<task>.+) (tÃmÃn kuun|ajankohtana|ennen|mennessÃ) (?<day>\\w+)$"
 
-#. Translators: replace by|due|on with suitable words, and re-order the day
-#. and month expressions as suitable
-#: ../libkoto/koto-date-parser.c:494
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-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+)$"
-
-#. 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+)"
-
-#. Translators: just translate this|on|by|due to contain relevant words in
-#. your language
-#: ../libkoto/koto-date-parser.c:514
+msgstr ""
+"^(?<task>.+) (?:ennen|mennessÃ|ajankohtana)? (?<day>\\d{1,2})(?:.|.|.|.)?$"
+
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+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: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+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: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 msgstr "^(?<task>.+) (?:ennen|mennessÃ|ajankohtana)? (?<digits>[\\d/-]+)$"
 
-#. 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:ennen|mennessÃ|viikolla)? vk(?<week>\\d{1,2})$"
 
-#. 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 msgid "^(?<task>.+) in (?<days>\\d+) days?$"
 msgstr "^(?<task>.+) (?<days>\\d+) pÃivÃn kuluessa?$"
 
-#. 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr "^(?<task>.+) (?<weeks>\\d+) viikon kuluessa?$"
 
@@ -248,11 +258,11 @@ msgstr "LisÃÃ"
 msgid "Delete"
 msgstr "Poista"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "Uusi luokka"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "SyÃtà uuden luokan nimi:"
 
@@ -261,8 +271,9 @@ msgid "None"
 msgstr "Ei mitÃÃn"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Uusi ryhmÃ..."
+#, fuzzy
+msgid "New Category..."
+msgstr "Uusi luokka"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -305,19 +316,15 @@ msgid "D_escription:"
 msgstr "_Kuvaus:"
 
 #: ../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
 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"
@@ -344,16 +351,15 @@ 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"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Valmis"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Yhteenveto"
 
@@ -388,115 +394,60 @@ 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:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 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"
-"\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."
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 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:460
 msgid "The Pimlico Project"
 msgstr "Pimlico-projekti"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "_TehtÃvÃ"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Poisto onnistui"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "O_hje"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 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:488
 msgid "_Mark Complete"
 msgstr "_Merkitse valmiiksi"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr "- tehtÃvÃluettelo"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Luokka:"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Uusi tehtÃvÃ..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "TehtÃvÃt (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Haluatko varmasti poistaa kaikki valmiit tehtÃvÃt?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Valmiiden tehtÃvien poisto tarkoittaa niiden pysyvÃÃ menettÃmistÃ."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Uusi tehtÃvÃ"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Muokkaa tehtÃvÃÃ..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Poista tehtÃvÃ"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Lopeta"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Tietoja"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Uusi tehtÃvÃ"
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (tavoite %s)"
-
diff --git a/po/fr.po b/po/fr.po
index 47204ce..8d16b4c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,12 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-10-14 13:47+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,6 @@ msgid "Personal task manager"
 msgstr "Gestionnaire personnel de tÃches"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "TÃches"
 
@@ -213,8 +212,8 @@ msgstr "^(?<task>.+) (?:pour|prÃvu|pour le)? (?<day>\\d{1,2})(?:er|e)?$"
 msgid ""
 "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr ""
-"^(?<task>.+) (?:pour|prÃvu|pour le)? (?<day>\\d{1,2})(?:er|e)? (?<month>\\w+)"
-"$"
+"^(?<task>.+) (?:pour|prÃvu|pour le)? (?<day>\\d{1,2})(?:er|e)? (?<month>\\w"
+"+)$"
 
 # Ce n'est pas franÃais mais il est inutile d'utiliser la mÃme forme que la
 # prÃcÃdente et permet donc aussi de dÃtecter ÂÂtÃche pour le juin 12ÂÂ - StÃphane
@@ -313,13 +312,12 @@ msgstr "Adresse _WebÂ:"
 msgid "D_escription:"
 msgstr "D_escriptionÂ:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ãtes-vous sÃr de vouloir supprimer ÂÂ%sÂÂÂ?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Si vous supprimez un ÃlÃment, il sera dÃfinitivement perdu."
 
@@ -401,14 +399,14 @@ msgstr ""
 "Ce programme est distribuà SANS AUCUNE GARANTIEÂ; pour plus de dÃtails, "
 "consultez http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Bruno Bord\n"
 "Jean-FranÃois Fortin Tam\n"
 "StÃphane Raimbault <stephane raimbault gmail com>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Le projet Pimlico"
 
@@ -417,7 +415,7 @@ msgstr "Le projet Pimlico"
 msgid "_Task"
 msgstr "_TÃche"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Supprimer les tÃches _accomplies"
 
@@ -433,8 +431,7 @@ msgstr "Aid_e"
 msgid "Edit..."
 msgstr "Modifier..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marquer comme accomplie"
 
@@ -442,92 +439,15 @@ msgstr "_Marquer comme accomplie"
 msgid " - a to do list"
 msgstr " - une liste de tÃches"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_CatÃgorieÂ:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nouvelle tÃche..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "TÃches (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Ãtes-vous sÃr de vouloir supprimer toutes les tÃches accompliesÂ?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr ""
-"Supprimer les tÃches accomplies signifie qu'elles seront dÃfinitivement "
-"perdues."
-
-#: ../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 ""
-"Tasks est un logiciel libre, vous pouvez le redistribuer et/ou le modifier "
-"selon les termes de la Licence Publique GÃnÃrale GNU publiÃe par la Free "
-"Software Foundation (version 2 ou bien toute autre version ultÃrieure "
-"choisie par vous).\n"
-"\n"
-"Ce programme est distribuà car potentiellement utile, mais SANS AUCUNE "
-"GARANTIE, ni explicite ni implicite, y compris les garanties de "
-"commercialisation ou d'adaptation dans un but spÃcifique. Reportez-vous à la "
-"Licence Publique GÃnÃrale GNU pour plus de dÃtails.\n"
-"\n"
-"Vous devez avoir reÃu une copie de la Licence Publique GÃnÃrale GNU en mÃme "
-"temps que ce programmeÂ; si ce n'est pas le cas, Ãcrivez à la Free Software "
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, Ãtats-"
-"Unis."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nouvelle tÃche"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Modifier la tÃche..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Supprimer la tÃche"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Ã propos"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nouvelle tÃche"
-
-#~ msgid "New Group..."
-#~ msgstr "Nouvelle catÃgorie..."
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "lundi|mardi|mercredi|jeudi|vendredi|samedi|dimanche|lun.|mar.|mer.|jeu.|"
-#~ "ven.|sam.|dim."
diff --git a/po/gl.po b/po/gl.po
index 36e60db..6ff64db 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks-master-po-gl-8889\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 13:02+0200\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-09-25 13:03+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
@@ -29,7 +29,6 @@ msgid "Personal task manager"
 msgstr "Xestor Persoal de Tarefas"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -313,13 +312,12 @@ msgstr "Enderezo _Web:"
 msgid "D_escription:"
 msgstr "_DescriciÃn:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Esta seguro que quere eliminar \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Se elimina o elemento, perderase permanentemente."
 
@@ -401,12 +399,12 @@ msgstr ""
 "Este programa ven SEN NINGUNHA GARANTÃA; para obter mÃis detalles visite "
 "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Fran Dieguez <fran dieguez glug es>, 2009; MancomÃn <g11n mancomun org>, 2009"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Proxecto Pimlico"
 
@@ -415,7 +413,7 @@ msgstr "Proxecto Pimlico"
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Eliminar completamente"
 
@@ -431,8 +429,7 @@ msgstr "_Axuda"
 msgid "Edit..."
 msgstr "Editar..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marcar completadas"
 
@@ -440,88 +437,15 @@ msgstr "_Marcar completadas"
 msgid " - a to do list"
 msgstr " - unha lista de tarefas"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_CategorÃa:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nova tarefa..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tarefas (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Esta seguro que quere eliminar toda as tarefas completadas?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Ao eliminar as tarefas completadas perderanse completamente."
-
-#: ../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 ""
-"Tasks à software libre, pode redistribuÃlo e/ou modificalo baixo os termos "
-"da Licenza pÃblica xeral tal como a publicou a Free Software Foundation; "
-"tanto a 2 da Licenza, ou (ao seu criterio) calquera outra versiÃn.\n"
-"\n"
-"Tasks distribÃese na esperanza de que sexa Ãtil pero SEN NINGÃN TIPO DE "
-"GARANTÃA, nin sequera a garantÃa implÃcita DE COMECIABILIDADE OU ADECUACIÃ "
-"PARA CALQUERA PROPÃSITO PARTICULAR. Vexa a Licenza pÃblica xeral para mÃis "
-"detalles.\n"
-"\n"
-"DeberÃa ter recibido unha copia do Licenza pÃblica xeral xunto con Tasks; de "
-"non ser asÃ, escriba à Free Software Foundation, Inc., 51 Franklin St, Fifth "
-"Floor, Boston, MA 0110-1301, USA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nova tarefa"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Edita a tarefa..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Eliminar tarefa"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "SaÃr"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Sobre"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nova tarefa"
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "luns|martes|mÃrcores|xoves|venres|sÃbado|domingo|lun|mar|mer|xov|ven|sab|"
-#~ "dom"
-
-#~ msgid "New Group..."
-#~ msgstr "Novo grupo..."
diff --git a/po/hu.po b/po/hu.po
index 3a28b2d..8a73a05 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-21 16:14+0200\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-09-09 22:55+0100\n"
 "Last-Translator: BalÃzs Ãr <urbalazs gmail com>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
@@ -27,7 +27,6 @@ msgid "Personal task manager"
 msgstr "SzemÃlyes feladatkezelÅ"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Feladatok"
 
@@ -312,13 +311,12 @@ msgstr "_WebcÃm:"
 msgid "D_escription:"
 msgstr "L_eÃrÃs:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Biztosan tÃrÃlni akarja a kÃvetkezÅt: â%sâ?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Ha tÃrli az elemet, az vÃglegesen elvÃsz."
 
@@ -400,13 +398,13 @@ msgstr ""
 "Ehhez a programhoz NINCS SEMMIFÃLE GARANCIA; a rÃszletekÃrt lÃtogassa meg a "
 "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html weboldalt!"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "CsordÃs LÃszlà <csola48 at gmail dot com>\n"
 "Kelemen GÃbor <kelemeng at gnome dot hu>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "A Pimlico projekt"
 
@@ -415,7 +413,7 @@ msgstr "A Pimlico projekt"
 msgid "_Task"
 msgstr "_Feladat"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_KÃsz eltÃvolÃtÃsa"
 
@@ -431,8 +429,7 @@ msgstr "_SÃgÃ"
 msgid "Edit..."
 msgstr "SzerkesztÃsâ"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_MegjelÃlÃs kÃszkÃnt"
 
@@ -440,78 +437,15 @@ msgstr "_MegjelÃlÃs kÃszkÃnt"
 msgid " - a to do list"
 msgstr " â tennivalÃlista"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_KategÃria:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Ãj feladatâ"
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Feladatok (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Biztos, hogy tÃrÃlni akarja az Ãsszes kÃsz feladatot?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "A kÃsz feladatok tÃrlÃsÃvel azok vÃglegesen elvesznek."
-
-#: ../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 ""
-"A Feladatok szabad szoftver, terjesztheti Ãs/vagy mÃdosÃthatja a Free "
-"Software Foundation Ãltal kiadott GNU General Public License mÃsodik (vagy "
-"bÃrmely kÃsÅbbi) vÃltozatÃban foglaltak alapjÃn.\n"
-"\n"
-"A Feladatok programot abban a remÃnyben terjesztjÃk, hogy hasznos lesz, de "
-"nem vÃllalunk SEMMIFÃLE GARANCIÃT, mÃg olyan Ãrtelemben sem, hogy a program "
-"alkalmas-e a KÃZREADÃSRA vagy EGY BIZONYOS FELADAT ELVÃGZÃSÃRE. TovÃbbi "
-"rÃszletekÃrt tanulmÃnyozza a GNU GPL licencet.\n"
-"\n"
-"A Feladatok programhoz a GNU General Public License egy pÃldÃnya is jÃr, ha "
-"nem kapta meg, Ãrjon a Free Software Foundation Inc.-nek. LevÃlcÃmÃk: 51 "
-"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Ãj feladat"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Feladat szerkesztÃseâ"
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Feladat tÃrlÃse"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "KilÃpÃs"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "NÃvjegy"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Ãj feladat"
diff --git a/po/id.po b/po/id.po
index d63abe0..53de55b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?product=Tasks&component=General\n";
-"POT-Creation-Date: 2010-03-14 10:26+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-04-03 21:45+0700\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian <<id li org>>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,10 +22,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Daftar tugas pribadi"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:462
-#: ../src/gtk/main.c:644
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Tugas-tugas"
 
@@ -63,11 +61,15 @@ msgstr "Semua"
 msgid "no date set"
 msgstr "tanggal belum dipilih"
 
-#: ../libkoto/koto-date-combo.c:415
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../libkoto/koto-date-combo.c:418
+#: ../libkoto/koto-date-combo.c:435
+msgid "Tomorrow"
+msgstr ""
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "Tak pernah"
 
@@ -205,14 +207,16 @@ msgstr ""
 
 #. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
 #: ../libkoto/koto-date-parser.c:506
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr ""
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
 #. one correct way then translate this identically to the previous one.
 #: ../libkoto/koto-date-parser.c:512
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr ""
 
 #. Translators: "Pay bills on 15/4".
@@ -257,8 +261,9 @@ msgid "None"
 msgstr "Tidak ada"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Grup Baru..."
+#, fuzzy
+msgid "New Category..."
+msgstr "Kategori Baru"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -301,19 +306,15 @@ msgid "D_escription:"
 msgstr "K_eterangan:"
 
 #: ../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 "Anda yakin ingin menghapus \"%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 "Jika Anda menghapus sebuah item, dia akan hilang permanen."
 
-#: ../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 "Hapus Tugas %s"
@@ -340,8 +341,7 @@ msgstr "Catata_n"
 msgid "%s - Tasks"
 msgstr "%s - Tugas"
 
-#: ../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 "Tugas Usai"
 
@@ -384,107 +384,60 @@ msgstr "Tambah tugas %s"
 msgid "Remove Completed"
 msgstr "Hapusan Yang Usai"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
 
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Arief M Utama <arief utama gmail com>, 2007\n"
 "Andika Triwidada <andika gmail com>, 2010"
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Projek Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "_Tugas"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Hapus Yang Usai"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Sunting"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "Ba_ntuan"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "Sunting..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Tandai Usai"
 
-#: ../src/gtk/main.c:645
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr " - daftar tugas"
 
-#: ../src/gtk/main.c:763
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Tugas baru..."
 
-#: ../src/gtk/main.c:812
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tugas (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Anda yakin akan menghapus semua tugas yang usai?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Menghapus tugas yang usai berarti mereka akan hilang selamanya."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Tugas Baru"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Sunting Tugas..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Hapus Tugas"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Keluar"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Tentang"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Tugas baru"
-
diff --git a/po/it.po b/po/it.po
index 5138c55..81405c7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,12 +6,12 @@
 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-24 15:41+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2009-07-29 19:50+0200\n"
 "Last-Translator: Milo Casagrande <milo ubuntu com>\n"
 "Language-Team: Italian <tp lists linux it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +20,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Gestore attività personali"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "AttivitÃ"
 
@@ -61,11 +60,16 @@ msgstr "Tutti"
 msgid "no date set"
 msgstr "Nessuna data"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Oggi"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "entro domani"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "Mai"
 
@@ -182,7 +186,6 @@ msgstr "^(?<task>.+) ieri$"
 
 #. Translators: "Pay bills next Monday".
 #: ../libkoto/koto-date-parser.c:488
-#| msgid "^(?<task>.+) next (?<day>%s)$"
 msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr "^(?<task>.+) successivo (?<day>\\w+)$"
 
@@ -246,11 +249,11 @@ msgstr "Inserisci"
 msgid "Delete"
 msgstr "Elimina"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "Nuova categoria"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "Inserire il nome della nuova categoria:"
 
@@ -259,8 +262,9 @@ msgid "None"
 msgstr "Nessuna"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Nuovo gruppo..."
+#, fuzzy
+msgid "New Category..."
+msgstr "Nuova categoria"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -302,13 +306,12 @@ msgstr "Indirizzo _web:"
 msgid "D_escription:"
 msgstr "_Descrizione:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Eliminare Â%sÂ?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Se si elimina un'attivitÃ, non sarà pià possibile recuperarla."
 
@@ -344,11 +347,11 @@ msgid "Complete Task"
 msgstr "Attività completata"
 
 # (ndt) attivitÃ
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Completata"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Indice"
 
@@ -383,141 +386,60 @@ msgstr "Aggiungi attività %s"
 msgid "Remove Completed"
 msgstr "Rimuovi completate"
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"Tasks à software libero; à lecito redistribuirlo e/o modificarlo secondo i "
-"termini della GNU General Public License come pubblicata dalla Free Software "
-"Foundation; o la versione 2 o (a propria scelta) una versione successiva.\n"
-"\n"
-"Tasks à distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; "
-"senza neppure la garanzia implicita di NEGOZIABILITÃ o di APPLICABILITÃ PER "
-"UN PARTICOLARE SCOPO. Si veda la licenza GNU General Public License per "
-"maggiori dettagli.\n"
-"\n"
-"Questo programma deve essere distribuito assieme a una copia della GNU "
-"General Public License; in caso contrario, scrivere alla Free Software "
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
-
-#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Flavia Weisghizzi <flavia weisghizzi it>\n"
 "Milo Casagrande <milo ubuntu com>"
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "The Pimlico Project"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "A_ttivitÃ"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Rimuovi completate"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "Modifica..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Segna come completata"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr " - un elenco di attività da svolgere"
 
-#: ../src/gtk/main.c:739 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: ../src/gtk/main.c:764 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nuova attivitÃ..."
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Attività (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Eliminare davvero tutte le attività completate?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr ""
-"Se si eliminano le attività completate non sarà pià possibile recuperarle in "
-"seguito."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nuova attivitÃ"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Modifica attivitÃ..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Elimina attivitÃ"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Esci"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Informazioni"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nuova attivitÃ"
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "lunedÃ|martedÃ|mercoledÃ|giovedÃ|venerdÃ|sabato|domenica|lun|mar|mer|gio|"
-#~ "ven|sab|dom"
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (scade: %s)"
-
-#~ msgid ""
-#~ "<big><b>Are you sure you want to permanently delete \"%s\"?</b></big>\n"
-#~ "\n"
-#~ "If you delete an item, it is permanently lost."
-#~ msgstr ""
-#~ "<big><b>Sei sicuro di voler rimuovere \"%s\"?</b></big>Se rimuovi un "
-#~ "compito viene perso permanentemente"
-
-#~ msgid "_Add"
-#~ msgstr "_Aggiungi"
diff --git a/po/ja.po b/po/ja.po
index 5979af4..449d1e2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -61,12 +59,18 @@ msgstr "ããã"
 msgid "no date set"
 msgstr "æéãã"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "äæ"
 
+# "due: tomorrow"
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "æéïææ"
+
 # "no due date"
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "æéãã"
 
@@ -167,91 +171,92 @@ msgstr "12æ|12æ"
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr "^(?<task>.+)ïäæ$"
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr "^(?<task>.+)ïææ$"
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr "^(?<task>.+)ïææ$"
 
 # 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)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+#, fuzzy
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 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 "æææ|çææ|æææ|æææ|éææ|åææ|æææ|æ|ç|æ|æ|é|å|æ"
-
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr "^(?<task>.+)ï(äé|æã|æ)ï (?<day>\\w+)$"
 
-#. Translators: replace by|due|on with suitable words, and re-order the day
-#. and month expressions as suitable
-#: ../libkoto/koto-date-parser.c:494
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:æ|æé|æã) (?<month>\\d{1,2})/(?<day>\\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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr "^(?<task>.+)ï(?:æ|æé|æã)ï? (?<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>.+) (?:æ|æé|æã)? (?<day>\\d{1,2})(?:|||)? (?<month>\\w+)$"
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:æ|æé|æã)? (?<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>.+) (?:æ|æé|æã)? (?<month>\\w+) (?<day>\\d{1,2})(?:|||)?$"
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+msgid ""
+"^(?<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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 msgid "^(?<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
-#. your language and replace the w with whatever shortcut indicated "week". In
-#. English, w34 means "week 34".
-#: ../libkoto/koto-date-parser.c:520
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 msgid "^(?<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
-#. language. Remember the trailing ? is part of the regular expression to be
-#. translated.
-#: ../libkoto/koto-date-parser.c:526
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 msgid "^(?<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
-#. language. Remember the trailing ? is part of the regular expression to be
-#. translated.
-#: ../libkoto/koto-date-parser.c:532
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr "^(?<weeks>\\d+)ééäåã(?<task>.+)?$"
 
@@ -263,11 +268,11 @@ msgstr "æå"
 msgid "Delete"
 msgstr "åé"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "æèããããã"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "æèãããããåãååããããããï"
 
@@ -276,8 +281,9 @@ msgid "None"
 msgstr "ãã"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "æèãããã..."
+#, fuzzy
+msgid "New Category..."
+msgstr "æèããããã"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -320,19 +326,15 @@ msgid "D_escription:"
 msgstr "èæ(_E)"
 
 #: ../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
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "ãããã%sããåé"
@@ -359,16 +361,15 @@ msgstr "ãã(_N)"
 msgid "%s - Tasks"
 msgstr "%sï ããã"
 
-#: ../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 "ããããåä"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "åä"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "èç"
 
@@ -403,110 +404,58 @@ msgstr "ãããã%sããèå"
 msgid "Remove Completed"
 msgstr "åäããããããåé"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"Tasks ãããããããããããããããããããèåããããçèããã GNU äèåèåçèèåçæïããããã2ããåæãããããããäéããããããããããããïãåããæäãäãåéåãããæåãããããããããã\n"
-"\n"
-"Tasks ãæçããããããéããéåãããããã*åããçäè* ããã*åæåèæãäè*ã*çåãççããéåæ*ããèåãçããããããåãåãååãããããèããã GNU äèåèåçèèåçæããèããããã\n"
-"\n"
-"Tasks ãäçããGNU äèåèåçèèåçæãèèãäéåãåããããããããããåãåãããããããããããããããããèåããèæãããããããååïFree Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Yukari Yamashita <yukarix yamashita intel com>"
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico Project"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "ããã(_T)"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "åäããããããåé(_R)"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "çé(_E)"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "ããã(_H)"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "çé..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "åäããããããã"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr " - ToDo ããã"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "ããããã(_C)ï"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "æèããã..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "æèããã"
-
diff --git a/po/ko.po b/po/ko.po
index 57f55e2..0bf577c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "ìì"
 
@@ -59,11 +57,16 @@ msgstr "ëë"
 msgid "no date set"
 msgstr "ëì ìì ìì"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "ìë"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "ëê: ëì"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "ëêì ìì "
 
@@ -164,95 +167,97 @@ msgstr "12ì|Dec"
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr "^(?<task>.+) ìë$"
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr "^(?<task>.+) ëì$"
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr "^(?<task>.+) ìì$"
 
 # unable to provide translation  - Need more information
-#. Translators: just translate "next"
-#: ../libkoto/koto-date-parser.c:480
-#, c-format
-msgid "^(?<task>.+) next (?<day>%s)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+#, fuzzy
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr "^(?<task>.+) next (?<day>%s)$"
 
-#: ../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 - Need more information on this.
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 
 # unable to provide translation - Need more information on this.
-#. Translators: replace by|due|on with suitable words, and re-order the day
-#. and month expressions as suitable
-#: ../libkoto/koto-date-parser.c:494
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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})$"
 
 # unable to provide translation - Need more information on this.
-#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
-#. words in your language.
-#: ../libkoto/koto-date-parser.c:499
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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)?$"
 
 # unable to provide translation - Need more information on this.
-#. 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+)$"
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+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+)$"
 
 # unable to provide translation - Need more information on this.
-#. 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)?$"
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+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)?$"
 
 # unable to provide translation - Need more information on this.
-#. Translators: just translate this|on|by|due to contain relevant words in
-#. your language
-#: ../libkoto/koto-date-parser.c:514
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 msgstr "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 
 # unable to provide translation - Need more information on this.
-#. 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 
 # unable to provide translation - Need more information on this.
-#. 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 msgid "^(?<task>.+) in (?<days>\\d+) days?$"
 msgstr "^(?<task>.+) in (?<days>\\d+) days?$"
 
 # unable to provide translation - Need more information on this.
-#. 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 
@@ -264,11 +269,11 @@ msgstr "ìì"
 msgid "Delete"
 msgstr "ìì"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "ìëì ìíêë "
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "ìëì ìíêëì ìëì ìëíììì:"
 
@@ -277,8 +282,9 @@ msgid "None"
 msgstr "ìì"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "ìëì êë... "
+#, fuzzy
+msgid "New Category..."
+msgstr "ìëì ìíêë "
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -321,19 +327,15 @@ msgid "D_escription:"
 msgstr "ìë(_E)"
 
 #: ../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
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "ìì ìì %s"
@@ -360,16 +362,15 @@ msgstr "ìê(_N)"
 msgid "%s - Tasks"
 msgstr "%s - ìì"
 
-#: ../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 "ìì ìë"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "ìë"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "ìì"
 
@@ -404,111 +405,58 @@ msgstr "ìì ìê %s"
 msgid "Remove Completed"
 msgstr "ìê ìë "
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"Contactì ìì ìííìì ìëë; êíë ìêì ìì ìííìì ìëì ìí ëíë GNU ìë êì ìì íêìì ëë ìëííêë ììí ì ììëë; íêì ëì 2 ëë (ìíì ëë) ìë ìì ëì. \n"
-"\n"
-"Contact ì ììíê ììëëëë ììíì ëíëìë ìëí ëìë ììëì ììëë; íì ëìì ëí ìíìì ëìì ëìì ëí ìëíë ììëë. ììí ìíì GNU ìë êì ìì íêìë ìì íììì.\n"
-"\n"
-"GNU ìë êì ìì íêìë Contactê íê ìëììê ìêëëë. ëì ëì ë íìëë  ìì ìííìì ìëì ìëíììì. ììë 51 Franking St, Fifth Floor, Boston, MA 0110-1301, USA ìëë."
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "ëìì - íëë "
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico Project"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "ìì(_T)"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "ìê ìë(_R)"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "íì(_E)"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "ëìë(H)"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "íì"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "íì ìë(_M)"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr "- íì ëë"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "ìíêë(_C)"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "ìëì ìì..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "ëëê"
-
-# Translated as "...information about"
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "ìë"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "ìëì ìì"
-
diff --git a/po/nb.po b/po/nb.po
index 2699108..9c3666b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 14:29+0100\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-02-23 14:30+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb lister ping uio no>\n"
@@ -22,7 +22,6 @@ msgid "Personal task manager"
 msgstr "Personlig oppgavehÃndterer"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -310,13 +309,12 @@ msgstr "_Nett-adresse:"
 msgid "D_escription:"
 msgstr "B_eskrivelse:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Hvis du sletter et innslag, sà er det borte for godt."
 
@@ -394,15 +392,17 @@ msgstr "Fjern fullfÃrte"
 msgid ""
 "This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
 "www.gnu.org/licenses/old-licenses/gpl-2.0.html"
-msgstr "Dette programmet har ABSOLUTT INGEN GARANTI; se http://www.gnu.org/licenses/old-licenses/gpl-2.0.html for detaljer"
+msgstr ""
+"Dette programmet har ABSOLUTT INGEN GARANTI; se http://www.gnu.org/licenses/";
+"old-licenses/gpl-2.0.html for detaljer"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Espen Stefansen <espenas gmail com>\n"
 "Kjartan Maraas <kmaraas gnomelorg>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico-prosjektet"
 
@@ -411,7 +411,7 @@ msgstr "Pimlico-prosjektet"
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Fjern fullfÃrte"
 
@@ -427,8 +427,7 @@ msgstr "_Hjelp"
 msgid "Edit..."
 msgstr "Rediger â"
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marker som fullfÃrt"
 
@@ -436,78 +435,15 @@ msgstr "_Marker som fullfÃrt"
 msgid " - a to do list"
 msgstr "- en gjÃremÃlsliste"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Ny oppgave â"
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Oppgaver (%d)"
-
-#: ../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:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Ã slette fullfÃrte oppgaver vil si at de er slettet for godt."
-
-#: ../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 ""
-"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"
-"\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."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Ny oppgave"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Rediger oppgave â"
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Slett oppgave"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Avslutt"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Om"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Ny oppgave"
diff --git a/po/nl.po b/po/nl.po
index 7dab117..7bd5da9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,8 +22,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Persoonlijk taakbeheer"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Taken"
 
@@ -64,11 +64,16 @@ msgstr ""
 msgid "no date set"
 msgstr "geen datum ingesteld"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "morgen"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -159,89 +164,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -253,12 +253,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_Categorie:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -268,8 +268,8 @@ msgstr "Geen"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "Nieuwe taakâ"
+msgid "New Category..."
+msgstr "_Categorie:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -314,13 +314,12 @@ msgstr "_Website:"
 msgid "D_escription:"
 msgstr "_Beschrijving:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -356,11 +355,11 @@ msgstr "Taken"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Afgerond"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Samenvatting"
 
@@ -395,115 +394,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "Taken"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "Takenlijst"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nieuwe taakâ"
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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/pa.po b/po/pa.po
index a3a869e..f7e4eb5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.";
-"cgi?product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-04-20 10:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-09-10 23:41+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +22,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "ààààà àààà àààààà"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:644
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "àààà"
 
@@ -67,7 +66,6 @@ msgid "Today"
 msgstr "ààà"
 
 #: ../libkoto/koto-date-combo.c:435
-#| msgid "due tomorrow"
 msgid "Tomorrow"
 msgstr "àààà"
 
@@ -265,7 +263,6 @@ msgid "None"
 msgstr "ààà àààà"
 
 #: ../libkoto/koto-meta-group.c:48
-#| msgid "New Category"
 msgid "New Category..."
 msgstr "àààà ààààààà..."
 
@@ -309,13 +306,12 @@ msgstr "àààà àààààà(_W):"
 msgid "D_escription:"
 msgstr "ààààà(_e):"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "àà ààààà àààà ààà ààààà ààà àà àààà ààà àààà àààà ààààààà"
 
@@ -389,121 +385,60 @@ msgstr "àààà %s ààààà ààà"
 msgid "Remove Completed"
 msgstr "àààà ààà àààà"
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"àààà ààà àààà àààààààà àà, ààà ààà ààààà ààà àààà ààààà ààààààà,"
-"ààà ààà ààà àààààààà ààààààààà àà àààà àààà àà, àà àààà à ààà àààà àààà "
-"àààààà (àà àààààà àààà ààààà àà) àààà ààà ààà/ààà ààà àààà ààà\"\n"
-"\n"
-"àààà ààà àà ààà àà ààààà àà àààà àà àà àà àààààààà ààààà, àà "
-"àà àà ààà àààààà àààà àà àà ààà àà, àààà ààà ààà àà àààààà ààà ààà "
-"ààà àààààà ààà ààà àà àà ààà àààààà àààà ààà  ààà ààààà àà ààà àààà"
-"ààààà ààààààà ààà àààààà\n"
-"\n"
-"àààà ààà ààààà ààà àààà ààààà ààààààà àà àààà àààààà ààààà, "
-"àààà ààààààààààà àààà àà ààà ààà àààààààà ààààààààà, àà àààààààà ààààà, "
-"àààààà ààààà,ààààà, àà à àààà-àààà, àààààà ààà ààààà"
-
-#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "ààààààà àààà ààà, àààà\n"
 "http://www.satluj.com";
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "ààààààà ààààààà"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "àààà(_T)"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "àààà ààà àààà(_R)"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "ààà(_E)"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "àààà(_H)"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "ààà..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "àààà àààà àààààà ààà(_M)"
 
-#: ../src/gtk/main.c:645
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr "- àà àà àààà"
 
-#: ../src/gtk/main.c:763 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "ààààààà(_C):"
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "àààà àààà..."
 
-#: ../src/gtk/main.c:812 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "New Group..."
-#~ msgstr "àààà ààààà..."
diff --git a/po/pl.po b/po/pl.po
index 061eb0c..0d2bdc7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,25 +12,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-14 13:10+0200\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2009-09-14 15:18+0100\n"
 "Last-Translator: Tomasz Dominikowski <dominikowski gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "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:462
-#: ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -69,11 +68,16 @@ msgstr "Wszystkie"
 msgid "no date set"
 msgstr "data nieustalona"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "do jutra"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "Nigdy"
 
@@ -211,14 +215,16 @@ msgstr "^(?<task>.+) (?:do|w)? (?<day>\\d{1,2})$"
 
 #. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
 #: ../libkoto/koto-date-parser.c:506
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr "^(?<task>.+) (?:do|w)? (?<day>\\d{1,2}) (?<month>\\w+)$"
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
 #. one correct way then translate this identically to the previous one.
 #: ../libkoto/koto-date-parser.c:512
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgstr "^(?<task>.+) (?:do|w)? (?<day>\\d{1,2})(?:\\.) (?<month>\\w+)?$"
 
 #. Translators: "Pay bills on 15/4".
@@ -230,7 +236,8 @@ msgstr "^(?<task>.+) (?:do|w)? (?<digits>[\\d/-]+)$"
 #. languages have this concept.
 #: ../libkoto/koto-date-parser.c:521
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:do|w)? (?<week>\\d{1,2}) (tygodnia|tyg.|tyg|tygodniu)?$"
+msgstr ""
+"^(?<task>.+) (?:do|w)? (?<week>\\d{1,2}) (tygodnia|tyg.|tyg|tygodniu)?$"
 
 #. Translators: "Pay bills in 4 days".
 #: ../libkoto/koto-date-parser.c:525
@@ -240,7 +247,9 @@ msgstr "^(?<task>.+) za (?<days>\\d+) (dzieÅ|dni)?$"
 #. Translators: "Pay bills in 2 weeks".
 #: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
-msgstr "^(?<task>.+) za (?<weeks>\\d+) (tydzieÅ|tyg|tyg.|tydz|tydz.|tygodnie|tygodni)?$"
+msgstr ""
+"^(?<task>.+) za (?<weeks>\\d+) (tydzieÅ|tyg|tyg.|tydz|tydz.|tygodnie|"
+"tygodni)?$"
 
 #: ../libkoto/koto-entry.c:98
 msgid "Insert"
@@ -250,11 +259,11 @@ msgstr "Wstaw"
 msgid "Delete"
 msgstr "UsuÅ"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "Nowa kategoria"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "ProszÄ wprowadziÄ nazwÄ nowej kategorii:"
 
@@ -263,8 +272,9 @@ msgid "None"
 msgstr "Brak"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "Nowa grupa..."
+#, fuzzy
+msgid "New Category..."
+msgstr "Nowa kategoria"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -307,19 +317,15 @@ msgid "D_escription:"
 msgstr "_Opis:"
 
 #: ../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: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: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 "UsuÅ zadanie %s"
@@ -346,16 +352,15 @@ msgstr "_Notatki"
 msgid "%s - Tasks"
 msgstr "%s - Zadania"
 
-#: ../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 "ZakoÅcz zadanie"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Wykonane"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Podsumowanie"
 
@@ -390,119 +395,60 @@ msgstr "Dodaj zadanie %s"
 msgid "Remove Completed"
 msgstr "Usuwanie ukoÅczone"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 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"
-"\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"
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Aviary.pl <gnomepl aviary pl>, 2009\n"
 "Tomasz Dominikowski <tdominikowski aviary pl>, 2007, 2008, 2009"
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Projekt Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "U_suÅ ukoÅczone"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "Zmodyfikuj..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Zaznacz jako ukoÅczone"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr "- lista zadaÅ"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategoria:"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nowe zadanie..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Zadania (%d)"
-
-#: ../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:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "UsuniÄcie ukoÅczonych zadaÅ spowoduje ich bezpowrotnÄ utratÄ."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nowe zadanie"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Modyfikuj zadanie..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "UsuÅ zadanie"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "ZakoÅcz"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "O programie"
-
-#: ../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 b4c404f..5b9ec35 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +21,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Gestor pessoal de tarefas"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -63,11 +63,16 @@ msgstr ""
 msgid "no date set"
 msgstr "sem data estabelecida"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "Hoje"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "amanhÃ"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -158,89 +163,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -252,12 +252,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_Categoria:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -267,8 +267,8 @@ msgstr "Nenhum"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "Nova tarefa..."
+msgid "New Category..."
+msgstr "_Categoria:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -313,13 +313,12 @@ msgstr "EndereÃo _Web:"
 msgid "D_escription:"
 msgstr "_DescriÃÃo:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -355,11 +354,11 @@ msgstr "Tarefas"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "ConcluÃda"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Resumo"
 
@@ -394,115 +393,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "Tarefas"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "Lista de tarefas a realizar"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nova tarefa..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 6ba6a4b..37a4a0a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?";
-"product=Tasks&component=General\n"
-"POT-Creation-Date: 2010-12-29 17:46+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-01-19 11:35-0300\n"
 "Last-Translator: Gabriel F. Vilar <cogumm gmail com>\n"
 "Language-Team: Portuguese/Brazil <gnome-l10n-br listas cipsga org br>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,6 @@ msgid "Personal task manager"
 msgstr "Gerenciador Pessoal de Tarefas"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -213,8 +212,8 @@ msgstr "^(?<task>.+) (?:por|para|em)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 msgid ""
 "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 msgstr ""
-"^(?<task>.+) (?:por|para|em)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)"
-"$"
+"^(?<task>.+) (?:por|para|em)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w"
+"+)$"
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
@@ -311,13 +310,12 @@ msgstr "EndereÃo _web:"
 msgid "D_escription:"
 msgstr "D_escriÃÃo:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Vocà tem certeza que quer excluir \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Se vocà excluir um item, ele serà permanentemente perdido."
 
@@ -399,14 +397,14 @@ msgstr ""
 "Este programa vem com ABSOLUTAMENTE NENHUMA GARANTIA; para mais detalhes, "
 "visite http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Bruno Boaventura <brunoboaventura gmail com>\n"
 "Vladimir Melo <vmelo gnome org>\n"
 "Flamarion Jorge <jorge flamarion gmail com>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "O Projeto Pimlico"
 
@@ -415,7 +413,7 @@ msgstr "O Projeto Pimlico"
 msgid "_Task"
 msgstr "_Tarefas"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_Remover concluÃdas"
 
@@ -431,8 +429,7 @@ msgstr "_Ajuda"
 msgid "Edit..."
 msgstr "Editar..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_Marcar como concluÃda"
 
@@ -440,97 +437,15 @@ msgstr "_Marcar como concluÃda"
 msgid " - a to do list"
 msgstr "- lista de afazeres"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categoria:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Nova tarefa..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Tarefas (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Vocà tem certeza que deseja excluir todas as tarefas concluÃdas?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr ""
-"Excluir as tarefas concluÃdas significa que elas serÃo permanentemente "
-"perdidas."
-
-#: ../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 ""
-"Tasks à software livre vocà pode redistribui-lo e/ou modifica-lo sob os "
-"termos da LicenÃa Publica Geral GNU como publicada pela Free Software "
-"Fundation; tanto a versÃo 2 da licenÃa ou (por sua opÃÃo) qualquer versÃo "
-"posterior.\n"
-"\n"
-"Tasks à distribuÃdo na esperanÃa de que seja Ãtil, mas SEM QUALQUER "
-"GARANTIA; mesmo sem a garantia implÃcita de comercializaÃÃo ou adequaÃÃo "
-"PARA UM DETERMINADO PROPÃSITO. Veja a LicenÃa Publica Geral GNU para mais "
-"detalhes.\n"
-"\n"
-"Vocà deve ter recebido uma copia da LicenÃa PÃblica Geral GNU junto com o "
-"Tasks; se nÃo, escreva para a FreeÂSoftwareÂFoundation,ÂInc.,Â51ÂFranklinÂSt,"
-"ÂFifthÂFloor,ÂBoston,ÂMAÂ0110-1301,ÂUSA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nova tarefa"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Editar tarefa..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Excluir tarefa"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Sair"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Sobre"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nova tarefa"
-
-#~ msgid "New Group..."
-#~ msgstr "Novo grupo..."
-
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "segunda-feira|terÃa-feira|quarta-feira|quinta-feira|sexta-feira|sÃbado|"
-#~ "domino|seg|ter|qua|qui|sex|sÃb|dom"
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (para %s)"
-
-#~ msgid "_Add"
-#~ msgstr "_Adicionar"
diff --git a/po/ro.po b/po/ro.po
index a07b8c5..2939f36 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.openedhand.com/enter_bug.cgi?product=Tasks&component=General\n";
-"POT-Creation-Date: 2010-04-20 10:20+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-08-01 23:17+0300\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian grijincu gmail com>\n"
 "Language-Team: Romanian Gnome Team <gnomero-list lists sourceforge net>\n"
@@ -28,8 +27,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Manager personal de sarcini"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:644
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Sarcini"
 
@@ -217,7 +215,8 @@ msgstr "^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})?$"
 #: ../libkoto/koto-date-parser.c:506
 msgid ""
 "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})? (?<month>\\w+)$"
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
@@ -225,7 +224,8 @@ msgstr "^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})? (?<month>\\
 #: ../libkoto/koto-date-parser.c:512
 msgid ""
 "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:pÃnÄ pe|scadent Ãn|pe)? (?<day>\\d{1,2})? (?<month>\\w+)$"
 
 #. Translators: "Pay bills on 15/4".
 #: ../libkoto/koto-date-parser.c:516
@@ -312,13 +312,12 @@ msgstr "AdresÄ _web:"
 msgid "D_escription:"
 msgstr "D_escriere:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "DacÄ ÈtergeÈi un element, este pierdut definitiv."
 
@@ -392,36 +391,13 @@ msgstr "AdaugÄ sarcina %s"
 msgid "Remove Completed"
 msgstr "Èterge cele finalizate"
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 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"
-"\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"
-
-#: ../src/gtk/main.c:468 ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Eddy PetriÈor <eddy petrisor gmail com>\n"
@@ -429,89 +405,48 @@ msgstr ""
 "Adi Roiban\n"
 "Lucian Adrian Grijincu <lucian grijincu gmail com>"
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Proiectul Pimlico"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "_SarcinÄ"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "Èterge ce e _terminat"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "_Editare"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "_Ajutor"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "ModificÄ..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_MarcheazÄ ca terminat"
 
-#: ../src/gtk/main.c:645
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr " - o listÄ de sarcini"
 
-#: ../src/gtk/main.c:763 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Categorie:"
 
-#: ../src/gtk/main.c:788 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "SarcinÄ nouÄ..."
 
-#: ../src/gtk/main.c:812 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Sarcini (%d)"
-
-#: ../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
-msgid "New Task"
-msgstr "SarcinÄ nouÄ"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Modificare sarcinÄ..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Èterge sarcina"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "IeÈire"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Despre"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "SarcinÄ nouÄ"
-
-#~ msgid "New Group..."
-#~ msgstr "Grup nou..."
-
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (termen %s)"
diff --git a/po/ru.po b/po/ru.po
index 0c9de0d..972e19a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tasks 0.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?product=Tasks&keywords=I18N+L10N&component=General\n";
-"POT-Creation-Date: 2011-03-18 16:01+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-05-09 22:02+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,9 +24,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "ÐÐÑÑÐÐÐÐÑÐÑÐ ÐÐÑÐÐÑÑÐÑ ÐÐÐÐÑ"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "ÐÐÐÐÑÐ"
 
@@ -69,7 +68,6 @@ msgid "Today"
 msgstr "ÐÐÐÐÐÐÑ"
 
 #: ../libkoto/koto-date-combo.c:435
-#| msgid "due tomorrow"
 msgid "Tomorrow"
 msgstr "ÐÐÐÑÑÐ"
 
@@ -189,7 +187,6 @@ msgstr "^(?<task>.+) ÐÑÐÑÐ$"
 
 #. Translators: "Pay bills next Monday".
 #: ../libkoto/koto-date-parser.c:488
-#| msgid "^(?<task>.+) next (?<day>%s)$"
 msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr "^(?<task>.+) ÑÐÐÐÑÑÑÐÐ (?<day>%s)$"
 
@@ -212,15 +209,19 @@ msgstr "^(?<task>.+) (?:Ð|ÐÐ|Ð)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 
 #. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
 #: ../libkoto/koto-date-parser.c:506
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:Ð|ÐÐ|Ð)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:Ð|ÐÐ|Ð)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
 #. one correct way then translate this identically to the previous one.
 #: ../libkoto/koto-date-parser.c:512
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:Ð|ÐÐ|Ð)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+"^(?<task>.+) (?:Ð|ÐÐ|Ð)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
 
 #. Translators: "Pay bills on 15/4".
 #: ../libkoto/koto-date-parser.c:516
@@ -264,7 +265,6 @@ msgid "None"
 msgstr "ÐÑÑÑÑÑÑÐÑÐÑ"
 
 #: ../libkoto/koto-meta-group.c:48
-#| msgid "New Category"
 msgid "New Category..."
 msgstr "ÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑâ"
 
@@ -309,19 +309,15 @@ msgid "D_escription:"
 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 "ÐÐÐÑÑÐÐÑÐÐÑÐÐ ÑÐÐÐÐÑÑ Â%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
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÑÑ %s"
@@ -348,8 +344,7 @@ msgstr "_ÐÑÐÐÐÑÐÐÐÑ"
 msgid "%s - Tasks"
 msgstr "%s â ÐÐÐÐÑÐ"
 
-#: ../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 "ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÑ"
 
@@ -393,16 +388,18 @@ msgid "Remove Completed"
 msgstr "ÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÑÐ"
 
 #: ../src/gtk/main.c:448
-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
-msgstr "ÐÑÐ ÐÑÐÐÑÐÐÐÐ ÑÐÑÐÑÐÑÑÑÐÐÑÐÑÑÑ ÐÐÐ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐÐÐÐÐÐ; ÐÐÐÑÐÐÐÐÐ ÑÐ. http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+"ÐÑÐ ÐÑÐÐÑÐÐÐÐ ÑÐÑÐÑÐÑÑÑÐÐÑÐÑÑÑ ÐÐÐ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐÐÐÐÐÐ; ÐÐÐÑÐÐÐÐÐ ÑÐ. http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 
 #: ../src/gtk/main.c:456
-#: ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr "Yuri Myasoedov <omerta13 yandex ru>, 2011"
 
 #: ../src/gtk/main.c:460
-#: ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "ÐÑÐÐÐÑ Pimlico"
 
@@ -412,7 +409,6 @@ msgid "_Task"
 msgstr "_ÐÐÐÐÑÐ"
 
 #: ../src/gtk/main.c:471
-#: ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "_ÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÑÐ"
 
@@ -428,9 +424,7 @@ msgstr "_ÐÐÑÐÐÐÐ"
 msgid "Edit..."
 msgstr "ÐÐÐÐÐÐÑÑâ"
 
-#. TODO: turn this action into a toggle action
 #: ../src/gtk/main.c:488
-#: ../src/hildon/hildon-tasks.c:459
 msgid "_Mark Complete"
 msgstr "_ÐÑÐÐÑÐÑÑ ÐÐÐ ÐÑÐÐÐÐÐÐÐÐÐ"
 
@@ -439,66 +433,14 @@ msgid " - a to do list"
 msgstr " â ÑÐÐÑÐÐ ÐÐÐ"
 
 #: ../src/gtk/main.c:753
-#: ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_ÐÐÑÐÐÐÑÐÑ:"
 
 #: ../src/gtk/main.c:778
-#: ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÑÑâ"
 
 #: ../src/gtk/main.c:802
-#: ../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 "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÑÑÐÐÑÑ ÐÐÐÐÑ ÐÑÐÐÐÐÑÑ Ð ÐÑ ÐÐÐÐÐÐÐÑÐÑÐÐÐÑ ÑÐÐÐÐÐÐÑ."
-
-#: ../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 ""
-"Tasks ÑÐÐÑÐÑÑÑ ÐÐÑÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐ; ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÑÑÑ Ð/ÐÐÐ ÐÐÐÐÑÐÑÐÑÐÐÐÑÑ ÐÐ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ ÑÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÐÑ ÑÐÑÐÑÐÑÑÑÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ, ÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ; ÐÐÐÐ ÐÐÑÑÐÑ 2 ÐÐÑÐÐÐÐÐ, ÐÐÐÐ (ÐÐ ÐÐÑ ÐÑÐÐÑ) ÐÑÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÑÑ ÐÐÑÑÐÑ.\n"
-"\n"
-"Tasks ÑÐÑÐÑÐÑÑÑÐÐÑÐÑÑÑ Ñ ÐÐÐÐÐÐÐÐ, ÑÑÐ ÐÐÐ ÐÐÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐ, ÐÐ ÐÐÐ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐÐÐÐÐÐ; ÐÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐ. ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐ. ÐÑÐÐÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÐÑ ÑÐÑÐÑÐÑÑÑÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ.\n"
-"\n"
-"ÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÐÑ ÑÐÑÐÑÐÑÑÑÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐ ÐÑÐÐÐÑÑ Ð ÐÐÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐÑ Tasks; Ð ÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐ ÐÐÐÐÑÐÑÐ Ð Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#. 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 "ÐÐÐÐÐÑÑ ÐÐÐÐÑÑ"
-
diff --git a/po/sk.po b/po/sk.po
index 20baa94..558f94a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=pimlico-tasks&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 21:17+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-09-12 23:47+0200\n"
 "Last-Translator: Stanislav Petrek <stanislav petrek gmail com>\n"
 "Language-Team: Slovak <gnome-sk-list gnome org>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,7 +22,6 @@ msgid "Personal task manager"
 msgstr "Osobnà plÃnovaÄ Ãloh"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "Ãlohy"
 
@@ -188,7 +187,9 @@ msgstr "^(?<task>.+) vÄera$"
 #. Translators: "Pay bills next Monday".
 #: ../libkoto/koto-date-parser.c:488
 msgid "^(?<task>.+) next (?<day>\\w+)$"
-msgstr "^(?<task>.+) (?:ÄalÅÃ|ÄalÅiu|nasledujÃci|nasledujÃcu|budÃci|budÃcu) (?<day>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:ÄalÅÃ|ÄalÅiu|nasledujÃci|nasledujÃcu|budÃci|budÃcu) (?<day>"
+"\\w+)$"
 
 #. Translators: "Pay bills this tuesday".  just translate this|on|by|due to contain relevant words in
 #. your language, moving the day block is required.
@@ -316,13 +317,12 @@ msgstr "_Webovà adresa:"
 msgid "D_escription:"
 msgstr "_Popis:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr "Ste si istÃ, Åe chcete odstrÃniÅ \"%s\"?"
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "Ak odstrÃnite poloÅku, bude navÅdy stratenÃ."
 
@@ -404,11 +404,11 @@ msgstr ""
 "Tento program sa poskytuje ÃPLNE BEZ ZÃRUKY, viac podrobnostà zÃskate na "
 "adrese http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Stanislav Petrek <stanislav petrek gmail com> 2011"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Projekt Pimlico"
 
@@ -417,7 +417,7 @@ msgstr "Projekt Pimlico"
 msgid "_Task"
 msgstr "Ãlo_ha"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "_OdobraÅ hotovÃ"
 
@@ -433,8 +433,7 @@ msgstr "_PomocnÃk"
 msgid "Edit..."
 msgstr "UpraviÅ..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "_OznaÄiÅ hotovÃ"
 
@@ -442,80 +441,15 @@ msgstr "_OznaÄiÅ hotovÃ"
 msgid " - a to do list"
 msgstr " - zoznam Ãloh"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_KategÃria:"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Novà Ãloha..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Ãlohy (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Ste si istÃ, Åe chcete odstrÃniÅ vÅetky dokonÄenà Ãlohy?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "OdstrÃnenie hotovÃch Ãloh znamenÃ, Åe budà navÅdy stratenÃ."
-
-#: ../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 ""
-"Tasks je slobodnà softvÃr; mÃÅete ho Äalej ÅÃriÅ a/alebo upravovaÅ podÄa "
-"ustanovenà licencie GNU General Public Licence (VÅeobecnà zverejÅovacia "
-"licencia GNU), vydÃvanej nadÃciou Free Software Foundation a to buÄ podÄa 2. "
-"verzie tejto Licencie, alebo (podÄa vÃÅho uvÃÅenia) ktorejkoÄvek neskorÅej "
-"verzie.\n"
-"\n"
-"Tasks je rozÅirovanà v nÃdeji, Åe bude uÅitoÄnÃ, avÅak BEZ AKEJKOÄVEK "
-"ZÃRUKY. Neposkytujà sa ani odvodenà zÃruky PREDAJNOSTI alebo VHODNOSTI PRE "
-"URÄITÃ ÃÄEL. ÄalÅie podrobnosti hÄadajte v licencii GNU General Public "
-"License.\n"
-"\n"
-"KÃpiu licencie GNU General Public License by ste mali obdrÅaÅ spolu s "
-"programom Tasks. Ak sa tak nestalo, napÃÅte na adresu Free Software "
-"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Novà Ãloha"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "UpraviÅ Ãlohu..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "OdstrÃniÅ Ãlohu"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "UkonÄiÅ"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "O programe"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Novà Ãloha"
diff --git a/po/sl.po b/po/sl.po
index 825e28f..607a02d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,512 +1,446 @@
 # Slovenian translations for tasks.
 # Copyright (C) 2009 tasks's COPYRIGHT HOLDER
 # This file is distributed under the same license as the tasks package.
-#
+# 
 # Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>, 2009 - 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: tasks master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.openedhand.com/enter_bug.cgi?product=Tasks&component=General\n";
-"POT-Creation-Date: 2010-10-14 17:32+0000\n"
-"PO-Revision-Date: 2010-10-15 21:09+0100\n"
-"Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../data/tasks.desktop.in.h:1
-msgid "Personal task manager"
-msgstr "Osebni upravljalnik nalog"
-
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
-msgid "Tasks"
-msgstr "Naloge"
-
-#: ../data/tasks.desktop.in.h:3
-msgid "To Do list"
-msgstr "Seznam opravil"
-
-#: ../libkoto/ical-util.c:62
-msgid "due today"
-msgstr "do danes"
-
-#: ../libkoto/ical-util.c:64
-msgid "due tomorrow"
-msgstr "do jutri"
-
-#: ../libkoto/ical-util.c:66
-msgid "due yesterday"
-msgstr "do vÄeraj"
-
-#: ../libkoto/ical-util.c:70
-#, c-format
-msgid "due %A"
-msgstr "do %A"
-
-#. Fallback to returning the preferred date representation
-#: ../libkoto/ical-util.c:74
-#, c-format
-msgid "due %x"
-msgstr "do %x"
-
-#: ../libkoto/koto-all-group.c:28
-msgid "All"
-msgstr "Vse"
-
-#: ../libkoto/koto-date-combo.c:62
-msgid "no date set"
-msgstr "datum ni doloÄen"
-
-#: ../libkoto/koto-date-combo.c:432
-msgid "Today"
-msgstr "Danes"
-
-#: ../libkoto/koto-date-combo.c:435
-msgid "Tomorrow"
-msgstr "Jutri"
-
-#: ../libkoto/koto-date-combo.c:438
-msgid "Never"
-msgstr "Nikoli"
-
-#. Translators: these strings should have every common form for weekdays
-#. including abbreviations, separated by |
-#: ../libkoto/koto-date-parser.c:80
-msgid "monday|mon"
-msgstr "ponedeljek|pon"
-
-#: ../libkoto/koto-date-parser.c:81
-msgid "tuesday|tue"
-msgstr "torek|tor"
-
-#: ../libkoto/koto-date-parser.c:82
-msgid "wednesday|wed"
-msgstr "sreda|sre"
-
-#: ../libkoto/koto-date-parser.c:83
-msgid "thursday|thu"
-msgstr "Äetrtek|Äet"
-
-#: ../libkoto/koto-date-parser.c:84
-msgid "friday|fri"
-msgstr "petek|pet"
-
-#: ../libkoto/koto-date-parser.c:85
-msgid "saturday|sat"
-msgstr "sobota|sob"
-
-#: ../libkoto/koto-date-parser.c:86
-msgid "sunday|sun"
-msgstr "nedelja|ned"
-
-#. 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 "januar|jan"
-
-#: ../libkoto/koto-date-parser.c:102
-msgid "february|feb"
-msgstr "februar|feb"
-
-#: ../libkoto/koto-date-parser.c:103
-msgid "march|mar"
-msgstr "marec|mar"
-
-#: ../libkoto/koto-date-parser.c:104
-msgid "april|apr"
-msgstr "april|apr"
-
-#: ../libkoto/koto-date-parser.c:105
-msgid "may"
-msgstr "maj"
-
-#: ../libkoto/koto-date-parser.c:106
-msgid "june|jun"
-msgstr "junij|jun"
-
-#: ../libkoto/koto-date-parser.c:107
-msgid "july|jul"
-msgstr "julij|jul"
-
-#: ../libkoto/koto-date-parser.c:108
-msgid "august|aug"
-msgstr "avgust|avg"
-
-#: ../libkoto/koto-date-parser.c:109
-msgid "september|sept|sep"
-msgstr "september|sep"
-
-#: ../libkoto/koto-date-parser.c:110
-msgid "october|oct"
-msgstr "oktober|okt"
-
-#: ../libkoto/koto-date-parser.c:111
-msgid "november|nov"
-msgstr "november|nov"
-
-#: ../libkoto/koto-date-parser.c:112
-msgid "december|dec"
-msgstr "december|dec"
-
-#.
-#. 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.
-#.
-#. These strings are used to parse the user's input in the "New Task" entry to
-#. extract the meaning of what they entered, such as the due date.
-#.
-#. The important thing to preserve in the translation are the (?<name>expr)
-#. blocks, which identify a regular expression "expr" with the identifier
-#. "name".  These mark sections which will be used in the new task.  All of the
-#. strings have a block called "task", which is the actual task summary.  Other
-#. examples are "day" (day of the month), "month" (month name) and so on.
-#.
-#. Translators: "Pay bills today".  Just translate "today"
-#: ../libkoto/koto-date-parser.c:476
-msgid "^(?<task>.+) today$"
-msgstr "^(?<task>.+) danes$"
-
-#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:480
-msgid "^(?<task>.+) tomorrow$"
-msgstr "^(?<task>.+) jutri$"
-
-#. Translators: "Pay bills yesterday".  Just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:484
-msgid "^(?<task>.+) yesterday$"
-msgstr "^(?<task>.+) vÄeraj$"
-
-#. Translators: "Pay bills next Monday".
-#: ../libkoto/koto-date-parser.c:488
-msgid "^(?<task>.+) next (?<day>\\w+)$"
-msgstr "^(?<task>.+) naslednji/o (?<day>\\w+)$"
-
-#. Translators: "Pay bills this tuesday".  just translate this|on|by|due to contain relevant words in
-#. your language, moving the day block is required.
-#: ../libkoto/koto-date-parser.c:493
-msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
-msgstr "^(?<task>.+) (ta|do) (?<day>\\w+)$"
-
-#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
-#: ../libkoto/koto-date-parser.c:497
-msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:do) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
-
-#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
-#. have numeric suffixes so feel free to remove them.
-#: ../libkoto/koto-date-parser.c:502
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)?$"
-
-#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
-#: ../libkoto/koto-date-parser.c:506
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)? (?<month>\\w+)$"
-
-#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
-#. is for languages where there is two way of writing a day, if there is only
-#. one correct way then translate this identically to the previous one.
-#: ../libkoto/koto-date-parser.c:512
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)? (?<month>\\w+)$"
-
-#. Translators: "Pay bills on 15/4".
-#: ../libkoto/koto-date-parser.c:516
-msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
-msgstr "^(?<task>.+) (?:do)? (?<digits>[\\d/-]+)$"
-
-#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
-#. languages have this concept.
-#: ../libkoto/koto-date-parser.c:521
-msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
-msgstr "^(?<task>.+) (?:do)? tedna(?<week>\\d{1,2})$"
-
-#. Translators: "Pay bills in 4 days".
-#: ../libkoto/koto-date-parser.c:525
-msgid "^(?<task>.+) in (?<days>\\d+) days?$"
-msgstr "^(?<task>.+) v (?<days>\\d+) dneh?$"
-
-#. Translators: "Pay bills in 2 weeks".
-#: ../libkoto/koto-date-parser.c:529
-msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
-msgstr "^(?<task>.+) v (?<weeks>\\d+) tednih?$"
-
-#: ../libkoto/koto-entry.c:98
-msgid "Insert"
-msgstr "Vstavi"
-
-#: ../libkoto/koto-entry.c:125
-msgid "Delete"
-msgstr "IzbriÅi"
-
-#: ../libkoto/koto-field-editor-factory.c:413
-msgid "New Category"
-msgstr "Nova kategorija"
-
-#: ../libkoto/koto-field-editor-factory.c:424
-msgid "Enter the name of the new category:"
-msgstr "Ime nove kategorije:"
-
-#: ../libkoto/koto-meta-group.c:46
-msgid "None"
-msgstr "Brez"
-
-#: ../libkoto/koto-meta-group.c:48
-msgid "New Category..."
-msgstr "Nova kategorija ..."
-
-#: ../libkoto/koto-no-category-group.c:32
-msgid "No Category"
-msgstr "Ni kategorije"
-
-#: ../libkoto/koto-priority-combo.c:71
-msgid "Low"
-msgstr "Nizko"
-
-#: ../libkoto/koto-priority-combo.c:73
-msgid "Normal"
-msgstr "ObiÄajno"
-
-#: ../libkoto/koto-priority-combo.c:75
-msgid "High"
-msgstr "Visoko"
-
-#: ../libkoto/koto-task-editor.c:55
-msgid "_Summary:"
-msgstr "Pov_zetek:"
-
-#: ../libkoto/koto-task-editor.c:56
-msgid "Ca_tegory:"
-msgstr "Ka_tegorija:"
-
-#: ../libkoto/koto-task-editor.c:57
-msgid "_Priority:"
-msgstr "_Prednost:"
-
-#: ../libkoto/koto-task-editor.c:58
-msgid "D_ue Date:"
-msgstr "_Do datuma:"
-
-#: ../libkoto/koto-task-editor.c:59
-msgid "_Web Address:"
-msgstr "Sp_lteni naslov:"
-
-#: ../libkoto/koto-task-editor.c:60
-msgid "D_escription:"
-msgstr "Opi_s:"
-
-#: ../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 "Ali ste prepriÄani, da Åelite izbrisati \"%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 "V kolikor predmet izbriÅete, bo trajno izgubljen."
-
-#: ../libkoto/koto-task-editor-dialog.c:83
-#: ../src/gtk/main.c:382
-#, c-format
-msgid "Delete Task %s"
-msgstr "IzbriÅi nalogo %s"
-
-#: ../libkoto/koto-task-editor-dialog.c:101
-#, c-format
-msgid "Edit Task %s"
-msgstr "Uredi nalogo %s"
-
-#: ../libkoto/koto-task-editor-dialog.c:282
-msgid "Det_ails"
-msgstr "Podro_bnosti"
-
-#: ../libkoto/koto-task-editor-dialog.c:341
-msgid "<b>_Notes</b>"
-msgstr "<b>_Opombe</b>"
-
-#: ../libkoto/koto-task-editor-dialog.c:343
-msgid "_Notes"
-msgstr "_Opombe"
-
-#: ../libkoto/koto-task-editor-dialog.c:347
-#, c-format
-msgid "%s - Tasks"
-msgstr "%s - naloge"
-
-#: ../libkoto/koto-task-view.c:78
-#: ../src/gtk/main.c:361
-msgid "Complete Task"
-msgstr "KonÄana naloga"
-
-#: ../libkoto/koto-task-view.c:479
-msgid "Done"
-msgstr "KonÄano"
-
-#: ../libkoto/koto-task-view.c:486
-msgid "Summary"
-msgstr "Povzetek"
-
-#: ../libkoto/koto-undo-action.c:60
-#, c-format
-msgid "Undo %s"
-msgstr "Razveljavi %s"
-
-#: ../libkoto/koto-undo-action.c:72
-msgid "Undo"
-msgstr "Razveljavi"
-
-#: ../libkoto/koto-undo-action.c:84
-#, c-format
-msgid "Redo %s"
-msgstr "Ponovno uveljavi %s"
-
-#: ../libkoto/koto-undo-action.c:96
-msgid "Redo"
-msgstr "Ponovno uveljavi"
-
-#: ../libkoto/koto-undo-manager.c:355
-msgid "Original Sample"
-msgstr "Izvorni vzorec"
-
-#: ../src/gtk/main.c:205
-#, c-format
-msgid "Add task %s"
-msgstr "Dodaj nalogo %s"
-
-#: ../src/gtk/main.c:424
-msgid "Remove Completed"
-msgstr "Odstrani konÄano"
-
-#: ../src/gtk/main.c:448
-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
-msgstr "Ta program nima ABSOLUTNO NOBENEGA JAMSTVA, za podrobnosti obiÅÄite http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
-
-#: ../src/gtk/main.c:456
-#: ../src/hildon/hildon-tasks.c:443
-msgid "translator-credits"
-msgstr "Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>"
-
-#: ../src/gtk/main.c:460
-#: ../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:469
-msgid "_Task"
-msgstr "_Naloga"
-
-#: ../src/gtk/main.c:471
-#: ../src/hildon/hildon-tasks.c:461
-msgid "_Remove Completed"
-msgstr "_Odstrani konÄano"
-
-#: ../src/gtk/main.c:474
-msgid "_Edit"
-msgstr "_Urejanje"
-
-#: ../src/gtk/main.c:476
-msgid "_Help"
-msgstr "Pomo_Ä"
-
-#: ../src/gtk/main.c:482
-msgid "Edit..."
-msgstr "Uredi ..."
-
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488
-#: ../src/hildon/hildon-tasks.c:459
-msgid "_Mark Complete"
-msgstr "Oz_naÄi kot konÄano"
-
-#: ../src/gtk/main.c:634
-msgid " - a to do list"
-msgstr "- seznam opravil"
-
-#: ../src/gtk/main.c:753
-#: ../src/hildon/hildon-tasks.c:558
-msgid "_Category:"
-msgstr "_Kategorija:"
-
-#: ../src/gtk/main.c:778
-#: ../src/hildon/hildon-tasks.c:578
-msgid "New task..."
-msgstr "Nova naloga ..."
-
-#: ../src/gtk/main.c:802
-#: ../src/hildon/hildon-tasks.c:602
-#, c-format
-msgid "Tasks (%d)"
-msgstr "Naloge (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Ali ste prepriÄani, da Åelite izbrisati vse konÄane naloge?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Brisanje konÄanih nalog pomeni, da bodo podatki trajno izgubljeni."
-
-#: ../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 ""
-"Program opravila so prosto programje; lahko ga redistribuirate in/ali spreminjate pod pogoji GNU General Public Licence kot je objavljena s Free Software Foundation; ali razliÄico 2 Licence ali (na vaÅo Åeljo) katerakoli kasnejÅa razliÄica.\n"
-"\n"
-"Opravila so distribuirana v upanju da bodo uporabna, toda BREZ KAKRÅNIHKOLI ZAGOTOVIL; tudi brez impliciranih zagotovila za PRODAJO ali PRIMERNOST ZA DOLOÄEN NAMEN. Oglejte si GNU General Public Licence za veÄ podrobnosti.\n"
-"\n"
-"Skupaj s programom bi morali prejeti tudi kopijo sploÅnega javnega potrdila; v primeru, da kopije niste prejeli, piÅite na Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Nova naloga"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Uredi nalogo ..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "IzbriÅi nalogo"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "KonÄaj"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "O programu"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Nova naloga"
-
-#~ msgid ""
-#~ "Tasks\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Naloge\n"
-#~ "\n"
-#~ msgid "New Group..."
-#~ msgstr "Nova skupina ..."
-
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: tasks master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
+"PO-Revision-Date: 2010-10-15 21:09+0100\n"
+"Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#: ../data/tasks.desktop.in.h:1
+msgid "Personal task manager"
+msgstr "Osebni upravljalnik nalog"
+
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
+msgid "Tasks"
+msgstr "Naloge"
+
+#: ../data/tasks.desktop.in.h:3
+msgid "To Do list"
+msgstr "Seznam opravil"
+
+#: ../libkoto/ical-util.c:62
+msgid "due today"
+msgstr "do danes"
+
+#: ../libkoto/ical-util.c:64
+msgid "due tomorrow"
+msgstr "do jutri"
+
+#: ../libkoto/ical-util.c:66
+msgid "due yesterday"
+msgstr "do vÄeraj"
+
+#: ../libkoto/ical-util.c:70
+#, c-format
+msgid "due %A"
+msgstr "do %A"
+
+#. Fallback to returning the preferred date representation
+#: ../libkoto/ical-util.c:74
+#, c-format
+msgid "due %x"
+msgstr "do %x"
+
+#: ../libkoto/koto-all-group.c:28
+msgid "All"
+msgstr "Vse"
+
+#: ../libkoto/koto-date-combo.c:62
+msgid "no date set"
+msgstr "datum ni doloÄen"
+
+#: ../libkoto/koto-date-combo.c:432
+msgid "Today"
+msgstr "Danes"
+
+#: ../libkoto/koto-date-combo.c:435
+msgid "Tomorrow"
+msgstr "Jutri"
+
+#: ../libkoto/koto-date-combo.c:438
+msgid "Never"
+msgstr "Nikoli"
+
+#. Translators: these strings should have every common form for weekdays
+#. including abbreviations, separated by |
+#: ../libkoto/koto-date-parser.c:80
+msgid "monday|mon"
+msgstr "ponedeljek|pon"
+
+#: ../libkoto/koto-date-parser.c:81
+msgid "tuesday|tue"
+msgstr "torek|tor"
+
+#: ../libkoto/koto-date-parser.c:82
+msgid "wednesday|wed"
+msgstr "sreda|sre"
+
+#: ../libkoto/koto-date-parser.c:83
+msgid "thursday|thu"
+msgstr "Äetrtek|Äet"
+
+#: ../libkoto/koto-date-parser.c:84
+msgid "friday|fri"
+msgstr "petek|pet"
+
+#: ../libkoto/koto-date-parser.c:85
+msgid "saturday|sat"
+msgstr "sobota|sob"
+
+#: ../libkoto/koto-date-parser.c:86
+msgid "sunday|sun"
+msgstr "nedelja|ned"
+
+#. 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 "januar|jan"
+
+#: ../libkoto/koto-date-parser.c:102
+msgid "february|feb"
+msgstr "februar|feb"
+
+#: ../libkoto/koto-date-parser.c:103
+msgid "march|mar"
+msgstr "marec|mar"
+
+#: ../libkoto/koto-date-parser.c:104
+msgid "april|apr"
+msgstr "april|apr"
+
+#: ../libkoto/koto-date-parser.c:105
+msgid "may"
+msgstr "maj"
+
+#: ../libkoto/koto-date-parser.c:106
+msgid "june|jun"
+msgstr "junij|jun"
+
+#: ../libkoto/koto-date-parser.c:107
+msgid "july|jul"
+msgstr "julij|jul"
+
+#: ../libkoto/koto-date-parser.c:108
+msgid "august|aug"
+msgstr "avgust|avg"
+
+#: ../libkoto/koto-date-parser.c:109
+msgid "september|sept|sep"
+msgstr "september|sep"
+
+#: ../libkoto/koto-date-parser.c:110
+msgid "october|oct"
+msgstr "oktober|okt"
+
+#: ../libkoto/koto-date-parser.c:111
+msgid "november|nov"
+msgstr "november|nov"
+
+#: ../libkoto/koto-date-parser.c:112
+msgid "december|dec"
+msgstr "december|dec"
+
+#.
+#. 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.
+#.
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
+msgid "^(?<task>.+) today$"
+msgstr "^(?<task>.+) danes$"
+
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
+msgid "^(?<task>.+) tomorrow$"
+msgstr "^(?<task>.+) jutri$"
+
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
+msgid "^(?<task>.+) yesterday$"
+msgstr "^(?<task>.+) vÄeraj$"
+
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
+msgstr "^(?<task>.+) naslednji/o (?<day>\\w+)$"
+
+#. Translators: "Pay bills this tuesday".  just translate this|on|by|due to contain relevant words in
+#. your language, moving the day block is required.
+#: ../libkoto/koto-date-parser.c:493
+msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
+msgstr "^(?<task>.+) (ta|do) (?<day>\\w+)$"
+
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
+msgid "^(?<task>.+) (?:by|due|on) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+msgstr "^(?<task>.+) (?:do) (?<day>\\d{1,2})/(?<month>\\d{1,2})$"
+
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
+msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)?$"
+
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)? (?<month>\\w+)$"
+
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr "^(?<task>.+) (?:do)? (?<day>\\d{1,2})(?:)? (?<month>\\w+)$"
+
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
+msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
+msgstr "^(?<task>.+) (?:do)? (?<digits>[\\d/-]+)$"
+
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
+msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
+msgstr "^(?<task>.+) (?:do)? tedna(?<week>\\d{1,2})$"
+
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
+msgid "^(?<task>.+) in (?<days>\\d+) days?$"
+msgstr "^(?<task>.+) v (?<days>\\d+) dneh?$"
+
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
+msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
+msgstr "^(?<task>.+) v (?<weeks>\\d+) tednih?$"
+
+#: ../libkoto/koto-entry.c:98
+msgid "Insert"
+msgstr "Vstavi"
+
+#: ../libkoto/koto-entry.c:125
+msgid "Delete"
+msgstr "IzbriÅi"
+
+#: ../libkoto/koto-field-editor-factory.c:413
+msgid "New Category"
+msgstr "Nova kategorija"
+
+#: ../libkoto/koto-field-editor-factory.c:424
+msgid "Enter the name of the new category:"
+msgstr "Ime nove kategorije:"
+
+#: ../libkoto/koto-meta-group.c:46
+msgid "None"
+msgstr "Brez"
+
+#: ../libkoto/koto-meta-group.c:48
+msgid "New Category..."
+msgstr "Nova kategorija ..."
+
+#: ../libkoto/koto-no-category-group.c:32
+msgid "No Category"
+msgstr "Ni kategorije"
+
+#: ../libkoto/koto-priority-combo.c:71
+msgid "Low"
+msgstr "Nizko"
+
+#: ../libkoto/koto-priority-combo.c:73
+msgid "Normal"
+msgstr "ObiÄajno"
+
+#: ../libkoto/koto-priority-combo.c:75
+msgid "High"
+msgstr "Visoko"
+
+#: ../libkoto/koto-task-editor.c:55
+msgid "_Summary:"
+msgstr "Pov_zetek:"
+
+#: ../libkoto/koto-task-editor.c:56
+msgid "Ca_tegory:"
+msgstr "Ka_tegorija:"
+
+#: ../libkoto/koto-task-editor.c:57
+msgid "_Priority:"
+msgstr "_Prednost:"
+
+#: ../libkoto/koto-task-editor.c:58
+msgid "D_ue Date:"
+msgstr "_Do datuma:"
+
+#: ../libkoto/koto-task-editor.c:59
+msgid "_Web Address:"
+msgstr "Sp_lteni naslov:"
+
+#: ../libkoto/koto-task-editor.c:60
+msgid "D_escription:"
+msgstr "Opi_s:"
+
+#: ../libkoto/koto-task-editor-dialog.c:70
+#, c-format
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "Ali ste prepriÄani, da Åelite izbrisati \"%s\"?"
+
+#: ../libkoto/koto-task-editor-dialog.c:73
+msgid "If you delete an item, it is permanently lost."
+msgstr "V kolikor predmet izbriÅete, bo trajno izgubljen."
+
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
+#, c-format
+msgid "Delete Task %s"
+msgstr "IzbriÅi nalogo %s"
+
+#: ../libkoto/koto-task-editor-dialog.c:101
+#, c-format
+msgid "Edit Task %s"
+msgstr "Uredi nalogo %s"
+
+#: ../libkoto/koto-task-editor-dialog.c:282
+msgid "Det_ails"
+msgstr "Podro_bnosti"
+
+#: ../libkoto/koto-task-editor-dialog.c:341
+msgid "<b>_Notes</b>"
+msgstr "<b>_Opombe</b>"
+
+#: ../libkoto/koto-task-editor-dialog.c:343
+msgid "_Notes"
+msgstr "_Opombe"
+
+#: ../libkoto/koto-task-editor-dialog.c:347
+#, c-format
+msgid "%s - Tasks"
+msgstr "%s - naloge"
+
+#: ../libkoto/koto-task-view.c:78 ../src/gtk/main.c:361
+msgid "Complete Task"
+msgstr "KonÄana naloga"
+
+#: ../libkoto/koto-task-view.c:479
+msgid "Done"
+msgstr "KonÄano"
+
+#: ../libkoto/koto-task-view.c:486
+msgid "Summary"
+msgstr "Povzetek"
+
+#: ../libkoto/koto-undo-action.c:60
+#, c-format
+msgid "Undo %s"
+msgstr "Razveljavi %s"
+
+#: ../libkoto/koto-undo-action.c:72
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: ../libkoto/koto-undo-action.c:84
+#, c-format
+msgid "Redo %s"
+msgstr "Ponovno uveljavi %s"
+
+#: ../libkoto/koto-undo-action.c:96
+msgid "Redo"
+msgstr "Ponovno uveljavi"
+
+#: ../libkoto/koto-undo-manager.c:355
+msgid "Original Sample"
+msgstr "Izvorni vzorec"
+
+#: ../src/gtk/main.c:205
+#, c-format
+msgid "Add task %s"
+msgstr "Dodaj nalogo %s"
+
+#: ../src/gtk/main.c:424
+msgid "Remove Completed"
+msgstr "Odstrani konÄano"
+
+#: ../src/gtk/main.c:448
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+"Ta program nima ABSOLUTNO NOBENEGA JAMSTVA, za podrobnosti obiÅÄite http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+
+#: ../src/gtk/main.c:456
+msgid "translator-credits"
+msgstr "Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>"
+
+#: ../src/gtk/main.c:460
+msgid "The Pimlico Project"
+msgstr "Projekt Pimlico"
+
+#. Action name, stock ID, label, accelerator, tooltip, callback
+#: ../src/gtk/main.c:469
+msgid "_Task"
+msgstr "_Naloga"
+
+#: ../src/gtk/main.c:471
+msgid "_Remove Completed"
+msgstr "_Odstrani konÄano"
+
+#: ../src/gtk/main.c:474
+msgid "_Edit"
+msgstr "_Urejanje"
+
+#: ../src/gtk/main.c:476
+msgid "_Help"
+msgstr "Pomo_Ä"
+
+#: ../src/gtk/main.c:482
+msgid "Edit..."
+msgstr "Uredi ..."
+
+#: ../src/gtk/main.c:488
+msgid "_Mark Complete"
+msgstr "Oz_naÄi kot konÄano"
+
+#: ../src/gtk/main.c:634
+msgid " - a to do list"
+msgstr "- seznam opravil"
+
+#: ../src/gtk/main.c:753
+msgid "_Category:"
+msgstr "_Kategorija:"
+
+#: ../src/gtk/main.c:778
+msgid "New task..."
+msgstr "Nova naloga ..."
+
+#: ../src/gtk/main.c:802
+#, c-format
+msgid "Tasks (%d)"
+msgstr "Naloge (%d)"
diff --git a/po/sv.po b/po/sv.po
index 306cd86..91da19a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-29 15:08+0100\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2010-12-29 18:45+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -23,9 +23,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "Personlig aktivitetshanterare"
 
-#: ../data/tasks.desktop.in.h:2
-#: ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "Aktiviteter"
 
@@ -210,15 +208,19 @@ msgstr "^(?<task>.+) (?:klar|den|)? (?<day>\\d{1,2})(?:a|a|e|e)?$"
 
 #. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
 #: ../libkoto/koto-date-parser.c:506
-msgid "^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
-msgstr "^(?<task>.+) (?:klar|den|)? (?<day>\\d{1,2})(?:a|a|e|e)? (?<month>\\w+)$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<day>\\d{1,2})(?:st|nd|rd|th)? (?<month>\\w+)$"
+msgstr ""
+"^(?<task>.+) (?:klar|den|)? (?<day>\\d{1,2})(?:a|a|e|e)? (?<month>\\w+)$"
 
 #. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
 #. is for languages where there is two way of writing a day, if there is only
 #. one correct way then translate this identically to the previous one.
 #: ../libkoto/koto-date-parser.c:512
-msgid "^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
-msgstr "^(?<task>.+) (?:klar|den|)? (?<month>\\w+) (?<day>\\d{1,2})(?:a|a|e|e)?$"
+msgid ""
+"^(?<task>.+) (?:by|due|on)? (?<month>\\w+) (?<day>\\d{1,2})(?:st|nd|rd|th)?$"
+msgstr ""
+"^(?<task>.+) (?:klar|den|)? (?<month>\\w+) (?<day>\\d{1,2})(?:a|a|e|e)?$"
 
 #. Translators: "Pay bills on 15/4".
 #: ../libkoto/koto-date-parser.c:516
@@ -306,19 +308,15 @@ msgid "D_escription:"
 msgstr "_Beskrivning:"
 
 #: ../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: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: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 "Ta bort aktiviteten %s"
@@ -345,8 +343,7 @@ msgstr "_Anteckningar"
 msgid "%s - Tasks"
 msgstr "%s - Aktiviteter"
 
-#: ../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 "FÃrdig aktivitet"
 
@@ -390,11 +387,14 @@ msgid "Remove Completed"
 msgstr "Ta bort fÃrdiga"
 
 #: ../src/gtk/main.c:448
-msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
-msgstr "Detta program levereras UTAN NÃGON FORM AV GARANTI; besÃk http://www.gnu.org/licenses/old-licenses/gpl-2.0.html fÃr mer information"
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+"Detta program levereras UTAN NÃGON FORM AV GARANTI; besÃk http://www.gnu.org/";
+"licenses/old-licenses/gpl-2.0.html fÃr mer information"
 
 #: ../src/gtk/main.c:456
-#: ../src/hildon/hildon-tasks.c:443
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po danielnylander se>\n"
@@ -404,7 +404,6 @@ msgstr ""
 "<tp-sv listor tp-sv se>."
 
 #: ../src/gtk/main.c:460
-#: ../src/hildon/hildon-tasks.c:447
 msgid "The Pimlico Project"
 msgstr "Pimlico-projektet"
 
@@ -414,7 +413,6 @@ msgid "_Task"
 msgstr "A_ktivitet"
 
 #: ../src/gtk/main.c:471
-#: ../src/hildon/hildon-tasks.c:461
 msgid "_Remove Completed"
 msgstr "_Ta bort fÃrdiga"
 
@@ -430,9 +428,7 @@ msgstr "_HjÃlp"
 msgid "Edit..."
 msgstr "Redigera..."
 
-#. TODO: turn this action into a toggle action
 #: ../src/gtk/main.c:488
-#: ../src/hildon/hildon-tasks.c:459
 msgid "_Mark Complete"
 msgstr "_Markera som fÃrdig"
 
@@ -441,79 +437,14 @@ msgid " - a to do list"
 msgstr " - en att gÃra-lista"
 
 #: ../src/gtk/main.c:753
-#: ../src/hildon/hildon-tasks.c:558
 msgid "_Category:"
 msgstr "_Kategori:"
 
 #: ../src/gtk/main.c:778
-#: ../src/hildon/hildon-tasks.c:578
 msgid "New task..."
 msgstr "Ny aktivitet..."
 
 #: ../src/gtk/main.c:802
-#: ../src/hildon/hildon-tasks.c:602
 #, c-format
 msgid "Tasks (%d)"
 msgstr "Aktiviteter (%d)"
-
-#: ../src/hildon/hildon-tasks.c:388
-msgid "Are you sure you want to delete all completed tasks?"
-msgstr "Ãr du sÃker pà att du vill ta bort alla fÃrdiga aktiviteter?"
-
-#: ../src/hildon/hildon-tasks.c:390
-msgid "Deleting completed tasks means they are permanently lost."
-msgstr "Borttagning av fÃrdigstÃllda aktiviteter betyder att de fÃrsvinner fÃr alltid."
-
-#: ../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 ""
-"Detta program Ãr fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du sà vill) nÃgon senare version.\n"
-"\n"
-"Detta program distribueras i hopp om att det ska vara anvÃndbart, men UTAN NÃGON SOM HELST GARANTI, Ãven utan underfÃrstÃdd garanti om SÃLJBARHET eller LÃMPLIGHET FÃR NÃGOT SPECIELLT ÃNDAMÃL. Se GNU General Public License fÃr ytterligare information.\n"
-"\n"
-"Du bÃr ha fÃtt en kopia av GNU General Public License tillsammans med detta program. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
-
-#. Action name, stock ID, label, accelerator, tooltip, callback
-#. dummy
-#: ../src/hildon/hildon-tasks.c:456
-msgid "New Task"
-msgstr "Ny aktivitet"
-
-#: ../src/hildon/hildon-tasks.c:457
-msgid "Edit Task..."
-msgstr "Redigera aktivitet..."
-
-#: ../src/hildon/hildon-tasks.c:460
-msgid "Delete Task"
-msgstr "Ta bort aktivitet"
-
-#: ../src/hildon/hildon-tasks.c:462
-msgid "Quit"
-msgstr "Avsluta"
-
-#: ../src/hildon/hildon-tasks.c:463
-msgid "About"
-msgstr "Om"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "Ny aktivitet"
-
-#~ msgid "New Group..."
-#~ msgstr "Ny grupp..."
-#~ msgid ""
-#~ "monday|tuesday|wednesday|thursday|friday|saturday|sunday|mon|tue|wed|thr|"
-#~ "fri|sat|sun"
-#~ msgstr ""
-#~ "mÃndag|tisdag|onsdag|torsdag|fredag|lÃrdag|sÃndag|mÃn|tis|ons|tor|fre|lÃr|"
-#~ "sÃn"
-#~ msgid "%s (due %s)"
-#~ msgstr "%s (senast %s)"
-#~ msgid "_Add"
-#~ msgstr "_LÃgg till"
-
diff --git a/po/th.po b/po/th.po
index 7e4f08d..05d3f3b 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "àààààà"
 
@@ -59,11 +59,16 @@ msgstr "ààààààà"
 msgid "no date set"
 msgstr "àààààààààààààà"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "àààààà"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "àààààààààààààààààà"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -153,89 +158,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -247,11 +247,11 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgid "None"
 msgstr ""
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
+msgid "New Category..."
 msgstr ""
 
 #: ../libkoto/koto-no-category-group.c:32
@@ -303,13 +303,12 @@ msgstr ""
 msgid "D_escription:"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -344,11 +343,11 @@ msgstr ""
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr ""
 
@@ -383,104 +382,58 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Sira Nokyoongtong <gumaraa gmail com>"
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr ""
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr ""
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr ""
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr ""
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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
-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 ""
diff --git a/po/tr.po b/po/tr.po
index f19427d..f388bbc 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks 0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2007-03-01 01:03+0100\n"
 "Last-Translator: Tuyan Ozipek <tuyan 4inarow net>\n"
 "Language-Team: Turkce <>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "KiÅisel GÃrev DÃzenleyici"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "GÃrevler"
 
@@ -62,11 +62,16 @@ msgstr ""
 msgid "no date set"
 msgstr "tarih atanmamÄÅ"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "BugÃn"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "yarÄn"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -157,89 +162,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -251,12 +251,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_Kategori:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -266,8 +266,8 @@ msgstr "Yok"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "Yeni GÃrev..."
+msgid "New Category..."
+msgstr "_Kategori:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -312,13 +312,12 @@ msgstr "_Web Adresi:"
 msgid "D_escription:"
 msgstr "_AÃÄklama:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -354,11 +353,11 @@ msgstr "GÃrevler"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Bitti"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "Ãzet"
 
@@ -393,115 +392,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "GÃrevler"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, fuzzy
 msgid " - a to do list"
 msgstr "YapÄlacaklar Listesi"
 
-#: ../src/gtk/main.c:742 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "Yeni GÃrev..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 27ee9e1..e44adb3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tasks VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 06:40+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\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"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,7 @@ msgstr ""
 msgid "Personal task manager"
 msgstr "TrÃnh quán là cÃng viác cà nhÃn"
 
-#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:462 ../src/gtk/main.c:620
-#: ../src/hildon/hildon-tasks.c:437
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "CÃng viác"
 
@@ -62,11 +62,16 @@ msgstr ""
 msgid "no date set"
 msgstr "chÆa Äát ngÃy"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "HÃm nay"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "ngÃy mai"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr ""
 
@@ -157,89 +162,84 @@ msgstr ""
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr ""
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr ""
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 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"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 msgstr ""
 
-#. Translators: just translate this|on|by|due to contain relevant words in
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 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
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
 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
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
 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
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr ""
 
@@ -251,12 +251,12 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 #, fuzzy
 msgid "New Category"
 msgstr "_PhÃn loái:"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr ""
 
@@ -266,8 +266,8 @@ msgstr "KhÃng"
 
 #: ../libkoto/koto-meta-group.c:48
 #, fuzzy
-msgid "New Group..."
-msgstr "CÃng viác mái..."
+msgid "New Category..."
+msgstr "_PhÃn loái:"
 
 #: ../libkoto/koto-no-category-group.c:32
 #, fuzzy
@@ -312,13 +312,12 @@ msgstr "Äáa chá _Web:"
 msgid "D_escription:"
 msgstr "_MÃ tá:"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
-#: ../libkoto/koto-task-editor-dialog.c:73 ../src/hildon/hildon-tasks.c:329
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr ""
 
@@ -354,11 +353,11 @@ msgstr "CÃng viác"
 msgid "Complete Task"
 msgstr ""
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "Xong"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "TÃm tát"
 
@@ -393,115 +392,60 @@ msgstr ""
 msgid "Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:447 ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
+msgstr ""
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtk/main.c:472 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr ""
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 #, fuzzy
 msgid "_Task"
 msgstr "CÃng viác"
 
-#: ../src/gtk/main.c:481 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr ""
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr ""
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr ""
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr ""
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 #, 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
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "_PhÃn loái:"
 
-#: ../src/gtk/main.c:767 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "CÃng viác mái..."
 
-#: ../src/gtk/main.c:791 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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
index 0fdd1e8..953647c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,12 +9,12 @@
 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: 2011-02-23 13:31+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: 2011-03-19 00:00+0800\n"
 "Last-Translator: Funda Wang <fundawang gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,6 @@ msgid "Personal task manager"
 msgstr "äääåççå"
 
 #: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
-#: ../src/hildon/hildon-tasks.c:437
 msgid "Tasks"
 msgstr "äå"
 
@@ -306,13 +305,12 @@ msgstr "çå(_W)ï"
 msgid "D_escription:"
 msgstr "æè(_E)ï"
 
-#: ../libkoto/koto-task-editor-dialog.c:70 ../src/hildon/hildon-tasks.c:326
-#: ../src/omoko/openmoko-tasks.c:217
+#: ../libkoto/koto-task-editor-dialog.c:70
 #, 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
+#: ../libkoto/koto-task-editor-dialog.c:73
 msgid "If you delete an item, it is permanently lost."
 msgstr "åææåéäéçèïåäæäæåã"
 
@@ -391,16 +389,16 @@ msgid ""
 "This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
 "www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"æçåääääæäïèæåè http://www.gnu.org/licenses/old-licenses/gpl-";
-"2.0.html"
+"æçåääääæäïèæåè http://www.gnu.org/licenses/old-licenses/";
+"gpl-2.0.html"
 
-#: ../src/gtk/main.c:456 ../src/hildon/hildon-tasks.c:443
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr ""
 "Zhu Yanhai <yanhai zhu linux intel com>\n"
 "Funda Wang <fundawang gmail com>"
 
-#: ../src/gtk/main.c:460 ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico èå"
 
@@ -409,7 +407,7 @@ msgstr "Pimlico èå"
 msgid "_Task"
 msgstr "äå(_T)"
 
-#: ../src/gtk/main.c:471 ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "åéååæäå(_R)"
 
@@ -425,8 +423,7 @@ msgstr "åå(_H)"
 msgid "Edit..."
 msgstr "çè..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:488 ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "æèäååæ(_M)"
 
@@ -434,72 +431,15 @@ msgstr "æèäååæ(_M)"
 msgid " - a to do list"
 msgstr "- ååäåäé"
 
-#: ../src/gtk/main.c:753 ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "çå(_T)ï"
 
-#: ../src/gtk/main.c:778 ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "æåäå..."
 
-#: ../src/gtk/main.c:802 ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "åéååæçäåæåçæææåæååäã"
-
-#: ../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 GPL çäçæèèéæçääæ"
-"æçæäæåéæååèäçåã\n"
-"\n"
-"ååèäçåçççæåæåæçïäææääæäã\n"
-"çèææéåçåçççéåçæäã\n"
-"æèççæåèåéGNUéçååèåèã"
-
-#. 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 "æåäå"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 722da2c..f9bab9b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 09:17+0000\n"
+"POT-Creation-Date: 2011-10-11 15:12+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: GLSJPN_Yukari <yukarix yamashita intel com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,7 @@ msgstr ""
 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
+#: ../data/tasks.desktop.in.h:2 ../src/gtk/main.c:636
 msgid "Tasks"
 msgstr "åä"
 
@@ -59,11 +57,16 @@ msgstr "åé"
 msgid "no date set"
 msgstr "ææçåææ"
 
-#: ../libkoto/koto-date-combo.c:409
+#: ../libkoto/koto-date-combo.c:432
 msgid "Today"
 msgstr "äå"
 
-#: ../libkoto/koto-date-combo.c:412
+#: ../libkoto/koto-date-combo.c:435
+#, fuzzy
+msgid "Tomorrow"
+msgstr "æåéæ"
+
+#: ../libkoto/koto-date-combo.c:438
 msgid "Never"
 msgstr "æä"
 
@@ -153,85 +156,87 @@ msgstr "12æ|12æ"
 #. 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
+#. These strings are used to parse the user's input in the "New Task" entry to
+#. extract the meaning of what they entered, such as the due date.
+#.
+#. The important thing to preserve in the translation are the (?<name>expr)
+#. blocks, which identify a regular expression "expr" with the identifier
+#. "name".  These mark sections which will be used in the new task.  All of the
+#. strings have a block called "task", which is the actual task summary.  Other
+#. examples are "day" (day of the month), "month" (month name) and so on.
+#.
+#. Translators: "Pay bills today".  Just translate "today"
+#: ../libkoto/koto-date-parser.c:476
 msgid "^(?<task>.+) today$"
 msgstr "^(?<task>.+) äå$"
 
-#. Translators: just translate "tomorrow"
-#: ../libkoto/koto-date-parser.c:472
+#. Translators: "Pay bills tomorrow". Just translate "tomorrow"
+#: ../libkoto/koto-date-parser.c:480
 msgid "^(?<task>.+) tomorrow$"
 msgstr "^(?<task>.+) æå$"
 
-#. Translators: just translate "yesterday"
-#: ../libkoto/koto-date-parser.c:476
+#. Translators: "Pay bills yesterday".  Just translate "yesterday"
+#: ../libkoto/koto-date-parser.c:484
 msgid "^(?<task>.+) yesterday$"
 msgstr "^(?<task>.+) æå$"
 
-#. Translators: just translate "next"
-#: ../libkoto/koto-date-parser.c:480
-#, c-format
-msgid "^(?<task>.+) next (?<day>%s)$"
+#. Translators: "Pay bills next Monday".
+#: ../libkoto/koto-date-parser.c:488
+#, fuzzy
+msgid "^(?<task>.+) next (?<day>\\w+)$"
 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
+#. Translators: "Pay bills this tuesday".  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
+#: ../libkoto/koto-date-parser.c:493
 msgid "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 msgstr "^(?<task>.+) (this|on|by|due) (?<day>\\w+)$"
 
-#. Translators: replace by|due|on with suitable words, and re-order the day
-#. and month expressions as suitable
-#: ../libkoto/koto-date-parser.c:494
+#. Translators: "Pay bills by 4/12" (day/month).  Re-arrange as required.
+#: ../libkoto/koto-date-parser.c:497
 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})$"
 
-#. Translators: just translate on|by|due and st|nd|rd|th to contain relevant
-#. words in your language.
-#: ../libkoto/koto-date-parser.c:499
+#. Translators: "Pay bills on 3rd" or "Pay bills on 12".  Not all languages
+#. have numeric suffixes so feel free to remove them.
+#: ../libkoto/koto-date-parser.c:502
 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)?$"
 
-#. 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+)$"
-
-#. 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)?$"
-
-#. Translators: just translate this|on|by|due to contain relevant words in
-#. your language
-#: ../libkoto/koto-date-parser.c:514
+#. Translators: "Pay bills on 12th January" or "Pay bills on 23 June".
+#: ../libkoto/koto-date-parser.c:506
+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+)$"
+
+#. Translators: "Pay bills on January 12th" or "Pay bills on 23 June".  This
+#. is for languages where there is two way of writing a day, if there is only
+#. one correct way then translate this identically to the previous one.
+#: ../libkoto/koto-date-parser.c:512
+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)?$"
+
+#. Translators: "Pay bills on 15/4".
+#: ../libkoto/koto-date-parser.c:516
 msgid "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 msgstr "^(?<task>.+) (?:by|due|on)? (?<digits>[\\d/-]+)$"
 
-#. 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
+#. Translators: "Pay bills by w43".  In English, w34 means "week 34", not all
+#. languages have this concept.
+#: ../libkoto/koto-date-parser.c:521
 msgid "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 msgstr "^(?<task>.+) (?:by|due|on)? w(?<week>\\d{1,2})$"
 
-#. 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
+#. Translators: "Pay bills in 4 days".
+#: ../libkoto/koto-date-parser.c:525
 msgid "^(?<task>.+) in (?<days>\\d+) days?$"
 msgstr "^(?<task>.+) å (?<days>\\d+) åï$"
 
-#. 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
+#. Translators: "Pay bills in 2 weeks".
+#: ../libkoto/koto-date-parser.c:529
 msgid "^(?<task>.+) in (?<weeks>\\d+) weeks?$"
 msgstr "^(?<task>.+) å (?<weeks>\\d+) éï$"
 
@@ -243,11 +248,11 @@ msgstr "æå"
 msgid "Delete"
 msgstr "åé"
 
-#: ../libkoto/koto-field-editor-factory.c:417
+#: ../libkoto/koto-field-editor-factory.c:413
 msgid "New Category"
 msgstr "æåé"
 
-#: ../libkoto/koto-field-editor-factory.c:428
+#: ../libkoto/koto-field-editor-factory.c:424
 msgid "Enter the name of the new category:"
 msgstr "èèåæåéåçï"
 
@@ -256,8 +261,9 @@ msgid "None"
 msgstr "ææ"
 
 #: ../libkoto/koto-meta-group.c:48
-msgid "New Group..."
-msgstr "æçç..."
+#, fuzzy
+msgid "New Category..."
+msgstr "æåé"
 
 #: ../libkoto/koto-no-category-group.c:32
 msgid "No Category"
@@ -300,19 +306,15 @@ 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
+#: ../libkoto/koto-task-editor-dialog.c:83 ../src/gtk/main.c:382
 #, c-format
 msgid "Delete Task %s"
 msgstr "åéåä %s"
@@ -339,16 +341,15 @@ msgstr "èé(_N)"
 msgid "%s - Tasks"
 msgstr "%s - åä"
 
-#: ../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 "åäååæ"
 
-#: ../libkoto/koto-task-view.c:477
+#: ../libkoto/koto-task-view.c:479
 msgid "Done"
 msgstr "åæ"
 
-#: ../libkoto/koto-task-view.c:484
+#: ../libkoto/koto-task-view.c:486
 msgid "Summary"
 msgstr "æè"
 
@@ -383,110 +384,58 @@ msgstr "æååä %s"
 msgid "Remove Completed"
 msgstr "åéåæ"
 
-#: ../src/gtk/main.c:447
-#: ../src/hildon/hildon-tasks.c:422
+#: ../src/gtk/main.c:448
 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"
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://";
+"www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 msgstr ""
-"èçäæèçèéïæåäéè Free Softwar Foundation ç GNU äèååèåè (GUN General Public License) çææïéæåéå/æäææèé;  çäåçæçææïæèïæææçéæïçääçæã\n"
-"\n"
-"èçäèéåäççåæåæåäååæïäææäääè;ãçèææéåäèçééææéåçåçéçéçæãèåéæéãGNU äèååèåè (GUN General Public License) çèçäæã\n"
-"\n"
-"ææèåçæåää GNU äèååèåè (GUN General Public License) éåèçäèé; åææææåïåäç Free Software Foundation, Inc.ï51 Franklin StïFifth FloorïBostonïMA 0110-1301ïUSA"
-
-#: ../src/gtk/main.c:468
-#: ../src/hildon/hildon-tasks.c:443
+
+#: ../src/gtk/main.c:456
 msgid "translator-credits"
 msgstr "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2008"
 
-#: ../src/gtk/main.c:472
-#: ../src/hildon/hildon-tasks.c:447
+#: ../src/gtk/main.c:460
 msgid "The Pimlico Project"
 msgstr "Pimlico èå"
 
 #. Action name, stock ID, label, accelerator, tooltip, callback
-#: ../src/gtk/main.c:479
+#: ../src/gtk/main.c:469
 msgid "_Task"
 msgstr "åä(_T)"
 
-#: ../src/gtk/main.c:481
-#: ../src/hildon/hildon-tasks.c:461
+#: ../src/gtk/main.c:471
 msgid "_Remove Completed"
 msgstr "åéåæ(_R)"
 
-#: ../src/gtk/main.c:484
+#: ../src/gtk/main.c:474
 msgid "_Edit"
 msgstr "çèï_Eï"
 
-#: ../src/gtk/main.c:486
+#: ../src/gtk/main.c:476
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../src/gtk/main.c:492
+#: ../src/gtk/main.c:482
 msgid "Edit..."
 msgstr "çè..."
 
-#. TODO: turn this action into a toggle action
-#: ../src/gtk/main.c:498
-#: ../src/hildon/hildon-tasks.c:459
+#: ../src/gtk/main.c:488
 msgid "_Mark Complete"
 msgstr "æèåæ(_M)"
 
-#: ../src/gtk/main.c:621
+#: ../src/gtk/main.c:634
 msgid " - a to do list"
 msgstr "åèäé"
 
-#: ../src/gtk/main.c:739
-#: ../src/hildon/hildon-tasks.c:558
+#: ../src/gtk/main.c:753
 msgid "_Category:"
 msgstr "åéï(_C)"
 
-#: ../src/gtk/main.c:764
-#: ../src/hildon/hildon-tasks.c:578
+#: ../src/gtk/main.c:778
 msgid "New task..."
 msgstr "æåä..."
 
-#: ../src/gtk/main.c:788
-#: ../src/hildon/hildon-tasks.c:602
+#: ../src/gtk/main.c:802
 #, 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 "éæ(_A)"
-
-#: ../src/omoko/openmoko-tasks.c:186
-msgid "New task"
-msgstr "æåä"
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]